From 6eb6a4b530627471d41979ccbc977a7371e99c1f Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 15:36:59 +0800
Subject: [PATCH] 找库位

---
 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java |   39 ++++++++++-----------------------------
 1 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 5098403..f40d65e 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -353,12 +353,21 @@
             String locNo = agvWrkMast.getLocNo();
             agvWrkMast.setLocNo(agvWrkMast.getSourceLocNo());
             agvWrkMast.setSourceLocNo(locNo);
-            agvWrkMast.setModiTime(new Date());
+            agvWrkMast.setModiTime(now);
             agvWrkMast.setIoTime(now);
             agvWrkMast.setLogErrMemo("createWaitPainWrkMastStart");
             agvWrkMastService.updateById(agvWrkMast);
 
             List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
+            for (AgvWrkDetl agvWrkDetl : agvWrkDetlList) {
+                agvWrkDetl.setIoTime(now);
+                boolean bl = agvWrkDetlService.update(agvWrkDetl,new EntityWrapper<AgvWrkDetl>()
+                        .eq("wrk_no", agvWrkDetl.getWrkNo())
+                        .eq("matnr",agvWrkDetl.getMatnr())
+                        .eq("order_no",agvWrkDetl.getOrderNo())
+                        .eq("three_code",agvWrkDetl.getThreeCode()));
+//                        .eq("dead_time",agvWrkDetl.getDeadTime()));
+            }
             AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
             //List<AgvLocDetl> agvLocDetlList = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvLocMast.getLocNo()));
             AgvBasDevp agvBasDevp = agvBasDevpService.selectById(agvWrkMast.getSourceLocNo());
@@ -582,34 +591,6 @@
             long flowId = snowflakeIdWorker.nextId();
             agvWaitPakinList.forEach(wp -> {
                 createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime(),wp.getProcessSts());
-                // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
-                OrderDetl orderDetl = orderDetlService.selectItem(wp.getOrderNo(), wp.getMatnr(), wp.getThreeCode());
-//                FlowLog flowLog = new FlowLog();
-//                flowLog.setFid(String.valueOf(flowId));
-//                flowLog.setSpare2(wrkMast.getWrkNo().toString());
-//                flowLog.setLocNo(locNo);
-//                flowLog.setSpare1(containerCode);
-//                flowLog.setOpType(3L);
-//                flowLog.setOrderNo(wp.getOrderNo());
-//                flowLog.setThreeCode(wp.getThreeCode());
-//                flowLog.setMatnr(wp.getMatnr());
-//                flowLog.setMaktx(wp.getMaktx());
-//                flowLog.setOrderPrevious(orderDetl.getAnfme());
-//                flowLog.setOrderCurrent(orderDetl.getAnfme());
-//                flowLog.setOrderChanged(0.0);
-//                flowLog.setQtyPrevious(orderDetl.getQty()-wp.getAnfme());
-//                flowLog.setQtyCurrent(orderDetl.getQty());
-//                flowLog.setQtyChanged(wp.getAnfme());
-//
-//                flowLog.setLocPrevious(0.0D);
-//                flowLog.setLocCurrent(wp.getAnfme());
-//                flowLog.setLocChanged(wp.getAnfme());
-//
-//                flowLog.setUserId(userId);
-//                flowLog.setAppeTime(now);
-//                if (!flowLogService.insert(flowLog)) {
-//                    throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
-//                }
             });
             //淇敼鍏ュ簱閫氱煡妗g姸鎬�
             agvWaitPakinService.updateIoStatus(containerCode,"Y");

--
Gitblit v1.9.1