回传mom新增参数

陈翱
1 parent ddfdc921
Showing 3 changed files with 16 additions and 19 deletions
src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
@@ -583,6 +583,8 @@ public class MesReceiptController extends BaseController {
         Rd_Out_M.put("FAID", shipmentHeader.getFAID());
         Rd_Out_M.put("UserNo",  shipmentHeader.getLastUpdatedBy());
         Rd_Out_M.put("warehouse",  shipmentHeader.getWarehouse());
+        Rd_Out_M.put("cDepCode",  "01030101");//部门编码
+        Rd_Out_M.put("cWhCode",  shipmentHeader.getWarehouse());//仓库编码
         return Rd_Out_M;
     }
  
@@ -162,8 +162,10 @@ public class RyTask extends BaseController {
             shipmentHeaderLambdaQueryWrapper.eq(ShipmentHeader::getLastStatus, QuantityConstant.SHIPMENT_HEADER_COMPLETED);
             List<ShipmentHeader> shipmentHeaderList = shipmentHeaderService.list(shipmentHeaderLambdaQueryWrapper);
             for(ShipmentHeader shipmentHeader : shipmentHeaderList) {
-                if (("MOM".equals(shipmentHeader.getCreatedBy()) || "merge".equals(shipmentHeader.getShipmentType()))) {
+                System.out.println("ID>>>>>>>>"+shipmentHeader.getId());
+                if (("MOM".equals(shipmentHeader.getCreatedBy()) || "merge".equals(shipmentHeader.getShipmentType()) ||  "299".equals(shipmentHeader.getShipmentType()))) {
                     try{
+                        shipmentHeader.setWarehouse("035");
                         mesReceiptController.postE_Rd_Out(shipmentHeader);
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -150,7 +150,7 @@ public class ReceiptHeaderController extends BaseController {
     }
  
  
-    /**r
+    /**
      * 查询PDA入库单
      */
     @Log(title = "入库-PDA入库单头表", operating = "查看PDA入库单列表", action = BusinessType.GRANT)
@@ -158,26 +158,19 @@ public class ReceiptHeaderController extends BaseController {
     @ResponseBody
     @ApiOperation("入库单查询接口")
     public TableDataInfo listPda(@ApiParam(name="receiptHeader",value="入库头表")ReceiptHeader receiptHeader,
-                              @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
-                              @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd,
-                              Integer statusFirst, Integer statusLast) {
+                                 @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+                                 @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd,
+                                 Integer statusFirst, Integer statusLast) {
         List<ReceiptHeader> list = new ArrayList<>();
         LambdaQueryWrapper<ReceiptDetail> receiptDetailLambdaQuery = Wrappers.lambdaQuery();
-        receiptDetailLambdaQuery.eq(StringUtils.isNotNull(receiptHeader.getNoticeNo()) && StringUtils.isNotEmpty(receiptHeader.getNoticeNo()),ReceiptDetail::getNoticeNo, receiptHeader.getNoticeNo());
-        receiptDetailLambdaQuery.eq(StringUtils.isNotNull(receiptHeader.getSNNO()) && StringUtils.isNotEmpty(receiptHeader.getSNNO()),ReceiptDetail::getSNNO, receiptHeader.getSNNO())
-        .last(StringUtils.isNotEmpty(receiptHeader.getNoticeNo()) || StringUtils.isNotEmpty(receiptHeader.getSNNO()),"and qty > taskQty")
-        .last(StringUtils.isEmpty(receiptHeader.getNoticeNo()) && StringUtils.isEmpty(receiptHeader.getSNNO())," where qty > taskQty");
-        List<ReceiptDetail> receiptDetails = receiptDetailService.list(receiptDetailLambdaQuery);
-        List<ReceiptHeader> receiptHeaderData = new ArrayList<>();
-        if (receiptDetails != null && !receiptDetails.isEmpty()){
-            Set<Integer> ids = receiptDetails.stream().distinct().map(ReceiptDetail::getReceiptId).collect(Collectors.toSet());
-            for (Integer id : ids) {
-                ReceiptHeader header = receiptHeaderService.getById(id);
-                receiptHeaderData.add(header);
-            }
-
+        receiptDetailLambdaQuery.eq(ReceiptDetail::getSNNO, receiptHeader.getSNNO())
+                .last("and qty > taskQty");
+        ReceiptDetail receiptDetail = receiptDetailService.getOne(receiptDetailLambdaQuery);
+        ReceiptHeader receiptHeaderData = new ReceiptHeader();
+        if (StringUtils.isNotNull(receiptDetail)){
+            receiptHeaderData = receiptHeaderService.getById(receiptDetail.getReceiptId());
             if (StringUtils.isNotNull(receiptHeaderData)){
-                list.addAll(receiptHeaderData);
+                list.add(receiptHeaderData);
                 return getDataTable(list);
             }else{
                 return getDataTable(list);