no order 合并

src/main/java/com/gaotao/modules/customer/service/impl/ShipmentIssueServiceImpl.java

@@ -534,7 +534,7 @@ public class ShipmentIssueServiceImpl implements ShipmentIssueService {
                     taskDetail.setPalletId(palletId);
                     taskDetail.setWmsStatus("未执行");
                     taskDetailList.add(taskDetail);
-                    wcsIntegrationMapper.updatePalletCallingFlag(site,palletId,"Y","发货申请单");
+                    // wcsIntegrationMapper.updatePalletCallingFlag(site,palletId,"Y","发货申请单");
                 }
                 System.out.println("准备wms_order_task_detail对象" + orderPalletIds.size() + "条 - rqrq");
 

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

@@ -881,7 +881,8 @@ public class NewIssureServiceImpl implements NewIssureService {
                     taskDetail.setWmsStatus("未执行");
 
                     taskDetailList.add(taskDetail);
-                    wcsIntegrationMapper.updatePalletCallingFlag(site,palletId,"Y","领料申请单");
+                    // ⚠️ 重要修复：删除此处的calling_flag更新，应该在WCS推送成功后才更新（见1060行）- rqrq
+                    // wcsIntegrationMapper.updatePalletCallingFlag(site,palletId,"Y","领料申请单");
                 }
                 System.out.println("准备wms_order_task_detail对象" + orderPalletIds.size() + "条 - rqrq");