diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AutoSortServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AutoSortServiceImpl.java
index 5338fdf..2fe54ee 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AutoSortServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AutoSortServiceImpl.java
@@ -303,18 +303,18 @@ public class AutoSortServiceImpl implements AutoSortService {
                         firstDetail.getNotifyNo(), 
                         null // productionOrderNo可以为null，只根据notify_no查询 - rqrq
                     );
-                    
-                    if (fgPartNo != null && fgPartNo.contains("-")) {
+
+                    if(fgPartNo==null||"".equals(fgPartNo)) {
+                        targetArea = "Z109"; // 成品包装区 - rqrq
+                        log.info("检测到订单是发货单，所以去成品包装区 - rqrq");
+                    }
+                    if (fgPartNo != null &&!"".equals(fgPartNo)&& (fgPartNo.startsWith("3")||fgPartNo.startsWith("7"))) {
                         // fgpart_no包含"-"说明是分切订单，目标区域是分切房Z112 - rqrq
                         targetArea = "Z112";
                         log.info("检测到分切订单 - rqrq：fgPartNo={}，目标区域=Z112（分切房）", fgPartNo);
                     } else {
                         log.info("普通订单 - rqrq：fgPartNo={}，目标区域=Z104", fgPartNo);
                     }
-                    if(fgPartNo==null||"".equals(fgPartNo)) {
-                        targetArea = "Z109"; // 成品包装区 - rqrq
-                        log.info("检测到订单是发货单，所以去成品包装区");
-                    }
                 } catch (Exception e) {
                     log.error("查询fgpart_no失败，使用默认目标区域Z104 - rqrq：{}", e.getMessage());
                 }
diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
index 2107b14..39bd5f4 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
@@ -2035,18 +2035,18 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
                             notifyNo, 
                             new BigDecimal(itemNo)
                         );
-                        
-                        if (fgPartNo != null && fgPartNo.contains("-")) {
+                        if(fgPartNo==null||"".equals(fgPartNo)) {
+                            targetArea = "Z109"; // 成品包装区 - rqrq
+                            log.info("检测到订单是发货单，所以去成品包装区 - rqrq");
+                        }
+                        if (fgPartNo != null &&!"".equals(fgPartNo)&& (fgPartNo.startsWith("3")||fgPartNo.startsWith("7"))) {
                             // fgpart_no包含"-"说明是分切订单，目标区域是分切房Z112 - rqrq
                             targetArea = "Z112";
                             log.info("检测到分切订单 - rqrq：fgPartNo={}，目标区域=Z112（分切房）", fgPartNo);
                         } else {
                             log.info("普通订单 - rqrq：fgPartNo={}，目标区域=Z104", fgPartNo);
                         }
-                        if(fgPartNo==null||"".equals(fgPartNo)) {
-                            targetArea = "Z109"; // 成品包装区 - rqrq
-                            log.info("检测到订单是发货单，所以去成品包装区 - rqrq");
-                        }
+
                     } else {
                         log.info("未关联到有效的预约信息（reserve_order_ref为空），使用默认区域Z104 - rqrq");
                     }
diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java
index 63179ed..c5ac06a 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java
@@ -405,15 +405,16 @@ public class WcsTaskServiceImpl implements WcsTaskService {
                                     String fgPartNo = newIssureMapper.getFgPartNoWithNotifyNoItemNo(
                                             callbackTask.getSite(), notifyNo, new BigDecimal(itemNo));
 
-                                    if (fgPartNo != null && fgPartNo.contains("-")) {
-                                        targetArea = "Z112"; // 分切房 - rqrq
-                                        System.out.println("检测到分切订单，目标区域=Z112（分切房）- rqrq：fgPartNo=" + fgPartNo);
-                                    } else {
-                                        System.out.println("普通订单，目标区域=Z104（缓存区）- rqrq：fgPartNo=" + fgPartNo);
-                                    }
                                     if(fgPartNo==null||"".equals(fgPartNo)) {
                                         targetArea = "Z109"; // 成品包装区 - rqrq
-                                        System.out.println("检测到订单是发货单，所以去成品包装区");
+                                        log.info("检测到订单是发货单，所以去成品包装区 - rqrq");
+                                    }
+                                    if (fgPartNo != null &&!"".equals(fgPartNo)&& (fgPartNo.startsWith("3")||fgPartNo.startsWith("7"))) {
+                                        // fgpart_no包含"-"说明是分切订单，目标区域是分切房Z112 - rqrq
+                                        targetArea = "Z112";
+                                        log.info("检测到分切订单 - rqrq：fgPartNo={}，目标区域=Z112（分切房）", fgPartNo);
+                                    } else {
+                                        log.info("普通订单 - rqrq：fgPartNo={}，目标区域=Z104", fgPartNo);
                                     }
                                 }
                             } catch (Exception ex) {