From 6d3b7e69524cdc6fd4c44fe9f37661a19a56c6ff Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 03 六月 2025 21:08:32 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/entity/WrkDetlLog.java                       |   10 +
 src/main/java/com/zy/asrs/entity/OrderDetlPakout.java                  |   13 +
 src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java          |    4 
 src/main/java/com/zy/asrs/entity/OrderDetl.java                        |   26 ++
 src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java          |    1 
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java            |   89 +++++----
 src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java            |    2 
 src/main/java/com/zy/nc/entity/NccScZkmxbWms.java                      |    2 
 src/main/java/com/zy/asrs/entity/OrderDetlPakin.java                   |   12 +
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java                 |    4 
 src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java             |   57 ++++--
 src/main/java/com/zy/asrs/controller/MobileController.java             |    1 
 src/main/java/com/zy/asrs/entity/param/MatParam.java                   |    4 
 src/main/java/com/zy/asrs/entity/WaitPakinLog.java                     |   10 +
 src/main/java/com/zy/asrs/entity/WaitPakin.java                        |   11 +
 src/main/java/com/zy/asrs/entity/LocDetl.java                          |   14 +
 src/main/java/com/zy/nc/task/PlanOrderTask.java                        |   14 
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java            |    1 
 src/main/java/com/zy/asrs/entity/WrkDetl.java                          |  152 +++++++++-------
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java           |   38 ++-
 src/main/webapp/static/js/common.js                                    |   13 
 src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java |    5 
 src/main/resources/mapper/asrs/OrderDetlPakoutMapper.xml               |    7 
 23 files changed, 334 insertions(+), 156 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index b77a512..daf2809 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -240,6 +240,7 @@
         Mat mat = matService.selectByMatnr(nccJcQilibcBarcodeflowWms.getWlbm());
         MatParam matParam = new MatParam();
         Synchro.Copy(mat, matParam);
+        matParam.setOrderNo(nccJcQilibcBarcodeflowWms.getZkdh());
         matParam.setBatch(nccJcQilibcBarcodeflowWms.getVbatchcode());
         matParam.setAnfme(nccJcQilibcBarcodeflowWms.getAsnnum() == null ? 0.0D : nccJcQilibcBarcodeflowWms.getAsnnum().doubleValue());
         return R.ok().add(matParam);
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 1bf9921..c5d09b4 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -7,10 +7,7 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasProcessProceduresService;
-import com.zy.asrs.service.BasQualityTestingService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.LocOwnerService;
+import com.zy.asrs.service.*;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
@@ -337,6 +334,15 @@
         }
     }
 
+    public String getStandby1$() {
+        StoreTypeService service = SpringUtils.getBean(StoreTypeService.class);
+        StoreType storeType = service.selectById(this.standby1);
+        if (!Cools.isEmpty(storeType)) {
+            return String.valueOf(storeType.getStoreName());
+        }
+        return null;
+    }
+
     public String getBoxType1$(){
         BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
         BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index af9f0d4..00c536b 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -10,6 +10,7 @@
 import com.zy.asrs.service.BasProcessProceduresService;
 import com.zy.asrs.service.BasQualityTestingService;
 import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.StoreTypeService;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
@@ -585,6 +586,31 @@
     }
 
 
