From f10169ec96e281abd2d68064ca855e48e9dc9e6a Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期一, 20 六月 2022 15:54:59 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

---
 src/main/resources/mapper/OrderDetlMapper.xml                    |   19 ++++++++-
 src/main/java/com/zy/asrs/entity/OrderDetl.java                  |   23 +++++++++--
 src/main/java/com/zy/asrs/service/OrderDetlService.java          |   10 +++++
 src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java            |    2 +
 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java |   13 ++++++
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java      |    2 
 src/main/webapp/static/js/order/order.js                         |    3 +
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java    |    6 +-
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java           |    2 
 9 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 8a2728c..da61de9 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -55,10 +55,20 @@
     /**
      * 浣滀笟鏁伴噺
      *
-     *  1. 鍏ュ簱 : qty 馃憜
-     *  1. 鍑哄簱 : qty 馃憜
+     *  鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
+     *  鍑哄簱 : 宸ヤ綔妗c�佸嚭搴撳畬鎴愭暟閲�
      */
     @ApiModelProperty(value= "浣滀笟鏁伴噺")
+    @TableField("work_qty")
+    private Double workQty;
+
+    /**
+     * 瀹屾垚鏁伴噺
+     *
+     *  鍏ュ簱 : qty 馃憜
+     *  鍑哄簱 : qty 馃憜
+     */
+    @ApiModelProperty(value= "瀹屾垚鏁伴噺")
     private Double qty;
 
     /**
@@ -433,9 +443,12 @@
     }
 
     public Double getEnableQty() {
-        if (null != this.anfme && this.qty != null) {
-            return this.anfme - this.qty;
+        if (null != this.anfme && this.workQty != null) {
+            return this.anfme - this.workQty;
         }
+//        if (null != this.anfme && this.qty != null) {
+//            return this.anfme - this.qty;
+//        }
         return null;
     }
 
@@ -443,4 +456,4 @@
         Synchro.Copy(source, this);
     }
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index 3dac639..cad5da0 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -30,4 +30,6 @@
     int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status);
 
     int addToLogTable(OrderDetl orderDetl);
+
+    int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double workQty);
 }
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 8bef62f..7becdf2 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -25,4 +25,14 @@
     boolean modifyStatus(Long orderId, Integer status);
 
     boolean addToLogTable(OrderDetl orderDetl);
+
+    /**
+     * 鍏ュ嚭搴撲换鍔$敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+     * @param orderId
+     * @param matnr
+     * @param batch
+     * @param workQty
+     * @return
+     */
+    boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index d8f9899..7f80bd7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -362,9 +362,9 @@
                 if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
                     throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
                 }
-                // 淇敼璁㈠崟鏄庣粏鏁伴噺
-                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
-                    throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
+                // 淇敼璁㈠崟浣滀笟鏁伴噺
+                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+                    throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
                 }
 
                 // 淇濆瓨鍏ュ簱閫氱煡妗�
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index eade655..dc3d7c8 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -72,4 +72,17 @@
     public boolean addToLogTable(OrderDetl orderDetl) {
         return this.baseMapper.addToLogTable(orderDetl) > 0;
     }
+
+    /**
+     * 鍏ュ嚭搴撲换鍔$敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+     * @param orderId
+     * @param matnr
+     * @param batch
+     * @param workQty
+     * @return
+     */
+    @Override
+    public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
+        return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty) > 0;
+    }
 }
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 0b8c247..319a009 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -742,7 +742,7 @@
                 if (Cools.isEmpty(locMast)) {
                     throw new CoolException("鍙栨秷搴撲綅杞Щ澶辫触锛屾簮搴撲綅涓嶅瓨鍦�:"+ wrkMast.getSourceLocNo());
                 }
-                locMast.setLocSts("F");
+                locMast.setLocSts(wrkMast.getFullPlt().equalsIgnoreCase("N")?"D":"F");
                 locMast.setModiTime(new Date());
                 locMast.setModiUser(userId);
                 locMastService.updateById(locMast);
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 1619b74..61004e9 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -38,7 +38,7 @@
         }
     }
 
-    @Scheduled(cron = "0/5 * * * * ? ")
+//    @Scheduled(cron = "0/5 * * * * ? ")
     @Async("orderThreadPool")
     public void completeAndReport(){
         String erpReport = Parameter.get().getErpReport();
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 2b147a4..b8e55d7 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -8,11 +8,11 @@
         <result column="order_id" property="orderId" />
         <result column="order_no" property="orderNo" />
         <result column="anfme" property="anfme" />
+        <result column="work_qty" property="workQty" />
         <result column="qty" property="qty" />
         <result column="matnr" property="matnr" />
         <result column="maktx" property="maktx" />
         <result column="batch" property="batch" />
-
         <result column="specs" property="specs" />
         <result column="model" property="model" />
         <result column="color" property="color" />
@@ -39,7 +39,6 @@
         <result column="source" property="source" />
         <result column="inspect" property="inspect" />
         <result column="danger" property="danger" />
-
         <result column="status" property="status" />
         <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />
@@ -169,4 +168,20 @@
         INSERT INTO man_order_detl_log SELECT * FROM man_order_detl WHERE id = #{id}
     </insert>
 
+    <update id="increaseWorkQty">
+        update man_order_detl
+        set work_qty = work_qty + #{workQty}
+        where 1=1
+        and order_id = #{orderId}
+        and matnr = #{matnr}
+        <choose>
+            <when test="batch != null and batch != ''">
+                and batch = #{batch}
+            </when>
+            <otherwise>
+                and (batch IS NULL OR batch = '')
+            </otherwise>
+        </choose>
+    </update>
+
 </mapper>
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index cde142a..cde08e5 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -123,7 +123,8 @@
                             {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
                             {field: 'batch', title: '搴忓垪鐮�'},
                             {field: 'anfme', title: '鏁伴噺'},
-                            {field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'},
+                            {field: 'workQty', title: '浣滀笟鏁伴噺'},
+                            {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
                             // {field: 'unit', title: '鍗曚綅'},
                             // {
                             //     field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {

--
Gitblit v1.9.1