From 180d28a0dcc7319c55380a3c6e433d9b009c3b01 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 09 六月 2023 16:25:58 +0800
Subject: [PATCH] #入库测试完成

---
 src/main/java/com/zy/asrs/controller/LocDetlController.java      |   28 ++++++++++++--
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java      |    1 
 src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java            |    2 
 src/main/webapp/views/pakStore/turnOverQuery.html                |    4 +-
 src/main/resources/mapper/OrderDetlMapper.xml                    |    2 
 src/main/webapp/static/js/locDetl/locDetl.js                     |    6 ++-
 src/main/webapp/views/home/map.html                              |    4 +-
 src/main/java/com/zy/asrs/service/OrderDetlService.java          |    2 
 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java |    6 +-
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java      |   33 +++++++++-------
 src/main/webapp/static/js/order/order.js                         |    2 
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java    |    6 ++-
 src/main/java/com/zy/common/model/DetlDto.java                   |    9 ++++
 13 files changed, 72 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index f9e1bd1..d06d3d5 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -12,10 +12,7 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.R;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.LocOwner;
-import com.zy.asrs.entity.ManLocDetl;
-import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.*;
 import com.zy.asrs.mapper.LocDetlMapper;
 import com.zy.asrs.service.LocDetlService;
 import com.zy.asrs.service.LocOwnerService;
@@ -313,4 +310,27 @@
     }
 
 
+    @RequestMapping(value = "/locDetl/selectPayment/list/auth")
+    @ManagerAuth
+    public R list(@RequestParam(defaultValue = "1")Integer curr,
+                  @RequestParam(defaultValue = "10")Integer limit,
+                  @RequestParam(required = false)String orderByField,
+                  @RequestParam(required = false)String orderByType,
+                  @RequestParam Map<String, Object> param){
+        if (param.get("owner$") != null && param.get("owner$") != ""){
+             LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
+             param.remove("owner$");
+             param.put("owner",locOwner.getId());
+        }
+
+
+        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+        wrapper.eq("payment",0);
+        excludeTrash(param);
+        convert(param, wrapper);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
+
 }
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index c1b2331..35a11bd 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -25,7 +25,7 @@
 
     int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
 
-    int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+    int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty);
 
     int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status);
 
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 613de86..79ab5b0 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -20,7 +20,7 @@
 
     boolean increase(Long orderId, String matnr, String batch, Double qty);
 
-    boolean decrease(String orderNo, String matnr, String batch, Double qty);
+    boolean decrease(String orderNo, String matnr, String batch, Double workQty);
 
     boolean modifyStatus(Long orderId, Integer status);
 
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 5101c8b..e938d45 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -131,7 +131,7 @@
             // 鐢熸垚鍏ュ簱閫氱煡妗�
             List<DetlDto> detlDtos = new ArrayList<>();
             param.getCombMats().forEach(elem -> {
-                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getWeight());
                 if (DetlDto.has(detlDtos, detlDto)) {
                     DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                     assert one != null;
@@ -162,7 +162,7 @@
                 waitPakin.setModiTime(now);
                 waitPakin.setOwner(detlDto.getOwner());
                 waitPakin.setUuid(uuid);
-                waitPakin.setWeight(param.getCombMats().get(0).getWeight());
+                waitPakin.setWeight(detlDto.getWeight());
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
                 }
@@ -202,6 +202,7 @@
                 }
 
                 DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner(),elem.getWeight());
+                detlDto.setPayment(orderDetl.getPayment());
                 if (DetlDto.has(detlDtos, detlDto)) {
                     DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                     assert one != null;
@@ -229,6 +230,7 @@
                 waitPakin.setModiUser(userId);
                 waitPakin.setModiTime(now);
                 waitPakin.setOwner(detlDto.getOwner());
+                waitPakin.setPayment(detlDto.getPayment());
                 waitPakin.setUuid(uuid);
                 waitPakin.setWeight(detlDto.getWeight());
                 if (!waitPakinService.insert(waitPakin)) {
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 6d40844..f6ca913 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -54,10 +54,10 @@
     }
 
     @Override
-    public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
-        int decrease = this.baseMapper.decrease(orderNo, matnr, batch, qty);
+    public boolean decrease(String orderNo, String matnr, String batch, Double workQty) {
+        int decrease = this.baseMapper.decrease(orderNo, matnr, batch, workQty);
         if (decrease == 0) {
-            return this.baseMapper.decrease(orderNo, matnr, null, qty) > 0;
+            return this.baseMapper.decrease(orderNo, matnr, null, workQty) > 0;
         } else {
             return true;
         }
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 265d61e..f07908e 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -903,17 +903,17 @@
 
         }
 
-        // 璁㈠崟鍏宠仈
-        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
-        for (WrkDetl wrkDetl : wrkDetls) {
-            if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
-                if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
-                    throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
-                }
-                // 鐢熸垚鏂扮殑鍑哄簱浣滀笟
-//                        stockOutRe(wrkMast, wrkDetls);
-            }
-        }
+//        // 璁㈠崟鍏宠仈
+//        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+//        for (WrkDetl wrkDetl : wrkDetls) {
+//            if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+//                if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
+//                    throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+//                }
+//                // 鐢熸垚鏂扮殑鍑哄簱浣滀笟
+////                        stockOutRe(wrkMast, wrkDetls);
+//            }
+//        }
 
         // 鍙栨秷鎿嶄綔浜哄憳璁板綍
         wrkMast.setManuType("鎵嬪姩鍙栨秷");
