wms / wms_tianjinggelinmei · Commits

Commit 2eef03eccff7144d77b4441b8dd09f5db787dc38

Authored by 周鸿
1 parent 1941c887

出库根据物料码查询单据

Inline Side-by-side
Showing 1 changed file with 10 additions and 3 deletions
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
  View file @2eef03e
@@ -85,7 +85,9 @@ public class ShipmentHeaderController extends BaseController { @@ -85,7 +85,9 @@ public class ShipmentHeaderController extends BaseController {
85 @Log(title = "出库-出库单", operating = "查看出库主单", action = BusinessType.GRANT) 85 @Log(title = "出库-出库单", operating = "查看出库主单", action = BusinessType.GRANT)
86 @PostMapping("/list") 86 @PostMapping("/list")
87 @ResponseBody 87 @ResponseBody
88 - public TableDataInfo list(ShipmentHeader shipmentHeader, String createdBegin, String createdEnd,Integer shipmentHeaderStatus) { 88 + public TableDataInfo list(ShipmentHeader shipmentHeader,
  89 + String createdBegin, String createdEnd,
  90 + Integer shipmentHeaderStatus,String materialCode) {
89 LambdaQueryWrapper<ShipmentHeader> lambdaQueryWrapper = Wrappers.lambdaQuery(); 91 LambdaQueryWrapper<ShipmentHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
90 PageDomain pageDomain = TableSupport.buildPageRequest(); 92 PageDomain pageDomain = TableSupport.buildPageRequest();
91 Integer pageNum = pageDomain.getPageNum(); 93 Integer pageNum = pageDomain.getPageNum();
@@ -121,8 +123,13 @@ public class ShipmentHeaderController extends BaseController { @@ -121,8 +123,13 @@ public class ShipmentHeaderController extends BaseController {
121 .eq(shipmentHeader.getFirstStatus() != null, ShipmentHeader::getFirstStatus, shipmentHeader.getFirstStatus()) 123 .eq(shipmentHeader.getFirstStatus() != null, ShipmentHeader::getFirstStatus, shipmentHeader.getFirstStatus())
122 .eq(shipmentHeader.getLastStatus() != null, ShipmentHeader::getLastStatus, shipmentHeader.getLastStatus()) 124 .eq(shipmentHeader.getLastStatus() != null, ShipmentHeader::getLastStatus, shipmentHeader.getLastStatus())
123 .lt(StringUtils.isNotNull(shipmentHeaderStatus), ShipmentHeader::getLastStatus, shipmentHeaderStatus) 125 .lt(StringUtils.isNotNull(shipmentHeaderStatus), ShipmentHeader::getLastStatus, shipmentHeaderStatus)
124 - .eq(StringUtils.isNotNull(shipmentHeader.getPushSuccessStatus()),ShipmentHeader::getPushSuccessStatus,shipmentHeader.getPushSuccessStatus())  
125 - .orderByDesc(ShipmentHeader::getId); 126 + .eq(StringUtils.isNotNull(shipmentHeader.getPushSuccessStatus()),ShipmentHeader::getPushSuccessStatus,shipmentHeader.getPushSuccessStatus());
  127 +
  128 +
  129 + if(StringUtils.isNotEmpty(materialCode)){
  130 + lambdaQueryWrapper.apply(" id in(select shipmentId from shipment_detail where materialCode ='"+materialCode+"' )");
  131 + }
  132 + lambdaQueryWrapper.orderByDesc(ShipmentHeader::getId);
126 133
127 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) { 134 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
128 /** 135 /**