+    public String getStandby1$() {
+        StoreTypeService service = SpringUtils.getBean(StoreTypeService.class);
+        StoreType storeType = service.selectById(this.standby1);
+        if (!Cools.isEmpty(storeType)) {
+            return String.valueOf(storeType.getStoreName());
+        }
+        return null;
+    }
+
+
+    public boolean beSimilar2(OrderDetl orderDetl){
+        return (
+                this.orderNo.equals(orderDetl.getOrderNo())
+                        && this.matnr.equals(orderDetl.getMatnr())
+                        && this.brand.equals(orderDetl.getBrand())
+                        && this.standby1.equals(orderDetl.getStandby1())
+                        && this.standby2.equals(orderDetl.getStandby2())
+                        && this.standby3.equals(orderDetl.getStandby3())
+                        && this.boxType1.equals(orderDetl.getBoxType1())
+                        && this.boxType2.equals(orderDetl.getBoxType2())
+                        && this.boxType3.equals(orderDetl.getBoxType3())
+        );
+    }
+
+
     public static OrderDetl find(List<OrderDetl> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
         if (Cools.isEmpty(matnr)) {
             return null;
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
index 381ee05..4756eca 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -10,6 +10,7 @@
 import com.zy.asrs.service.BasProcessProceduresService;
 import com.zy.asrs.service.BasQualityTestingService;
 import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.StoreTypeService;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
@@ -546,6 +547,17 @@
         return this.boxType1;
     }
 
+
+    public String getStandby1$() {
+        StoreTypeService service = SpringUtils.getBean(StoreTypeService.class);
+        StoreType storeType = service.selectById(this.standby1);
+        if (!Cools.isEmpty(storeType)) {
+            return String.valueOf(storeType.getStoreName());
+        }
+        return null;
+    }
+
+
     public boolean beSimilar(OrderDetlPakin orderDetlPakin){
         return (
                 this.orderNo.equals(orderDetlPakin.getOrderNo())
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 72b62ff..256f625 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -10,6 +10,7 @@
 import com.zy.asrs.service.BasProcessProceduresService;
 import com.zy.asrs.service.BasQualityTestingService;
 import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.StoreTypeService;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
@@ -562,6 +563,18 @@
         );
     }
 
+
+    public String getStandby1$() {
+        StoreTypeService service = SpringUtils.getBean(StoreTypeService.class);
+        StoreType storeType = service.selectById(this.standby1);
+        if (!Cools.isEmpty(storeType)) {
+            return String.valueOf(storeType.getStoreName());
+        }
+        return null;
+    }
+
+
+
     public void sync(Object source) {
         Synchro.Copy(source, this);
     }
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 71074e0..757e55b 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -7,6 +7,7 @@
 import com.core.common.SpringUtils;
 import com.zy.asrs.service.BasProcessProceduresService;
 import com.zy.asrs.service.BasQualityTestingService;
+import com.zy.asrs.service.StoreTypeService;
 import com.zy.common.utils.Synchro;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -268,6 +269,16 @@
         return this.boxType1;
     }
 
+    public String getStandby1$() {
+        StoreTypeService service = SpringUtils.getBean(StoreTypeService.class);
+        StoreType storeType = service.selectById(this.standby1);
+        if (!Cools.isEmpty(storeType)) {
+            return String.valueOf(storeType.getStoreName());
+        }
+        return null;
+    }
+
+
     public String getBoxType2$(){
         BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
         BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 007ba1f..b319f2b 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -7,6 +7,7 @@
 import com.core.common.SpringUtils;
 import com.zy.asrs.service.BasProcessProceduresService;
 import com.zy.asrs.service.BasQualityTestingService;
+import com.zy.asrs.service.StoreTypeService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -220,6 +221,15 @@
         }
     }
 
