From be32a8ddbcbb4f6e7b707e6ef8d6c24c05a48897 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 16 六月 2023 16:02:55 +0800
Subject: [PATCH] #出入库日志修改

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

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 9558c78..04b7a00 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -24,6 +24,7 @@
 import com.zy.common.service.CommonService;
 import com.zy.common.utils.HttpHandler;
 import com.zy.common.utils.Synchro;
+import com.zy.system.entity.User;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -131,7 +132,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 +163,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け璐�");
                 }
@@ -177,7 +178,8 @@
 
                 }
                 Double anfme = orderDetl.getAnfme();
-                if ( anfme > (anfme - sum)) {
+                Double workQty = orderDetl.getWorkQty();
+                if ( anfme - (workQty+sum) < 0) {
                     throw new CoolException("缁勬墭鏁伴噺宸茶秴鍑鸿鍗曢渶姹傞噺锛岃妫�鏌ユ槸鍚︽湁鍏朵粬鐨勭粍鎵樺凡瀹屾垚");
                 }
             }
@@ -201,7 +203,8 @@
                     throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
                 }
 
-                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner());
+                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,8 +232,9 @@
                 waitPakin.setModiUser(userId);
                 waitPakin.setModiTime(now);
                 waitPakin.setOwner(detlDto.getOwner());
+                waitPakin.setPayment(detlDto.getPayment());
                 waitPakin.setUuid(uuid);
-                waitPakin.setWeight(param.getCombMats().get(0).getWeight());
+                waitPakin.setWeight(detlDto.getWeight());
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
                 }
@@ -253,7 +257,7 @@
 
         // 鑾峰彇鍟嗗搧鍒楄〃
         for(CombParam.CombMat combMat : param.getCombMats()){
-            String uuid = String.valueOf(System.currentTimeMillis());
+
             Mat mat = matService.selectByMatnr(combMat.getMatnr());
             if (Cools.isEmpty(mat)){
                 throw new CoolException(combMat.getMatnr() + ":鍟嗗搧妗f涓嶅瓨鍦紒");
@@ -272,7 +276,6 @@
             manLocDetl.setBatch(Cools.isEmpty(combMat.getBatch()) ? "" : combMat.getBatch());
             manLocDetl.setAnfme(combMat.getAnfme());
             manLocDetl.setModiTime(now);
-            manLocDetl.setUuid(uuid);
             manLocDetl.setOwner(1);
             if (!manLocDetlService.insert(manLocDetl)) {
                 throw new CoolException("鍟嗗搧涓婃灦澶辫触锛�");
@@ -517,7 +520,7 @@
 
     @Transactional
     @Override
-    public R manDetlIn(JSONObject json) {
+    public R manDetlIn(JSONObject json, User user) {
         Date date = new Date();
         String jsonLocNo = (String) json.get("locNo");
         Node node = nodeService.selectOne(new EntityWrapper<Node>()
@@ -549,7 +552,7 @@
             //鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙凤紝鏈夌殑璇濈洿鎺ュ鍔犳暟閲�
             ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
             if (checkManLocDetl == null) {
-                String uuid = String.valueOf(System.currentTimeMillis());
+
                 ManLocDetl manLocDetl = new ManLocDetl();
                 Synchro.Copy(orderDetl, manLocDetl);
                 manLocDetl.setLocNo(node.getName());
@@ -560,15 +563,18 @@
                 manLocDetl.setModiTime(date);
                 manLocDetl.setCreateTime(date);
                 manLocDetl.setBatch(jsonOrderDetl.getBatch());
-                manLocDetl.setUuid(uuid);
                 manLocDetl.setOwner(orderDetl.getOwner());
                 manLocDetl.setWeight(jsonOrderDetl.getWeight());
+                manLocDetl.setOrderNo(jsonOrderDetl.getOrderNo());
                 if(!manLocDetlService.insert(manLocDetl)){
                     return R.error("鎻掑叆骞冲簱鐗╂枡澶辫触锛�");
                 }
             } else {
                   if (checkManLocDetl.getWeight() == null){
                       checkManLocDetl.setWeight(0.0);
+                  }
+                  if (jsonOrderDetl.getWeight() == null){
+                      jsonOrderDetl.setWeight(0.0);
                   }
                 if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(),
                         node.getName(),
@@ -602,7 +608,7 @@
             }
             orderService.checkComplete(order.getOrderNo());
 
-            SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme());
+            SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername());
         }
 
 
@@ -611,7 +617,7 @@
 
     @Transactional
     @Override
-    public R manDetlOut(JSONObject json) {
+    public R manDetlOut(JSONObject json,User user) {
         Date date = new Date();
         String jsonLocNo = (String) json.get("locNo");
         Node node = nodeService.selectOne(new EntityWrapper<Node>()
@@ -721,7 +727,7 @@
                     return R.error("鏇存柊骞冲簱搴撳瓨鐘舵�佸け璐�");
                 }
             }
-            SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme());
+            SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername());
 
         }
         return R.ok("涓嬫灦瀹屾垚");

--
Gitblit v1.9.1