From a23bf319248345801a7f3110f246336d244e8edc Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 17 二月 2025 13:55:10 +0800
Subject: [PATCH] 退货增加退货标识，退货人，退货备注，清空库区和库位值

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   65 +++++++++++++++++++++++++++++---
 1 files changed, 59 insertions(+), 6 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 3ef60c2..4a1bd0e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -20,6 +20,7 @@
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.SaasLogService;
+import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -103,6 +104,7 @@
     private PlaQtyService plaQtyService;
     @Autowired
     private SaasLogService saasLogService;
+
 
 
 
@@ -664,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);
         }
 
 
@@ -806,7 +808,7 @@
                 }
             }
             SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
-                    null,null,null,null,null);
+                    null,null,null,null,null,null);
 
         }
         return R.ok("涓嬫灦瀹屾垚");
@@ -1231,11 +1233,12 @@
 
         plaService.updateById(pla);
         SaasUtils.insertLog(0,locNo,pla.getBrand(),pla.getWeightAnfme(),user.getUsername(),
-                null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+                null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
     }
 
     @Override
     @Transactional
+    @Synchronized
     public void plaPakout(String brand, String locNo, String batch, Integer packageNo, String orderNo, String plaQtyId, String wrkNo, Double anfme, boolean isReplace) {
         Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
 
@@ -1265,6 +1268,7 @@
         manPakOut.setCount(manPakOut.getCount() + anfme);
         if (manPakOut.getAnfme().equals(manPakOut.getCount())){
             manPakOut.setStatus(1);
+            manPakOut.setUpdateTime(new Date());
             manPakOutService.updateById(manPakOut);
         }
 
@@ -1283,12 +1287,14 @@
         }
         plaService.updateById(pla);
         SaasUtils.insertLog(1,locNo,pla.getBrand(),anfme,null,null,
-                pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+                pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
 
         //鏇存柊璁㈠崟鏄庣粏
         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);
 
@@ -1319,7 +1325,7 @@
 
         plaService.updateById(pla);
 
-        SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,null,null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+        SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,null,null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
 
     }
 
@@ -1353,8 +1359,55 @@
         manPakOut.setMaktx(plaNew.getBrand());
         manPakOut.setBatch(plaNew.getBatch());
         manPakOut.setBarcode(plaNew.getPackageNo() + "");
+        manPakOut.setUpdateTime(new Date());
 
         manPakOutService.updateById(manPakOut);
 
     }
+
+    @Override
+    public List<Pla> pdaSelectInfmt(String barcode) {
+        EntityWrapper<Pla> plaEntityWrapper = new EntityWrapper<>();
+        String[] split = barcode.split(";");
+        if (split.length == 4){
+            plaEntityWrapper.eq("brand",split[0]);
+            plaEntityWrapper.eq("batch",split[1]);
+            plaEntityWrapper.eq("package_no",split[2]);
+            plaEntityWrapper.eq("line",split[3]);
+        }else if (split.length == 1){
+            Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", barcode));
+            if (Cools.isEmpty(node)){
+                throw new CoolException("璇锋鏌ヨ緭鍏ョ殑搴撲綅鐮�");
+            }
+            plaEntityWrapper.eq("loc_no",barcode);
+            plaEntityWrapper.notLike("status","鍏ㄩ儴鍑哄簱");
+        }else {
+            throw new CoolException("鏉＄爜淇℃伅鏈夎!");
+        }
+        List<Pla> plaList = plaService.selectList(plaEntityWrapper);
+        if (Cools.isEmpty(plaList)){
+            throw new CoolException("鏈煡璇㈠埌搴撳瓨鐗╂枡淇℃伅");
+        }
+        return plaList;
+    }
+
+    public boolean checkMaximum(String locNo, int packageNum){
+
+        Node node = nodeService.selectByUuid(locNo);
+        Node nodeParent = nodeService.selectById(node.getParentId());
+
+        if(Cools.isEmpty(nodeParent.getMajor())){
+            return true;
+        }
+
+        //褰撳墠搴撳瓨鍖呮暟
+        int count = plaService.selectCount(new EntityWrapper<Pla>().eq("loc_no", locNo)
+                .notIn("status", "鍏ㄩ儴鍑哄簱"));
+
+        if(nodeParent.getMajor() < count + packageNum){
+            return false;
+        }
+
+        return true;
+    }
 }

--
Gitblit v1.9.1