From 3e015fc9d05c451d34fd33e846349d4b2bd7b600 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 09 六月 2023 11:11:03 +0800
Subject: [PATCH] #删除uuid

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 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 e147b9b..5101c8b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -162,6 +162,7 @@
                 waitPakin.setModiTime(now);
                 waitPakin.setOwner(detlDto.getOwner());
                 waitPakin.setUuid(uuid);
+                waitPakin.setWeight(param.getCombMats().get(0).getWeight());
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
                 }
@@ -200,7 +201,7 @@
                     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());
                 if (DetlDto.has(detlDtos, detlDto)) {
                     DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                     assert one != null;
@@ -229,6 +230,7 @@
                 waitPakin.setModiTime(now);
                 waitPakin.setOwner(detlDto.getOwner());
                 waitPakin.setUuid(uuid);
+                waitPakin.setWeight(detlDto.getWeight());
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
                 }
@@ -251,7 +253,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() + ":鍟嗗搧妗ｆ涓嶅瓨鍦紒");
@@ -270,7 +272,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("鍟嗗搧涓婃灦澶辫触锛�");
@@ -547,7 +548,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());
@@ -558,15 +559,24 @@
                 manLocDetl.setModiTime(date);
                 manLocDetl.setCreateTime(date);
                 manLocDetl.setBatch(jsonOrderDetl.getBatch());
-                manLocDetl.setUuid(uuid);
                 manLocDetl.setOwner(orderDetl.getOwner());
+                manLocDetl.setWeight(jsonOrderDetl.getWeight());
                 if(!manLocDetlService.insert(manLocDetl)){
-                    return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
+                    return R.error("鎻掑叆骞冲簱鐗╂枡澶辫触锛�");
                 }
             } else {
-                if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(), jsonOrderDetl.getOrderNo(), jsonOrderDetl.getMaktx(), jsonOrderDetl.getBatch())<=0){
+                  if (checkManLocDetl.getWeight() == null){
+                      checkManLocDetl.setWeight(0.0);
+                  }
+                if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(),
+                        node.getName(),
+                        jsonOrderDetl.getMatnr(),
+                        jsonOrderDetl.getBatch(),checkManLocDetl.getWeight()+jsonOrderDetl.getWeight()
+                        )<=0
+                        ){
                     return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
                 }
+
             }
             orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
             orderDetl.setWorkQty(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme());
@@ -589,7 +599,11 @@
                 return R.error("鏇存柊璁㈠崟鐘舵�佸け璐�");
             }
             orderService.checkComplete(order.getOrderNo());
+
+            SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme());
         }
+
+
         return R.ok("涓婃灦瀹屾垚");
     }
 
@@ -643,12 +657,18 @@
                 return R.error("鍑哄簱鏁伴噺澶т簬鍙嚭鏁伴噺");
             }
             Double finalQty = checkManLocDetl.getAnfme() - jsonOrderDetl.getAnfme();
+            Double weight = checkManLocDetl.getWeight() - jsonOrderDetl.getWeight();
+            checkManLocDetl.setAnfme(finalQty);
+            checkManLocDetl.setWeight(weight);
+            if (weight < 0){
+                return R.error("鍑哄簱閲嶉噺鏈夎锛�");
+            }
             if (finalQty < 0){
                 //  if(manLocDetlService.deleteDatailed(jsonLocNo, jsonOrderDetl.getMatnr(), jsonOrderDetl.getBatch())<=0) {
                 return R.error("鏁伴噺鏈夎锛�");
                 //   }
             }else {
-                if(manLocDetlService.increase(finalQty, jsonLocNo, jsonOrderDetl.getMatnr(), jsonOrderDetl.getBatch())<=0){
+                if(manLocDetlService.increase(finalQty, jsonLocNo, jsonOrderDetl.getMatnr(), jsonOrderDetl.getBatch(),weight)<=0){
                     return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
                 }
             }

--
Gitblit v1.9.1