Refactor order handling and logging in WCS services

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

@@ -11,6 +11,7 @@ public class NotifyDataToWcs {
     private String taskNo;//任务单号
     private Integer itemNo; //任务行号
     private String orderNo;//生产订单
-    private String orderPartNo;
+    private String orderPartNo;//订单料号
+    private Integer orderType;//订单类型 1-生产订单 2-分切订单  3-销售发货
     private List<NotifyDataToWcsPalletList> materialRequisitions;
 }

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

@@ -130,6 +130,7 @@ public class AutoSortServiceImpl implements AutoSortService {
                         }
                     }
                 }
+
             }
             
             System.out.println("WCS返回明细总数 - rqrq：" + totalWcsCount + "条");

src/main/java/com/gaotao/modules/automatedWarehouse/task/WcsTaskScheduler.java

@@ -155,7 +155,7 @@ public class WcsTaskScheduler {
                 return;
             }
             
-            log.info("获取到 {} 个待处理的对账任务（人工分拣）- rqrq", list.size());
+            log.info("获取到 {} 个待处理的分拣任务- rqrq", list.size());
             
             int successCount = 0;
             int failCount = 0;
@@ -170,7 +170,7 @@ public class WcsTaskScheduler {
                     }
                     successCount++;
                 } catch (Exception e) {
-                    log.error("处理WCS栈板RFID扫描对账失败 - rqrq：palletId={}, error={}", 
+                    log.error("处理WCS栈板分拣失败 - rqrq：palletId={}, error={}",
                         callback.getPalletId(), e.getMessage());
                     failCount++;
                     // 继续处理下一个数据 - rqrq
@@ -181,7 +181,7 @@ public class WcsTaskScheduler {
                 list.size(), successCount, failCount);
                 
         } catch (Exception e) {
-            log.error("=== WCS栈板RFID扫描对账定时任务执行失败 - rqrq ===", e);
+            log.error("=== WCS栈板RFID扫描分拣任务执行失败 - rqrq ===", e);
         }
     }
 

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

@@ -247,11 +247,11 @@ public class IssureNotifyServiceImpl implements IssureNotifyService {
             throw new RuntimeException(e);
         }
         String productionArea;
-        if(data.getFgPartNo().startsWith("3")||data.getFgPartNo().startsWith("7")) {
+        // if(data.getFgPartNo().startsWith("3")||data.getFgPartNo().startsWith("7")) {
+        if(data.getFgPartNo().contains("-")) {
              productionArea = "Z112";
         }else {
              productionArea = issureNotifyMapper.getProductAreaByPlanner(data.getSite(), rows.get(0).getPlannerBuyer());
-
         }
         data.setProductionArea(productionArea!=null?productionArea:"Z301");
         data.setPushWmsFlag("N");

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

@@ -930,6 +930,11 @@ public class NewIssureServiceImpl implements NewIssureService {
                 wcsData.setOrderNo(productionOrderNo);
                 wcsData.setItemNo(orderTask.getItemNo());
                 wcsData.setOrderPartNo(fgPartNo);
+                if(fgPartNo.contains("-")){
+                    wcsData.setOrderType(2);
+                }else {
+                    wcsData.setOrderType(1);
+                }
                 // 构建栈板列表 - rqrq
                 List<NotifyDataToWcsPalletList> palletList = new ArrayList<>();
                 for (String palletId : orderPalletIds) {