Commit 773ef75a843385514bf483c0db7e83bb3612ee31

Authored by 房远帅
1 parent 8429755f

订货单:增加合同类型筛选;打印增加合同类型(经销、加工、外贸)

... ... @@ -492,6 +492,8 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
492 492 dataMap.put("officeClerk", reviewer.getOfficeClerk());
493 493 // 办事处主管
494 494 dataMap.put("officeSupervisor", reviewer.getOfficeSupervisor());
  495 + // 合同类型
  496 + dataMap.put("contractType", handleContractType(data.getContractType()));
495 497
496 498 processTemplate(workbook, dataMap);
497 499
... ... @@ -550,6 +552,20 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
550 552 }
551 553 }
552 554
  555 + private String handleContractType(String contractType) {
  556 + String result = "";
  557 + if ("DISTRIB_STD".equals(contractType) || "DIST_STOCK_CONTRACT".equals(contractType)
  558 + || "DRAFT_DIST_AGMT".equals(contractType)) {
  559 + result = "经销";
  560 + } else if ("INTL_STD_CONTRACT".equals(contractType) || "INTL_INVENTORY_AGMT".equals(contractType)
  561 + || "INTL_OPEN_SPEC_AGMT".equals(contractType)) {
  562 + result = "外贸";
  563 + } else if ("PROCESS_STD_AGMT".equals(contractType)) {
  564 + result = "加工";
  565 + }
  566 + return result;
  567 + }
  568 +
553 569 @ApiOperation("订货单批量打印")
554 570 @PostMapping("/batchPrintPurchaseOrder")
555 571 public InvokeResult<Void> batchPrintPurchaseOrder(@RequestBody QueryPurchaseOrderInfoVo vo) {
... ...
... ... @@ -175,4 +175,10 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
175 175 @ApiModelProperty("操作时间")
176 176 private String createTimeStart;
177 177 private String createTimeEnd;
  178 +
  179 + /**
  180 + * 合同类型
  181 + */
  182 + @ApiModelProperty("合同类型")
  183 + private String contractType;
178 184 }
... ...
... ... @@ -214,6 +214,9 @@
214 214 AND tb.create_time < DATE_ADD(#{vo.createTimeEnd}, INTERVAL 1 DAY)
215 215 ]]>
216 216 </if>
  217 + <if test="vo.contractType != null and vo.contractType != ''">
  218 + AND cds.type = #{vo.contractType}
  219 + </if>
217 220 </where>
218 221 ORDER BY tb.create_time DESC
219 222 </select>
... ...