From 36ee5dcf26d772d3e1debb4893f65a42cb65e8f3 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 15 六月 2023 10:40:41 +0800
Subject: [PATCH] 出入库日志优化

---
 src/main/java/com/zy/asrs/controller/OutController.java |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index e02785c..689e721 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -33,7 +33,7 @@
     @Autowired
     private LocDetlService locDetlService;
     @Autowired
-    private LocMastService locMastService;
+    private PakoutService pakoutService;
     @Autowired
     private StaDescService staDescService;
     @Autowired
@@ -67,11 +67,11 @@
         for (OrderDetl orderDetl : orderDetls) {
             double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
             if (issued <= 0.0D) { continue; }
-            List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
+            List<LocDetl> locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner());
             for (LocDetl locDetl : locDetls) {
                 if (issued > 0) {
                     LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
-                            issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+                            issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued,locDetl.getOwner(),locDetl.getPayment());
                     List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
 //                    LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
 //                            locDetl.getAnfme(), issued < locDetl.getAnfme()? issued : locDetl.getAnfme());
@@ -88,7 +88,7 @@
                 }
             }
             if (issued > 0) {
-                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getOwner(),1);
 //                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), 0.0,issued);
                 locDto.setLack(Boolean.TRUE);
                 locDtos.add(locDto);
@@ -116,7 +116,7 @@
             }
         }
         if (Cools.isEmpty(locDtos)) {
-            return R.error("绔嬪簱鍙傛暟涓虹┖锛岃鐢熸垚鎷ｈ揣鍗曪紝骞冲簱鎷ｈ揣鍑哄簱");
+            return R.ok("绔嬪簱鍙傛暟涓虹┖锛岃鐢熸垚鎷ｈ揣鍗曪紝骞冲簱鎷ｈ揣鍑哄簱");
         }
         boolean lack = true;
         for (LocDto locDto : locDtos) {
@@ -202,6 +202,7 @@
         if (Cools.isEmpty(locDtos)) {
             return R.error("骞冲簱鍙傛暟涓虹┖锛屾病鏈夌敓鎴愭嫞璐у崟");
         }
+        String uuid = String.valueOf(System.currentTimeMillis());
         boolean lack = true;
         for (LocDto locDto : locDtos) {
             if (!locDto.isLack()) {
@@ -214,10 +215,10 @@
         }
         for (LocDto locDto:locDtos){
             ManLocDetl manLocDetl = manLocDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch());
-            if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme()>=manLocDetl.getAnfme())) {
+            if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme()>manLocDetl.getAnfme())) {
                 manLocDetl.setStatus(0);
-                if (manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>().eq("uuid", manLocDetl.getUuid()))) {
-                    if (addPakOUT(locDto).equals(R.ok())) {
+                if (manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>().eq("loc_no", manLocDetl.getLocNo()).eq("matnr",manLocDetl.getMatnr()))) {
+                    if (addPakOUT(locDto,uuid).equals(R.ok())) {
                         Order order = orderService.selectByNo(locDto.getOrderNo());
                         if (Cools.isEmpty(order)){
                             return R.error("鏌ヨ璁㈠崟澶辫触锛岃鑱旂郴绠＄悊鍛�"+locDto.getOrderNo());
@@ -240,18 +241,18 @@
                     }
                 }
             }else if (locDto.getLocNo().equals("绔嬪簱")){
-                addPakOUT(locDto).equals(R.ok());
+                addPakOUT(locDto,uuid).equals(R.ok());
             }
         }
         for (LocDto locDto:locDtos){
             if (locDto.getLocNo().equals("搴撳瓨涓嶈冻")){
-                addPakOUT(locDto).equals(R.ok());
+                addPakOUT(locDto,uuid).equals(R.ok());
             }
         }
         return R.ok();
     }
 
-    private R addPakOUT(LocDto locDto){
+    private R addPakOUT(LocDto locDto,String uuid){
         ManPakOut manPakOut=new ManPakOut();
         manPakOut.setWrkNo(locDto.getOrderNo()+"-"+System.currentTimeMillis());
         manPakOut.setWrkSts((long)1);
@@ -265,6 +266,9 @@
         manPakOut.setCreateTime(new Date());
         manPakOut.setBatch(locDto.getBatch());
         manPakOut.setUpdateTime(new Date());
+        manPakOut.setPayment(locDto.getPayment());
+        manPakOut.setOwner(locDto.getOwner());
+        manPakOut.setUuid(uuid);
         if (Cools.isEmpty(manPakOutService.selectOne(new EntityWrapper<ManPakOut>().eq("doc_num",locDto.getOrderNo())))){
             manPakOut.setName(locDto.getMaktx());
         }

--
Gitblit v1.9.1