From efbfaeac84218efcaf118f7080dfd550ee04da44 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 24 四月 2024 12:59:44 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java |   66 ++++++++++++++++++++++++++++++++
 1 files changed, 65 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index ae17e90..66c5915 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -7,6 +7,7 @@
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.CombParam;
 import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.entity.param.PickParam;
 import com.zy.asrs.service.*;
 import com.zy.common.model.DetlDto;
 import lombok.extern.slf4j.Slf4j;
@@ -44,6 +45,8 @@
     private AgvWrkMastService agvWrkMastService;
     @Autowired
     private AgvWorkService agvWorkService;
+    @Autowired
+    private AgvWrkDetlService agvWrkDetlService;
 
 
     /*
@@ -90,6 +93,65 @@
     }
 
     /*
+    缁勬墭 + 缁戝畾鏆傚瓨浣�
+     */
+    @Override
+    @Transactional
+    public String pickAgain(PickParam pickParams, Long userId) {
+        Date now = new Date();
+        List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", pickParams.getLocNo()));
+
+        for (PickParam.Pick pick : pickParams.getPicks()) {
+            if (pick.getCount().equals(0D)) continue;
+            AgvWrkDetl wrkDetl = new AgvWrkDetl();
+            Mat mat = matService.selectByMatnr(pick.getMatnr());
+            if (Cools.isEmpty(mat)) {
+                throw new CoolException(pick.getMatnr() + "鍟嗗搧涓嶅瓨鍦�");
+            }
+            wrkDetl.sync(mat);
+            wrkDetl.setWrkNo(pickParams.getWrkNo());
+            wrkDetl.setOrderNo(pick.getOrderNo());
+            wrkDetl.setIoTime(now);
+            wrkDetl.setAnfme(pick.getCount()); // 鏁伴噺
+            wrkDetl.setSuppCode(pick.getSuppCode()); // 鎵樼洏鏉＄爜
+            wrkDetl.setAppeUser(userId);
+            wrkDetl.setAppeTime(now);
+            wrkDetl.setModiUser(userId);
+            wrkDetl.setModiTime(now);
+            wrkDetl.setThreeCode(pick.getThreeCode());
+            agvWrkDetlService.insert(wrkDetl);
+
+            // 鏇存柊璁㈠崟
+            OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", pick.getOrderNo()).eq("matnr", pick.getMatnr()).eq("three_code",pick.getThreeCode()));
+            orderDetl.setQty(orderDetl.getQty() + pick.getCount());
+            if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no", pick.getOrderNo()).eq("matnr", pick.getMatnr()).eq("three_code",pick.getThreeCode()))){
+                throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+pick.getOrderNo()+pick.getMatnr());
+            }
+        }
+        //  纭鏄惁鍏ㄩ儴鍑哄簱
+        int sameNumber = 0;
+        List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", pickParams.getWrkNo()));
+        for (AgvLocDetl agvLocDetl : agvLocDetls) {
+            for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
+                if (agvLocDetl.getMatnr().equals(agvWrkDetl.getMatnr())
+                    && agvLocDetl.getThreeCode().equals(agvWrkDetl.getThreeCode())
+                    && agvLocDetl.getSuppCode().equals(agvWrkDetl.getSuppCode())
+                    && agvLocDetl.getAnfme().equals(agvWrkDetl.getAnfme())) {
+                    sameNumber++;
+                }
+            }
+        }
+        if (agvLocDetls.size() == sameNumber) {
+            AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", pickParams.getWrkNo()));
+            agvWrkMast.setIoType(101);
+            agvWrkMastService.update(agvWrkMast,new EntityWrapper<AgvWrkMast>().eq("wrk_no", pickParams.getWrkNo()));
+        }
+
+
+        return "缁勬墭鎴愬姛锛岀粦瀹氱珯鐐规垚鍔�";
+    }
+
+    /*
     AGV鏃犲崟缁勬墭
      */
     private void NoOrderComb(CombParam param, Long userId){
@@ -101,6 +163,8 @@
             syncWaitPakin(detlDto,"",param.getBarcode(),userId,now);
         });
     }
+
+
 
     /*
     AGV鏈夊崟缁勬墭
@@ -142,7 +206,7 @@
             DetlDto detlDto = new DetlDto(combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme(), combMat.getCsocode(), combMat.getIsoseq(),combMat.getContainerCode(),param.getLocType());
             //鍚屼竴鎵樼洏涓嬬浉鍚岀墿鏂欎俊鎭拰鎵瑰彿杞负涓�涓叆搴撻�氱煡妗�
             if (DetlDto.has(detlDtos, detlDto)) {
-                DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(), detlDto.getCsocode(), detlDto.getIsoseq(),null);
+                DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(), detlDto.getCsocode(), detlDto.getIsoseq(),detlDto.getContainerCode());
                 assert one != null;
                 one.setAnfme(one.getAnfme() + detlDto.getAnfme());
             } else {

--
Gitblit v1.9.1