多空托入库

src/main/java/com/gaotao/modules/api/entity/PushPalletDetailDto.java

@@ -19,5 +19,6 @@ public class PushPalletDetailDto {
     private boolean endFlag;
     private List<PalletStationVo> cargoInfos;//明细数据
     private PartTypeEnum partType;
+    private Integer count=1;//托盘数量 默认为1
 
 }

src/main/java/com/gaotao/modules/automatedWarehouse/controller/WcsIntegrationController.java

@@ -347,6 +347,7 @@ public class WcsIntegrationController {
             params.put("site", request.getSite());
             params.put("palletId", request.getPalletId());
             params.put("transportFlag", "Y"); // 默认入库并运输 - rqrq
+            params.put("count", 1);
             wcsIntegrationService.notifyEmptyPalletInbound(params);
         }
         

src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java

@@ -1815,6 +1815,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
         String site = (String) params.get("site");
         String palletId = (String) params.get("palletId");
         String transportFlag = (String) params.get("transportFlag");
+        Integer count= (Integer) params.get("count");
 
         // 参数校验 - rqrq
         if (!StringUtils.hasText(site)) {
@@ -1894,7 +1895,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
             }
         }
         // 调用空托盘推送方法（只推送托盘数据，cargoInfos为null）- rqrq
-        pushEmptyPalletDetail(site, palletId, orderTask.getTaskNo(), orderTask.getItemNo());
+        pushEmptyPalletDetail(site, palletId, orderTask.getTaskNo(), orderTask.getItemNo(),count);
         System.out.println("空托盘通知入库完成 - rqrq");
     }
 
@@ -2112,7 +2113,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
      * @author rqrq
      * @date 2025/10/16
      */
-    private void pushEmptyPalletDetail(String site, String palletId, String taskNo, Integer itemNo) {
+    private void pushEmptyPalletDetail(String site, String palletId, String taskNo, Integer itemNo,Integer count) {
         System.out.println("开始推送空托盘数据到WCS - rqrq，palletId=" + palletId + ", taskNo=" + taskNo);
 
         // 获取栈板信息（包含pallet_type表关联数据）- rqrq
@@ -2148,7 +2149,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
         } else {
             inData.setPartType(PartTypeEnum.fromCode(3));
         }
-
+        inData.setCount(count);
         inData.setSite(site);
         inData.setTaskNo(taskNo);
         inData.setItemNo(itemNo);

src/main/java/com/gaotao/modules/notify/service/impl/IssureNotifyServiceImpl.java

@@ -249,8 +249,7 @@ public class IssureNotifyServiceImpl implements IssureNotifyService {
             throw new RuntimeException(e);
         }
         String productionArea;
-        // if(data.getFgPartNo().startsWith("3")||data.getFgPartNo().startsWith("7")) {
-        if(data.getFgPartNo().contains("-")) {
+        if(data.getFgPartNo().startsWith("3")||data.getFgPartNo().startsWith("7")) {
              productionArea = "Z112";
         }else {
              productionArea = issureNotifyMapper.getProductAreaByPlanner(data.getSite(), rows.get(0).getPlannerBuyer());