+    public String getStandby1$() {
+        StoreTypeService service = SpringUtils.getBean(StoreTypeService.class);
+        StoreType storeType = service.selectById(this.standby1);
+        if (!Cools.isEmpty(storeType)) {
+            return String.valueOf(storeType.getStoreName());
+        }
+        return null;
+    }
+
     public String getInspect$(){
         if (null == this.inspect){ return null; }
         switch (this.inspect){
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 99dd520..7bb2f74 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.service.StoreTypeService;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
@@ -23,302 +24,304 @@
     /**
      * 宸ヤ綔鍙�
      */
-    @ApiModelProperty(value= "宸ヤ綔鍙�")
+    @ApiModelProperty(value = "宸ヤ綔鍙�")
     @TableField("wrk_no")
     private Integer wrkNo;
 
     /**
      * 宸ヤ綔鏃堕棿
      */
-    @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+    @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
     @TableField("io_time")
     private Date ioTime;
 
     /**
      * 鏁伴噺
      */
-    @ApiModelProperty(value= "鏁伴噺")
+    @ApiModelProperty(value = "鏁伴噺")
     private Double anfme;
 
     /**
      * 鎵樼洏鏉$爜
      */
-    @ApiModelProperty(value= "鎵樼洏鏉$爜")
+    @ApiModelProperty(value = "鎵樼洏鏉$爜")
     private String zpallet;
 
     /**
      * 鐗╂枡
      */
-    @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+    @ApiModelProperty(value = "鍟嗗搧缂栧彿")
     private String matnr;
 
     /**
      * 鐗╂枡鎻忚堪
      */
-    @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+    @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
     private String maktx;
 
     /**
      * 鎵瑰彿
      */
-    @ApiModelProperty(value= "鎵瑰彿")
+    @ApiModelProperty(value = "鎵瑰彿")
     private String batch;
 
     /**
      * 鍗曟嵁缂栧彿
      */
-    @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+    @ApiModelProperty(value = "鍗曟嵁缂栧彿")
     @TableField("order_no")
     private String orderNo;
 
     /**
      * 瑙勬牸
      */
-    @ApiModelProperty(value= "瑙勬牸")
+    @ApiModelProperty(value = "瑙勬牸")
     private String specs;
 
     /**
      * 鍨嬪彿
      */
-    @ApiModelProperty(value= "鍨嬪彿")
+    @ApiModelProperty(value = "鍨嬪彿")
     private String model;
 
     /**
      * 棰滆壊
      */
-    @ApiModelProperty(value= "棰滆壊")
+    @ApiModelProperty(value = "棰滆壊")
     private String color;
 
     /**
      * 鍝佺墝
      */
-    @ApiModelProperty(value= "鍝佺墝")
+    @ApiModelProperty(value = "鍝佺墝")
     private String brand;
 
     /**
      * 鍗曚綅
      */
-    @ApiModelProperty(value= "鍗曚綅")
+    @ApiModelProperty(value = "鍗曚綅")
     private String unit;
 
     /**
      * 鍗曚环
      */
-    @ApiModelProperty(value= "鍗曚环")
+    @ApiModelProperty(value = "鍗曚环")
     private Double price;
 
     /**
      * sku
      */
-    @ApiModelProperty(value= "sku")
+    @ApiModelProperty(value = "sku")
     private String sku;
 
     /**
      * 鍗曚綅閲�
      */
-    @ApiModelProperty(value= "鍗曚綅閲�")
+    @ApiModelProperty(value = "鍗曚綅閲�")
     private Double units;
 
     /**
      * 鏉$爜
      */
-    @ApiModelProperty(value= "鏉$爜")
+    @ApiModelProperty(value = "鏉$爜")
     private String barcode;
 
     /**
      * 浜у湴
      */
-    @ApiModelProperty(value= "浜у湴")
+    @ApiModelProperty(value = "浜у湴")
     private String origin;
 
     /**
      * 鍘傚
      */
-    @ApiModelProperty(value= "鍘傚")
+    @ApiModelProperty(value = "鍘傚")
     private String manu;
 
     /**
      * 鐢熶骇鏃ユ湡
      */
-    @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+    @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
     @TableField("manu_date")
     private String manuDate;
 
     /**
      * 鍝侀」鏁�
      */
-    @ApiModelProperty(value= "鍝侀」鏁�")
+    @ApiModelProperty(value = "鍝侀」鏁�")
     @TableField("item_num")
     private String itemNum;
 
     /**
      * 瀹夊叏搴撳瓨閲�
      */
-    @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+    @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
     @TableField("safe_qty")
     private Double safeQty;
 
     /**
      * 閲嶉噺
      */
-    @ApiModelProperty(value= "閲嶉噺")
+    @ApiModelProperty(value = "閲嶉噺")
     private Double weight;
 
     /**
      * 闀垮害
      */
-    @ApiModelProperty(value= "闀垮害")
+    @ApiModelProperty(value = "闀垮害")
     @TableField("man_length")
     private Double manLength;
 
     /**
      * 浣撶Н
      */
-    @ApiModelProperty(value= "浣撶Н")
+    @ApiModelProperty(value = "浣撶Н")
     private Double volume;
 
     /**
      * 涓夋柟缂栫爜
      */
-    @ApiModelProperty(value= "涓夋柟缂栫爜")
+    @ApiModelProperty(value = "涓夋柟缂栫爜")
     @TableField("three_code")
     private String threeCode;
 
     /**
      * 渚涘簲鍟�
      */
-    @ApiModelProperty(value= "渚涘簲鍟�")
+    @ApiModelProperty(value = "渚涘簲鍟�")
     private String supp;
 
     /**
      * 渚涘簲鍟嗙紪鐮�
      */
-    @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+    @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
     @TableField("supp_code")
     private String suppCode;
 
     /**
      * 鏄惁鎵规 1: 鏄�  0: 鍚�
      */
-    @ApiModelProperty(value= "鏄惁鎵规 1: 鏄�  0: 鍚�  ")
+    @ApiModelProperty(value = "鏄惁鎵规 1: 鏄�  0: 鍚�  ")
     @TableField("be_batch")
     private Integer beBatch;
 
     /**
      * 淇濊川鏈�
      */
-    @ApiModelProperty(value= "淇濊川鏈�")
+    @ApiModelProperty(value = "淇濊川鏈�")
     @TableField("dead_time")
     private String deadTime;
 
     /**
      * 棰勮澶╂暟
      */
-    @ApiModelProperty(value= "棰勮澶╂暟")
+    @ApiModelProperty(value = "棰勮澶╂暟")
     @TableField("dead_warn")
     private Integer deadWarn;
 
     /**
      * 鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗
      */
-    @ApiModelProperty(value= "鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  ")
+    @ApiModelProperty(value = "鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  ")
     private Integer source;
 
     /**
      * 瑕佹眰妫�楠� 1: 鏄�  0: 鍚�
      */
-    @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
+    @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
     private Integer inspect;
 
     /**
      * 鍗遍櫓鍝� 1: 鏄�  0: 鍚�
      */
-    @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄�  0: 鍚�  ")
+    @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄�  0: 鍚�  ")
     private Integer danger;
 
     /**
      * 淇敼浜哄憳
      */
-    @ApiModelProperty(value= "淇敼浜哄憳")
+    @ApiModelProperty(value = "淇敼浜哄憳")
     @TableField("modi_user")
     private Long modiUser;
 
     /**
      * 淇敼鏃堕棿
      */
-    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @ApiModelProperty(value = "淇敼鏃堕棿")
     @TableField("modi_time")
     private Date modiTime;
 
     /**
      * 鍒涘缓鑰�
      */
-    @ApiModelProperty(value= "鍒涘缓鑰�")
+    @ApiModelProperty(value = "鍒涘缓鑰�")
     @TableField("appe_user")
     private Long appeUser;
 
     /**
      * 娣诲姞鏃堕棿
      */
-    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @ApiModelProperty(value = "娣诲姞鏃堕棿")
     @TableField("appe_time")
     private Date appeTime;
 
     /**
      * 澶囨敞
      */
-    @ApiModelProperty(value= "澶囨敞")
+    @ApiModelProperty(value = "澶囨敞")
     private String memo;
 
     /**
      * 澶囩敤1
      */
-    @ApiModelProperty(value= "澶囩敤1")
+    @ApiModelProperty(value = "澶囩敤1")
     private String standby1 = "";
 
     /**
      * 澶囩敤2
      */
-    @ApiModelProperty(value= "澶囩敤2")
+    @ApiModelProperty(value = "澶囩敤2")
     private String standby2 = "";
 
     /**
      * 澶囩敤3
      */
-    @ApiModelProperty(value= "澶囩敤3")
+    @ApiModelProperty(value = "澶囩敤3")
     private String standby3 = "";
 
     /**
      * 澶囩敤1
      */
-    @ApiModelProperty(value= "澶囩敤1")
+    @ApiModelProperty(value = "澶囩敤1")
     @TableField("box_type1")
     private String boxType1 = "";
 
     /**
      * 澶囩敤2
      */
-    @ApiModelProperty(value= "澶囩敤2")
+    @ApiModelProperty(value = "澶囩敤2")
     @TableField("box_type2")
     private String boxType2 = "";
 
     /**
      * 澶囩敤3
      */
-    @ApiModelProperty(value= "澶囩敤3")
+    @ApiModelProperty(value = "澶囩敤3")
     @TableField("box_type3")
     private String boxType3 = "";
 
-    public String getIoTime$(){
-        if (Cools.isEmpty(this.ioTime)){
+    public String getIoTime$() {
+        if (Cools.isEmpty(this.ioTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
     }
 
-    public String getBeBatch$(){
-        if (null == this.beBatch){ return null; }
-        switch (this.beBatch){
+    public String getBeBatch$() {
+        if (null == this.beBatch) {
+            return null;
+        }
+        switch (this.beBatch) {
             case 1:
                 return "鏄�";
             case 0:
@@ -328,9 +331,11 @@
         }
     }
 
-    public String getSource$(){
-        if (null == this.source){ return null; }
-        switch (this.source){
+    public String getSource$() {
+        if (null == this.source) {
+            return null;
+        }
+        switch (this.source) {
             case 1:
                 return "鍒堕��";
             case 2:
@@ -342,9 +347,11 @@
         }
     }
 
-    public String getInspect$(){
-        if (null == this.inspect){ return null; }
-        switch (this.inspect){
+    public String getInspect$() {
+        if (null == this.inspect) {
+            return null;
+        }
+        switch (this.inspect) {
             case 1:
                 return "鏄�";
             case 0:
@@ -354,9 +361,11 @@
         }
     }
 
-    public String getDanger$(){
-        if (null == this.danger){ return null; }
-        switch (this.danger){
+    public String getDanger$() {
+        if (null == this.danger) {
+            return null;
+        }
+        switch (this.danger) {
             case 1:
                 return "鏄�";
             case 0:
@@ -366,33 +375,42 @@
         }
     }
 
-    public String getModiUser$(){
+    public String getModiUser$() {
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.modiUser);
-        if (!Cools.isEmpty(user)){
+        if (!Cools.isEmpty(user)) {
             return String.valueOf(user.getUsername());
         }
         return null;
     }
 
-    public String getModiTime$(){
-        if (Cools.isEmpty(this.modiTime)){
+    public String getStandby1$() {
+        StoreTypeService service = SpringUtils.getBean(StoreTypeService.class);
+        StoreType storeType = service.selectById(this.standby1);
+        if (!Cools.isEmpty(storeType)) {
+            return String.valueOf(storeType.getStoreName());
+        }
+        return null;
+    }
+
+    public String getModiTime$() {
+        if (Cools.isEmpty(this.modiTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
     }
 
-    public String getAppeUser$(){
+    public String getAppeUser$() {
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.appeUser);
-        if (!Cools.isEmpty(user)){
+        if (!Cools.isEmpty(user)) {
             return String.valueOf(user.getUsername());
         }
         return null;
     }
 
-    public String getAppeTime$(){
-        if (Cools.isEmpty(this.appeTime)){
+    public String getAppeTime$() {
+        if (Cools.isEmpty(this.appeTime)) {
             return "";
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 923d648..58e883c 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.service.StoreTypeService;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
@@ -398,6 +399,15 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
 
+    public String getStandby1$() {
+        StoreTypeService service = SpringUtils.getBean(StoreTypeService.class);
+        StoreType storeType = service.selectById(this.standby1);
+        if (!Cools.isEmpty(storeType)) {
+            return String.valueOf(storeType.getStoreName());
+        }
+        return null;
+    }
+
     public void sync(Object source) {
         Synchro.Copy(source, this);
     }
diff --git a/src/main/java/com/zy/asrs/entity/param/MatParam.java b/src/main/java/com/zy/asrs/entity/param/MatParam.java
index a1373e9..5f09b7b 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatParam.java
@@ -196,5 +196,9 @@
      * 澶囨敞
      */
     private Integer times = 0;
+    /**
+     * 鍗曟嵁鍗曞彿
+     */
+    private String orderNo;
 
 }
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java
index 70e2f1c..3840566 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java
@@ -48,6 +48,8 @@
                              @Param("boxType2")String boxType2,
                              @Param("boxType3")String boxType3, @Param("qty")Double qty);
 
+    int  increaseQtyById(@Param("id")Long id, @Param("qty")Double qty);
+
     int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
                         @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("boxType1")String boxType1,
                         @Param("boxType2")String boxType2,
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java b/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
index a9f8ffc..6998a7a 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
@@ -28,6 +28,7 @@
 
     boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty);
 
+    boolean increaseQtyById(Long id, Double qty);
     /**
      * 鍏ュ嚭搴撲换鍔$敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
      * @param orderId
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
index cd2e894..c2c47e2 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
@@ -81,6 +81,11 @@
         return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty) > 0;
     }
 
+    @Override
+    public boolean increaseQtyById(Long id, Double qty) {
+        return this.baseMapper.increaseQtyById(id, qty) > 0;
+    }
+
     /**
      * 鍏ュ嚭搴撲换鍔$敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
      * @param orderId
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index ad9a8e7..c160f94 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -457,6 +457,7 @@
             wrkDetl.setAppeUser(userId);
             wrkDetl.setModiTime(now);
             wrkDetl.setModiUser(userId);
+            wrkDetl.setThreeCode(orderDetl.getId() + "");
             if (!wrkDetlService.insert(wrkDetl)) {
                 throw new CoolException("淇濆瓨宸ヤ綔妗f槑缁嗗け璐�");
             }
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 2923bf9..21de429 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -112,8 +112,8 @@
 //        }
     }
 
-    @Scheduled(cron = "0/5 * * * * ? ")
-    @Async("orderThreadPool")
+    //@Scheduled(cron = "0/5 * * * * ? ")
+    //@Async("orderThreadPool")
     public void completeAndReportOrderInAndOutUtil2() {
 //        String erpReport = Parameter.get().getErpReport();
 //        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index d3a8183..86490b6 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -121,9 +121,9 @@
         if (null == docType) {
             return SUCCESS;
         }
-        if (docType.getDocName().equals("閿�鍞彂璐�")) {
-            return SUCCESS;
-        }
+//        if (docType.getDocName().equals("閿�鍞彂璐�")) {
+//            return SUCCESS;
+//        }
         Order orderSou = orderService.selectByNo(order.getOrderNo());
         if (!orderSou.getSettle().equals(2L)) {
             return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝g‘锛岃鑱旂郴绠$悊鍛�");
@@ -137,15 +137,29 @@
                 if (orderDetl.getQty().equals(0D)) {
                     continue;
                 }
-                if (orderDetlSou.beSimilar(orderDetl)) {
-                    double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
-                    if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
-                        orderDetlSou.setQty(orderDetlSou.getAnfme());
-                        orderDetl.setQty(orderDetl.getQty() - v);
-                        break;
-                    } else {
-                        orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
-                        orderDetl.setQty(0D);
+                if (!Cools.isEmpty(orderDetlSou.getBatch())){
+                    if (orderDetlSou.beSimilar(orderDetl)) {
+                        double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
+                        if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
+                            orderDetlSou.setQty(orderDetlSou.getAnfme());
+                            orderDetl.setQty(orderDetl.getQty() - v);
+                            break;
+                        } else {
+                            orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
+                            orderDetl.setQty(0D);
+                        }
+                    }
+                }else {
+                    if (orderDetlSou.beSimilar2(orderDetl)) {
+                        double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
+                        if (v < orderDetl.getQty() || orderDetl.getQty().equals(v)) {
+                            orderDetlSou.setQty(orderDetlSou.getAnfme());
+                            orderDetl.setQty(orderDetl.getQty() - v);
+                            break;
+                        } else {
+                            orderDetlSou.setQty(orderDetlSou.getQty() + orderDetl.getQty());
+                            orderDetl.setQty(0D);
+                        }
                     }
                 }
             }
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 01536e4..92f2386 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -215,26 +215,32 @@
                         }
 
                         // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
-                        addOrderDetlQty(wrkMast, wrkDetl);
-//                        OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
-//                        if (orderDetlPakout == null) {
-//                            orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null, wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
-//                        }
-//                        try {
-//                            if (!Cools.isEmpty(orderDetlPakout)) {
-////                                if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
-////                                        orderDetlPakin.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
-////                                        wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
-//
-//                                if (!orderDetlPakoutService.increaseQtyByOrderNo(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3(), wrkDetl.getAnfme())) {
-////                                    exceptionHandle("鎷f枡鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
-////                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
-//                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-//                                    return FAIL.setMsg("鎷f枡鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
-//                                }
-//                            }
-//                        } catch (Exception ignore) {
-//                        }
+                        //addOrderDetlQty(wrkMast, wrkDetl);
+                        OrderDetlPakout orderDetlPakout;
+                        if (!Cools.isEmpty(wrkDetl.getThreeCode())) {
+                            orderDetlPakout = orderDetlPakoutService.selectById(Long.parseLong(wrkDetl.getThreeCode()));
+                        } else {
+                            orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+                            if (orderDetlPakout == null) {
+                                orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null, wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+                            }
+                        }
+                        try {
+                            if (!Cools.isEmpty(orderDetlPakout)) {
+//                                if (!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
+//                                        orderDetlPakin.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+//                                        wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
+                                if (!orderDetlPakoutService.increaseQtyById(orderDetlPakout.getId(), wrkDetl.getAnfme())) {
+
+                                //if (!orderDetlPakoutService.increaseQtyByOrderNo(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3(), wrkDetl.getAnfme())) {
+//                                    exceptionHandle("鎷f枡鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
+//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
+                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                                    return FAIL.setMsg("鎷f枡鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+                                }
+                            }
+                        } catch (Exception ignore) {
+                        }
 
                     }
                     // 淇敼搴撲綅鐘舵�� Q ====>> F
@@ -436,22 +442,28 @@
                     }
                     for (WrkDetl wrkDetl : wrkDetls101) {
                         // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
-                        addOrderDetlQty(wrkMast, wrkDetl);
-//                        OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
-//                        if (orderDetlPakout == null) {
-//                            orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null, wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
-//                        }
-//                        try {
-//                            if (!Cools.isEmpty(orderDetlPakout)) {
-//                                if (!orderDetlPakoutService.increaseQtyByOrderNo(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), orderDetlPakout.getBatch(), orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3(), wrkDetl.getAnfme())) {
-////                                    exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
-////                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
-//                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-//                                    return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
-//                                }
-//                            }
-//                        } catch (Exception ignore) {
-//                        }
+                        //addOrderDetlQty(wrkMast, wrkDetl);
+                        OrderDetlPakout orderDetlPakout;
+                        if (!Cools.isEmpty(wrkDetl.getThreeCode())) {
+                            orderDetlPakout = orderDetlPakoutService.selectById(Long.parseLong(wrkDetl.getThreeCode()));
+                        } else {
+                            orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+                            if (orderDetlPakout == null) {
+                                orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null, wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+                            }
+                        }
+
+                        try {
+                            if (!Cools.isEmpty(orderDetlPakout)) {
+                                if (!orderDetlPakoutService.increaseQtyById(orderDetlPakout.getId(), wrkDetl.getAnfme())) {
+//                                    exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
+//                                            wrkMast.getWrkNo(), wrkMast.getLocNo());
+                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                                    return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+                                }
+                            }
+                        } catch (Exception ignore) {
+                        }
                     }
                     // 鍒犻櫎宸ヤ綔妗f簮搴撲綅鐨勫簱瀛樻槑缁�
                     if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
@@ -543,7 +555,10 @@
             OrderDetlPakout orderDetlPakout;
             switch (order.getDocType$()) {
                 case "閿�鍞彂璐�":
-                    orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null, wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+                    orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+                    if (Cools.isEmpty(orderDetlPakout)) {
+                        orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null, wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
+                    }
                     if (!Cools.isEmpty(orderDetlPakout)) {
                         OrderDetl orderDetl = orderDetlService.selectItem(orderDetlPakout.getOrderNo(), orderDetlPakout.getMatnr(), wrkDetl.getBatch(), orderDetlPakout.getBrand(), orderDetlPakout.getStandby1(), orderDetlPakout.getStandby2(), orderDetlPakout.getStandby3(), orderDetlPakout.getBoxType1(), orderDetlPakout.getBoxType2(), orderDetlPakout.getBoxType3());
                         if (orderDetl == null) {
diff --git a/src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java b/src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java
index f9de850..6c2acdf 100644
--- a/src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java
+++ b/src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java
@@ -20,6 +20,10 @@
     private String pkBarcode;
 
     /**
+     *
+     */
+    private String zkdh;
+    /**
      * 
      */
     private String ts;
diff --git a/src/main/java/com/zy/nc/entity/NccScZkmxbWms.java b/src/main/java/com/zy/nc/entity/NccScZkmxbWms.java
index 7a1497e..d5d8e5d 100644
--- a/src/main/java/com/zy/nc/entity/NccScZkmxbWms.java
+++ b/src/main/java/com/zy/nc/entity/NccScZkmxbWms.java
@@ -314,6 +314,8 @@
      */
     private String wmsMemo;
 
+
+
     @Override
     public boolean equals(Object that) {
         if (this == that) {
diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index c77db99..7ebebd2 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -53,12 +53,7 @@
             if (wmsFlag == null || wmsFlag.isEmpty()) {
                 return;
             }
-            ReturnT<String> returnT;
-            if (wmsFlag.get(0).getNastnum().doubleValue() > 0) {
-                returnT = planOrderHandler.start1(wmsFlag);
-            } else {
-                returnT = planOrderHandler.start1In(wmsFlag);
-            }
+            ReturnT<String> returnT = planOrderHandler.start1(wmsFlag);
             if (!returnT.isSuccess()) {
                 for (NccSaleXsfhmxWms wms : wmsFlag) {
                     wms.setWmsMemo(returnT.getMsg());
@@ -66,8 +61,13 @@
                 }
                 log.error(returnT.getMsg());
             }
-        }
 
+//            if (wmsFlag.get(0).getNastnum().doubleValue() > 0) {
+//                returnT = planOrderHandler.start1(wmsFlag);
+//            } else {
+//                returnT = planOrderHandler.start1In(wmsFlag);
+//            }
+        }
     }
 
     /**
diff --git a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
index 492455b..8712fc1 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -25,6 +25,7 @@
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 @Service
@@ -66,27 +67,43 @@
     @Transactional
     public ReturnT<String> start1(List<NccSaleXsfhmxWms> wmsFlag) {
         try {
-            OpenOrderPakoutParam param = new OpenOrderPakoutParam();
-            DetlDto detlDto;
-            List<DetlDto> orderDetails = new ArrayList<>();
-            long i = 1;
-            for (NccSaleXsfhmxWms nccSaleXsfhmxWms : wmsFlag) {
-                param.setOrderType("閿�鍞彂璐�");
-                detlDto = new DetlDto();
-                detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
-                detlDto.setAnfme(nccSaleXsfhmxWms.getNnum().doubleValue());
-                detlDto.setStandby1(nccSaleXsfhmxWms.getFhckbm());
-                detlDto.setLineNumber(i);
-                detlDto.setRemark(JSONObject.toJSONString(nccSaleXsfhmxWms));
-                orderDetails.add(detlDto);
-                log.info("NccSaleXsfhmxWms鏁版嵁:{}", JSONObject.toJSON(nccSaleXsfhmxWms));
-                i++;
-                nccSaleXsfhmxWms.setWmsFlag(1);
-                param.setOrderNo(nccSaleXsfhmxWms.getVbillcode());
+            HashMap<String, List<NccSaleXsfhmxWms>> map = new HashMap<>();
+            List<NccSaleXsfhmxWms> fenzu;
+            for (NccSaleXsfhmxWms wms : wmsFlag) {
+                if (map.get(wms.getFhckbm()) == null) {
+                    fenzu = new ArrayList<>();
+                    fenzu.add(wms);
+                    map.put(wms.getFhckbm(), fenzu);
+                } else {
+                    fenzu = map.get(wms.getFhckbm());
+                    fenzu.add(wms);
+                    map.put(wms.getFhckbm(), fenzu);
+                }
             }
-            param.setOrderDetails(orderDetails);
-            openService.pakoutOrderCreate(param);
-            nccSaleXsfhmxWmsService.updateBatchById(wmsFlag);
+            int size = 1;
+            for (String key : map.keySet()) {
+                OpenOrderPakoutParam param = new OpenOrderPakoutParam();
+                DetlDto detlDto;
+                List<DetlDto> orderDetails = new ArrayList<>();
+                long i = 1;
+                for (NccSaleXsfhmxWms nccSaleXsfhmxWms : map.get(key)) {
+                    param.setOrderType("閿�鍞彂璐�");
+                    detlDto = new DetlDto();
+                    detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
+                    detlDto.setAnfme(nccSaleXsfhmxWms.getNnum().doubleValue());
+                    detlDto.setStandby1(nccSaleXsfhmxWms.getFhckbm());
+                    detlDto.setLineNumber(i);
+                    detlDto.setRemark(JSONObject.toJSONString(nccSaleXsfhmxWms));
+                    orderDetails.add(detlDto);
+                    log.info("NccSaleXsfhmxWms鏁版嵁:{}", JSONObject.toJSON(nccSaleXsfhmxWms));
+                    i++;
+                    nccSaleXsfhmxWms.setWmsFlag(1);
+                    param.setOrderNo(nccSaleXsfhmxWms.getVbillcode() + "-" + size);
+                }
+                param.setOrderDetails(orderDetails);
+                openService.pakoutOrderCreate(param);
+                nccSaleXsfhmxWmsService.updateBatchById(map.get(key));
+            }
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
diff --git a/src/main/resources/mapper/asrs/OrderDetlPakoutMapper.xml b/src/main/resources/mapper/asrs/OrderDetlPakoutMapper.xml
index 4cd14ca..b54c656 100644
--- a/src/main/resources/mapper/asrs/OrderDetlPakoutMapper.xml
+++ b/src/main/resources/mapper/asrs/OrderDetlPakoutMapper.xml
@@ -232,6 +232,13 @@
         <include refid="standbyAll"></include>
     </update>
 
+    <update id="increaseQtyById">
+        update man_order_detl_pakout
+        set qty = qty + #{qty}
+        where id = #{id}
+    </update>
+
+
     <update id="increaseWorkQty">
         update man_order_detl_pakout
         set work_qty = work_qty + #{workQty}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 90a240f..fe7f71e 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -188,12 +188,12 @@
     ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', width: 200}
     // ,{field: 'name', align: 'center',title: '鍒悕'}
     ,{field: 'specs', align: 'center',title: '瑙勬牸'}
-    ,{field: 'model', align: 'center',title: '浠g爜', hide: true}
+    ,{field: 'model', align: 'center',title: '鍨嬪彿'}
     ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
     ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
     ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
     ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
-    ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+    ,{field: 'sku', align: 'center',title: '鐗╂枡绠�绉�'}
     ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
     ,{field: 'barcode', align: 'center',title: '鏉$爜', hide: true}
     ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
@@ -225,12 +225,13 @@
     {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿锛堝搧鍙凤級', sort:true}
     ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', sort:true}
     ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
-    ,{field: 'batch', align: 'center',title: '璐у搧鐗瑰緛', sort:true}
+    ,{field: 'batch', align: 'center',title: '鎵规'}
     ,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
     ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜', hide: false}
-
     ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: false}
-    ,{field: 'model', align: 'center',title: '浠g爜', hide: true}
+    ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+    ,{field: 'supp', align: 'center',title: '瀹㈡埛'}
+    ,{field: 'standby1$', align: 'center',title: '浠撳簱'}
     ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
     ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
     ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
@@ -247,12 +248,10 @@
     ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
     ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
     ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
-    ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
     ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
     ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
     ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
     ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
-    ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
     ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
     ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
     ,{field: 'frozen$', align: 'center',title: '鍐荤粨鍚�',hide: true,

--
Gitblit v1.9.1