From 089c397e3eff318d9cec8edacaf6d0f70165c38a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 09 二月 2026 13:11:15 +0800
Subject: [PATCH] 入出库日志优化

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 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 3ad8124..aeeef26 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -666,7 +666,7 @@
             orderService.checkComplete(order.getOrderNo());
 
             SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
-        null,null,null,null,null,null);
+        null,null,null,null,null,null,"璁㈠崟涓婃灦锛�"+jsonOrderDetl.getAnfme());
         }
 
 
@@ -808,7 +808,7 @@
                 }
             }
             SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
-                    null,null,null,null,null,null);
+                    null,null,null,null,null,null,"璁㈠崟涓嬫灦锛�" +jsonOrderDetl.getAnfme() );
 
         }
         return R.ok("涓嬫灦瀹屾垚");
@@ -1233,7 +1233,7 @@
 
         plaService.updateById(pla);
         SaasUtils.insertLog(0,locNo,pla.getBrand(),pla.getWeightAnfme(),user.getUsername(),
-                null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
+                null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"pla鍏ュ簱:" + pla.getWeightAnfme());
     }
 
     @Override
@@ -1275,7 +1275,7 @@
         //鏇存柊plaQty淇℃伅
         plaQty.setPakoutTime(Utils.getDateStr(new Date()));
         plaQtyService.updateById(plaQty);
-
+        double beforeWeightAnfme = pla.getWeightAnfme();
         //鏇存柊pla鏄庣粏
         pla.setWeightAnfme(pla.getWeightAnfme() - anfme);
         pla.setQtyAnfme(pla.getQtyAnfme() - anfme);
@@ -1285,14 +1285,17 @@
         }else {
             pla.setStatus(GlobleParameter.PLA_STATUS_3);
         }
+        log.info("pla鍑哄簱v1,璁㈠崟鍑哄簱锛屾洿鏂颁负寰呭嚭搴撴垨鍒欏叏閮ㄥ嚭搴擄紝pla:{},anfme:{}锛屾槸鍚︽浛鎹�:{}",pla,anfme,isReplace);
         plaService.updateById(pla);
         SaasUtils.insertLog(1,locNo,pla.getBrand(),anfme,null,null,
-                pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
+                pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"pla鍑哄簱鍓嶏細" + beforeWeightAnfme+",鍑哄簱锛�" + anfme);
 
         //鏇存柊璁㈠崟鏄庣粏
         Order order = orderService.selectByNo(orderNo);
         OrderDetl orderDetl = orderDetlService.selectById(plaQty.getOrderDetlId());
-
+        if (orderDetl == null){
+            throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦ㄦ垨鑰呬笉鍖归厤");
+        }
         orderDetl.setQty(orderDetl.getQty() + anfme);
         orderDetlService.updateById(orderDetl);
 
@@ -1303,6 +1306,7 @@
     @Override
     public void plaPackOutWithoutOrder(String brand, String batch, Integer packageNo, Double anfme) {
         Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
+        double beforeWeightAnfme = pla.getWeightAnfme();
         if(Cools.isEmpty(pla)){
             throw new CoolException("褰撳墠鐗╂枡鏄庣粏涓嶅瓨鍦�");
         }
@@ -1313,7 +1317,7 @@
             throw new CoolException("褰撳墠鐗╂枡鍓╀綑搴撳瓨涓嶈冻");
         }
 
-
+        log.info("鏃犺鍗曟嫞璐у嚭搴�,鏇存柊涓哄緟鍑哄簱鎴栧垯鍏ㄩ儴鍑哄簱锛宲la:{},anfme:{}",pla,anfme);
         pla.setWeightAnfme(pla.getWeightAnfme() - anfme);
         if(pla.getWeightAnfme() > 0){
             pla.setStatus(GlobleParameter.PLA_STATUS_3);
@@ -1323,7 +1327,8 @@
 
         plaService.updateById(pla);
 
-        SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,null,null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
+        SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,null,null,
+                pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"pla鎵嬪姩鍑哄簱鍓�:" + beforeWeightAnfme +",鍑哄簱锛�" + anfme);
 
     }
 
@@ -1342,7 +1347,7 @@
         plaService.updateById(plaNew);
 
         plaOld.setStatus(GlobleParameter.PLA_STATUS_1);
-        plaOld.setQtyAnfme(plaOld.getQtyAnfme() - manPakOut.getCount());
+        plaOld.setQtyAnfme(0.0);
 
         plaService.updateById(plaOld);
 

--
Gitblit v1.9.1