@@ -1197,7 +1197,12 @@
                 if (!locNos.contains(locDetl.getLocNo())){
                     locNos.add(locDetl.getLocNo());
                     locNos2[i][0]=locDetl.getLocNo();
-                    locNos2[i][1]=locDetl.getManu();
+                    if (locDetl.getLocNo().substring(0,2) == "DT"){
+                        locNos2[i][1]= "骞冲簱";
+                    }else {
+                        locNos2[i][1]= "绔嬪簱";
+                    }
+
                     i++;
                 }
             }
@@ -1208,7 +1213,7 @@
                     for (ManLocDetl manLocDetl:manLocDetls){
                         manLocDetl.setPayment(1);
                         try{
-                            manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("uuid",manLocDetl.getMatnr()));
+                            manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>().eq("loc_no", locNo).eq("matnr",manLocDetl.getMatnr()));
                         }catch (Exception e){
                             throw new Exception("鏇存柊搴撳瓨鏄庣粏璐х墿褰㈡�佸瓧娈典俊鎭嚭閿欎簡");
                         }
@@ -1218,7 +1223,7 @@
                     for (LocDetl locDetl:locDetls){
                         locDetl.setPayment(1);
                         try{
-                            locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("uuid",locDetl.getMatnr()));
+                            locDetlService.update(locDetl,new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("matnr",locDetl.getMatnr()));
                         }catch (Exception e){
                             throw new Exception("鏇存柊搴撳瓨鏄庣粏璐х墿褰㈡�佸瓧娈典俊鎭嚭閿欎簡");
                         }
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 9182407..760f212 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -111,6 +111,7 @@
                             locDetl.setAppeTime(now);
                             locDetl.setOwner(wrkDetl.getOwner());
                             locDetl.setPayment(wrkDetl.getPayment());
+                            locDetl.setWeight(wrkDetl.getWeight());
                             if (!locDetlService.insert(locDetl)) {
 //                                exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 39c7841..4dc94d0 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -22,6 +22,8 @@
 
     private int owner;
 
+    private int payment;
+
     private Double weight;
 
     public DetlDto() {
@@ -59,6 +61,13 @@
         this.weight = weight;
     }
 
+    public DetlDto(String matnr, String batch, Double anfme,Double weight) {
+        this.matnr = matnr;
+        this.batch = batch;
+        this.anfme = anfme;
+        this.weight = weight;
+    }
+
 
     public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
         for (DetlDto dto : detlDtos) {
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index a7a495a..a45e8b8 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -157,7 +157,7 @@
 
     <update id="decrease">
         update man_order_detl
-        set qty = qty - #{qty}
+        set work_qty = work_qty - #{workQty}
         where 1=1
         and order_no = #{orderNo}
         and matnr = #{matnr}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 625a052..dcc1056 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -5,10 +5,10 @@
         {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: '鎵瑰彿', width: 300, sort:true}
+        ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 200, sort:true}
         ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
         ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
-        ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+        ,{field: 'specs', align: 'center',title: '閰嶇疆',hide: true}
         ,{field: 'model', align: 'center',title: '浠g爜', hide: true}
         ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
         ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
@@ -23,6 +23,8 @@
         ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
         ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
         ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false}
+        ,{field: 'owner$', align: 'center',title: '璐т富', hide: false}
+        ,{field: 'payment$', align: 'center',title: '璐х墿鐘舵��', hide: false}
         ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
         ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
         ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 65ada4d..1e87b29 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -317,7 +317,7 @@
                         {field: 'specs', title: '瑙勬牸'},
                         {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                         {field: 'owner', title: '璐т富缂栧彿', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
-                        {field: 'payment', title: '璐т富缂栧彿', style: 'color: blue;font-weight: bold', templet: '#payment'},
+                        {field: 'payment', title: '璐х墿鐘舵��', style: 'color: blue;font-weight: bold', templet: '#payment'},
                         // {field: 'payment', title: '璐х墿鐘舵��',align: 'center', templet: '#payment'},
                         {field: 'qty', title: '浣滀笟鏁伴噺',  minWidth: 100, width: 100},
                         // {field: 'unit', title: '鍗曚綅', width: 80},
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index cd9ec96..7c60b79 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -689,7 +689,7 @@
             rightBoxLeft: "0px",
             pointContainerWidth: 0,
             currentLev: 1,
-            area:6,
+            area:1,
             areaName:"绔嬪簱",
             crnList: null,
             crnBox: false,
@@ -842,7 +842,7 @@
                     }else if (this.area == 6){
                         if (rowData[i].locNo != undefined) {
                             let locNo = rowData[i].locNo;
-                            return "#" + parseInt(locNo.substr(8, 2));
+                            return "#" + parseInt(locNo.substr(7, 2));
                         }
                     }
                     else {
diff --git a/src/main/webapp/views/pakStore/turnOverQuery.html b/src/main/webapp/views/pakStore/turnOverQuery.html
index b414156..8885add 100644
--- a/src/main/webapp/views/pakStore/turnOverQuery.html
+++ b/src/main/webapp/views/pakStore/turnOverQuery.html
@@ -69,7 +69,7 @@
         </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="owner" placeholder="璐т富" autocomplete="off">
+                <input class="layui-input" type="text" name="owner$" placeholder="璐т富" autocomplete="off">
             </div>
         </div>
         <!-- 寰呮坊鍔� -->
@@ -125,7 +125,7 @@
         locDetlTableIns = table.render({
             elem: '#stockOut',
             headers: {token: localStorage.getItem('token')},
-            url: baseUrl+'/turn/over/list/auth',
+            url: baseUrl+'/locDetl/selectPayment/list/auth',
             page: true,
             limits: [16, 30, 50, 100, 200, 500],
             limit: 16,

--
Gitblit v1.9.1