From 2fc477de92ef724cd37a79a3679c7d605adb94ab Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:57:06 +0800
Subject: [PATCH] 添加MES库存同步功能及配置

---
 src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java |  345 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 235 insertions(+), 110 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
index 1d2ebdc..036acb0 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -35,15 +35,15 @@
     @Autowired
     AgvBasDevpService agvBasDevpService;
 
-    public ReturnT<String> start(AgvLocMast agvLocMast) {
-        // locType 1. 鑷姩锛� 2. 鎵嬪姩
-        if (agvLocMast.getLocType().equals("1")) {
-            return doAutoMove(agvLocMast);
-        } else if (agvLocMast.getLocType().equals("2")) {
-            return doHandMove(agvLocMast);
-        }
-        return SUCCESS;
-    }
+//    public ReturnT<String> start(AgvLocMast agvLocMast) {
+//        // locType 1. 鑷姩锛� 2. 鎵嬪姩
+//        if (agvLocMast.getLocType().equals("1")) {
+//            return doAutoMove(agvLocMast);
+//        } else if (agvLocMast.getLocType().equals("2")) {
+//            return doHandMove(agvLocMast);
+//        }
+//        return SUCCESS;
+//    }
 
     public ReturnT<String> start2(AgvWrkMast agvWrkMast) {
         // locType 1. 鑷姩锛� 2. 鎵嬪姩
@@ -55,66 +55,73 @@
         doHandMove2(agvWrkMast);
         return SUCCESS;
     }
-    //鏍规嵁搴撲綅鐨刲octype鍊煎彂閫佷换鍔�--寮冪敤
-    private ReturnT<String> doAutoMove(AgvLocMast agvLocMast) {
-        Date now = new Date();
-        //鏌ヨ宸ヤ綔妗�
-        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvLocMast.getBarcode());
-        if(!Cools.isEmpty(agvWrkMast)){
-            throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
-        }
-        //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
-        AgvLocMast LocMast = agvCommonService.getLocNo(3,agvLocMast.getLocType3(),false,true);
-        //鐢熸垚宸ヤ綔妗�
-        AgvWrkMast mast = new AgvWrkMast();
-        //宸ヤ綔鐘舵��
-        mast.setWrkSts(201L);
-        //鍏ュ嚭搴撶被鍨�
-        mast.setIoType(108);
-        mast.setIoTime(now);
-        //浼樺厛绾�
-        mast.setIoPri(300.0);
-        //婧愮珯鐐�
-        mast.setSourceLocNo(agvLocMast.getLocNo());
-        //鐩爣绔欑偣
-        mast.setLocNo(LocMast.getLocNo());
-        //璐ф灦缂栫爜
-        mast.setBarcode(agvLocMast.getBarcode());
-        //璐ф灦绫诲瀷
-        mast.setWhsType(30);
 
-        mast.setAppeUser(9527L);
-        mast.setAppeTime(now);
-        mast.setModiUser(9527L);
-        mast.setModiTime(now);
-        if (!agvWrkMastService.insertByIncrease(mast)) {
-            throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
-        }
-
-        AgvWrkMast mast1 = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", LocMast.getLocNo()).eq("source_loc_no",agvLocMast.getLocNo()));
-        //鐢熸垚宸ヤ綔妗f槑缁�
-        List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
-        agvLocDetls.forEach(agvLocDetl -> {
-            AgvWrkDetl wrkDetl = new AgvWrkDetl();
-            wrkDetl.setWrkNo(mast1.getWrkNo());
-            wrkDetl.sync(agvLocDetl);
-            wrkDetl.setSpecs("1-" + agvLocMast.getLocType3());
-            wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
-            wrkDetl.setIoTime(now);
-            wrkDetl.setAppeUser(9527L);
-            wrkDetl.setAppeTime(now);
-            wrkDetl.setModiUser(9527L);
-            wrkDetl.setModiTime(now);
-            if (!agvWrkDetlService.insert(wrkDetl)) {
-                throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
-            }
-        });
-        //鏇存柊鐩爣搴撲綅鐘舵��
-        updateAgvLocMast(agvLocMast,"R");
-        updateAgvLocMast(LocMast,"S");
-
+    public ReturnT<String> start4(AgvWrkMast agvWrkMast) {
+        // locType 1. 鑷姩锛� 2. 鎵嬪姩
+        doAutoMove3(agvWrkMast);
         return SUCCESS;
     }
+    //鏍规嵁搴撲綅鐨刲octype鍊煎彂閫佷换鍔�--寮冪敤
+//    private ReturnT<String> doAutoMove(AgvLocMast agvLocMast) {
+//        Date now = new Date();
+//        //鏌ヨ宸ヤ綔妗�
+//        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvLocMast.getBarcode());
+//        if(!Cools.isEmpty(agvWrkMast)){
+//            throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
+//        }
+//        //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
+//        AgvLocMast LocMast = agvCommonService.getLocNo(3,agvLocMast.getLocType3(),false,true);
+//        //鐢熸垚宸ヤ綔妗�
+//        AgvWrkMast mast = new AgvWrkMast();
+//        //宸ヤ綔鐘舵��
+//        mast.setWrkSts(201L);
+//        //鍏ュ嚭搴撶被鍨�
+//        mast.setIoType(108);
+//        mast.setIoTime(now);
+//        //浼樺厛绾�
+//        mast.setIoPri(300.0);
+//        //婧愮珯鐐�
+//        mast.setSourceLocNo(agvLocMast.getLocNo());
+//        //鐩爣绔欑偣
+//        mast.setLocNo(LocMast.getLocNo());
+//        //璐ф灦缂栫爜
+//        mast.setBarcode(agvLocMast.getBarcode());
+//        //璐ф灦绫诲瀷
+//        mast.setWhsType(30);
+//
+//        mast.setAppeUser(9527L);
+//        mast.setAppeTime(now);
+//        mast.setModiUser(9527L);
+//        mast.setModiTime(now);
+//        mast.setLogErrMemo("doAutoMove");
+//        if (!agvWrkMastService.insertByIncrease(mast)) {
+//            throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
+//        }
+//
+//        AgvWrkMast mast1 = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", LocMast.getLocNo()).eq("source_loc_no",agvLocMast.getLocNo()));
+//        //鐢熸垚宸ヤ綔妗f槑缁�
+//        List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
+//        agvLocDetls.forEach(agvLocDetl -> {
+//            AgvWrkDetl wrkDetl = new AgvWrkDetl();
+//            wrkDetl.setWrkNo(mast1.getWrkNo());
+//            wrkDetl.sync(agvLocDetl);
+//            wrkDetl.setSpecs("1-" + agvLocMast.getLocType3());
+//            wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
+//            wrkDetl.setIoTime(now);
+//            wrkDetl.setAppeUser(9527L);
+//            wrkDetl.setAppeTime(now);
+//            wrkDetl.setModiUser(9527L);
+//            wrkDetl.setModiTime(now);
+//            if (!agvWrkDetlService.insert(wrkDetl)) {
+//                throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+//            }
+//        });
+//        //鏇存柊鐩爣搴撲綅鐘舵��
+//        updateAgvLocMast(agvLocMast,"R");
+//        updateAgvLocMast(LocMast,"S");
+//
+//        return SUCCESS;
+//    }
 
     private ReturnT<String> doHandMove(AgvLocMast agvLocMast) {
         Date now = new Date();
@@ -182,27 +189,64 @@
     private ReturnT<String> doAutoMove2(AgvWrkMast agvWrkMast) {
         Date now = new Date();
         //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
-        AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo(),false,true);
+        AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo(),false,true,null);
+        if (Cools.isEmpty(locMast)) {
+            throw new CoolException("鏆傛棤搴撲綅");
+        }
+        AgvWrkMast workingMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locMast.getLocNo()));
+        if (!Cools.isEmpty(workingMast)) {
+            throw new CoolException("褰撳墠搴撲綅姝e湪杩涜鍏ュ簱锛岃繘琛屼笅涓�娆¤疆璇�");
+        }
+        agvWrkMast.setWrkSts(201L);
+        agvWrkMast.setModiTime(new Date());
+        agvWrkMast.setLocNo(locMast.getLocNo());
+        agvWrkMast.setLogErrMemo("start2-doAutoMove2");
+        agvWrkMastService.updateById(agvWrkMast);
+        //鏇存柊鐩爣搴撲綅鐘舵��
+        updateAgvLocMast(locMast,"S");
+        AgvLocMast locMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locMast.getLocNo()));
+        log.info("鑷姩璋冩嫧浠诲姟 ==> 婧愬簱浣嶏細{}锛岀洰鏍囧簱浣嶏細{},搴撲綅鐘舵�亄}",agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo(),locMast1.getLocSts());
+
+        return SUCCESS;
+    }
+
+    private ReturnT<String> doAutoMove3(AgvWrkMast agvWrkMast) {
+        Date now = new Date();
+        //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
+        AgvLocMast locMast = agvCommonService.getLocNo(3,agvWrkMast.getCrnNo(),false,false,null);
         if (Cools.isEmpty(locMast)) {
             throw new CoolException("鏆傛棤搴撲綅");
         }
         agvWrkMast.setWrkSts(201L);
         agvWrkMast.setLocNo(locMast.getLocNo());
+        agvWrkMast.setLogErrMemo("start2-doAutoMove2");
+        agvWrkMast.setModiTime(new Date());
         agvWrkMastService.updateById(agvWrkMast);
         //鏇存柊鐩爣搴撲綅鐘舵��
         updateAgvLocMast(locMast,"S");
 
         return SUCCESS;
     }
+
     private ReturnT<String> doHandMove2(AgvWrkMast agvWrkMast) {
         Date now = new Date();
-        AgvBasDevp devpNo = agvCommonService.getDevpNo(3, 1, "Y", "Y");
+        String lev1 = agvWrkMast.getSourceLocNo().substring(agvWrkMast.getSourceLocNo().length() - 4).substring(0, 2);
+        AgvBasDevp devpNo = new AgvBasDevp();
+        if ("01".equals(lev1)) {
+            devpNo = agvCommonService.getDevpNo(3, 1, "Y", "Y");
+        } else {
+            devpNo = agvCommonService.getDevpNo(3, 4, "Y", "Y");
+        }
+
         if (Cools.isEmpty(devpNo)) {
             throw new CoolException("鏆傛棤绌洪棽鎺ラ┏浣�");
         }
         agvWrkMast.setWrkSts(201L);
         agvWrkMast.setLocNo(devpNo.getDevNo());
+        agvWrkMast.setModiTime(new Date());
+        agvWrkMast.setLogErrMemo("start3-doHandMove2");
         agvWrkMastService.updateById(agvWrkMast);
+        agvWrkMast.setModiTime(new Date());
         updateAgvBasDevp(devpNo,"S",null,agvWrkMast.getBarcode());
         return SUCCESS;
     }
@@ -261,6 +305,7 @@
         mast.setAppeTime(now);
         mast.setModiUser(9527L);
         mast.setModiTime(now);
+        mast.setLogErrMemo("autoEmptyBack");
         if (!agvWrkMastService.insertByIncrease(mast)) {
             throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
         }
@@ -270,11 +315,12 @@
         updateAgvBasDevp(devpNo,"S",agvLocMast.getLocType2(),agvLocMast.getBarcode());
         return SUCCESS;
     }
+
     public ReturnT<String> autoEmptyBack3(AgvWrkMast agvWrkMast) {
         Date now = new Date();
         AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo());
         //妫�绱㈢┖闂叉帴椹充綅锛岄�夋嫨鍚堥�傜殑鎺ラ┏浣�
-        AgvLocMast locMast = agvCommonService.getLocNo(3, 1,true,true);
+        AgvLocMast locMast = agvCommonService.getLocNo(3, 1,true,true,null);
         if (Cools.isEmpty(locMast)) {
             throw new CoolException("1妤兼殏鏃犵┖搴撲綅");
         }
@@ -283,6 +329,7 @@
         agvWrkMast.setLocNo(locMast.getLocNo());
         agvWrkMast.setModiUser(9527L);
         agvWrkMast.setModiTime(now);
+        agvWrkMast.setLogErrMemo("autoEmptyBack3");
         if (!agvWrkMastService.updateById(agvWrkMast)) {
             throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
         }
@@ -291,46 +338,48 @@
         updateAgvBasDevp(agvBasDevp,"R");
         return SUCCESS;
     }
-    public ReturnT<String> autoEmptyBack2(AgvLocMast agvLocMast) {
-        Date now = new Date();
-        //鏌ヨ宸ヤ綔妗�
-        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvLocMast.getBarcode());
-        if(!Cools.isEmpty(agvWrkMast)){
-            throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
-        }
-        //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
-        AgvLocMast LocMast = agvCommonService.getLocNo(3,1,true,true);
-        //鐢熸垚宸ヤ綔妗�
-        AgvWrkMast mast = new AgvWrkMast();
-        //宸ヤ綔鐘舵��
-        mast.setWrkSts(201L);
-        //鍏ュ嚭搴撶被鍨�
-        mast.setIoType(109);
-        mast.setIoTime(now);
-        //浼樺厛绾�
-        mast.setIoPri(300.0);
-        //婧愮珯鐐�
-        mast.setSourceLocNo(agvLocMast.getLocNo());
-        //鐩爣绔欑偣
-        mast.setLocNo(LocMast.getLocNo());
-        //璐ф灦缂栫爜
-        mast.setBarcode(agvLocMast.getBarcode());
-        //璐ф灦绫诲瀷
-        mast.setWhsType(30);
 
-        mast.setAppeUser(9527L);
-        mast.setAppeTime(now);
-        mast.setModiUser(9527L);
-        mast.setModiTime(now);
-        if (!agvWrkMastService.insertByIncrease(mast)) {
-            throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
-        }
-
-        //鏇存柊鐩爣搴撲綅鐘舵��
-        updateAgvLocMast(agvLocMast,"R");
-        updateAgvLocMast(LocMast,"S");
-        return SUCCESS;
-    }
+//    public ReturnT<String> autoEmptyBack2(AgvLocMast agvLocMast) {
+//        Date now = new Date();
+//        //鏌ヨ宸ヤ綔妗�
+//        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvLocMast.getBarcode());
+//        if(!Cools.isEmpty(agvWrkMast)){
+//            throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
+//        }
+//        //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
+//        AgvLocMast LocMast = agvCommonService.getLocNo(3,1,true,true);
+//        //鐢熸垚宸ヤ綔妗�
+//        AgvWrkMast mast = new AgvWrkMast();
+//        //宸ヤ綔鐘舵��
+//        mast.setWrkSts(201L);
+//        //鍏ュ嚭搴撶被鍨�
+//        mast.setIoType(109);
+//        mast.setIoTime(now);
+//        //浼樺厛绾�
+//        mast.setIoPri(300.0);
+//        //婧愮珯鐐�
+//        mast.setSourceLocNo(agvLocMast.getLocNo());
+//        //鐩爣绔欑偣
+//        mast.setLocNo(LocMast.getLocNo());
+//        //璐ф灦缂栫爜
+//        mast.setBarcode(agvLocMast.getBarcode());
+//        //璐ф灦绫诲瀷
+//        mast.setWhsType(30);
+//
+//        mast.setAppeUser(9527L);
+//        mast.setAppeTime(now);
+//        mast.setModiUser(9527L);
+//        mast.setModiTime(now);
+//        mast.setLogErrMemo("autoEmptyBack2");
+//        if (!agvWrkMastService.insertByIncrease(mast)) {
+//            throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
+//        }
+//
+//        //鏇存柊鐩爣搴撲綅鐘舵��
+//        updateAgvLocMast(agvLocMast,"R");
+//        updateAgvLocMast(LocMast,"S");
+//        return SUCCESS;
+//    }
 
     public ReturnT<String> autoEmptyBack4(AgvLocMast agvLocMast) {
         Date now = new Date();
@@ -361,7 +410,7 @@
             ioType = 109;
         } else {
             //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
-            locMast = agvCommonService.getLocNo(3,1,true,true);
+            locMast = agvCommonService.getLocNo(3,1,true,true,null);
             locNo = locMast.getLocNo();
             wrkSts = 201L;
             ioType = 109;
@@ -389,6 +438,7 @@
         mast.setAppeTime(now);
         mast.setModiUser(9527L);
         mast.setModiTime(now);
+        mast.setLogErrMemo("autoEmptyBack4");
         if (!agvWrkMastService.insertByIncrease(mast)) {
             throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
         }
@@ -427,6 +477,7 @@
         mast.setAppeTime(now);
         mast.setModiUser(9527L);
         mast.setModiTime(now);
+        mast.setLogErrMemo("autoEmptyBack5");
         // 鍒ゆ柇 鎺ラ┏鐐规槸鍚﹁嚜鍔�
         if ("Y".equals(agvBasDevp.getAutoing())) {
             //宸ヤ綔鐘舵��
@@ -434,7 +485,7 @@
             //鍏ュ嚭搴撶被鍨�
             mast.setIoType(109);
             //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
-            AgvLocMast locMast = agvCommonService.getLocNo(3,1,true,true);
+            AgvLocMast locMast = agvCommonService.getLocNo(3,1,true,true,null);
             mast.setLocNo(locMast.getLocNo());
             updateAgvLocMast(locMast,"S");
         } else {
@@ -483,6 +534,7 @@
         mast.setAppeTime(now);
         mast.setModiUser(9527L);
         mast.setModiTime(now);
+        mast.setLogErrMemo("autoEmptyBack6");
         if (!agvWrkMastService.insertByIncrease(mast)) {
             throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
         }
@@ -492,4 +544,77 @@
 
         return SUCCESS;
     }
+
+    public ReturnT<String> autoTransfers(AgvLocMast agvLocMast,Integer maxTansk) {
+        Date now = new Date();
+        List<AgvLocDetl> locDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
+        locDetls.forEach(agvLocDetl -> {
+            if (agvLocDetl.getProcessSts().equals(1)) {
+                throw new CoolException("褰撳墠搴撲綅鏈夊簱瀛樻湭鍔犲伐");
+            }
+        });
+        //鏌ヨ宸ヤ綔妗�
+        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(agvLocMast.getBarcode());
+        if(!Cools.isEmpty(agvWrkMast)){
+            throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
+        }
+        //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
+        AgvLocMast LocMast = agvCommonService.getLocNo(3,1,false,false,null);
+        if (LocMast.getLev1() != 2) {
+            throw new CoolException("鐩爣妤煎眰涓嶆槸鍚稿浜屾ゼ");
+        }
+        List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1").eq("io_type", 12));
+        if (agvWrkMasts.size() >= maxTansk) {
+            throw new CoolException("鑷姩绉诲簱浠诲姟宸插埌璁惧畾鏈�澶у�硷細" + maxTansk);
+        }
+        //鐢熸垚宸ヤ綔妗�
+        AgvWrkMast mast = new AgvWrkMast();
+        //宸ヤ綔鐘舵��
+        mast.setWrkSts(201L);
+        //鍏ュ嚭搴撶被鍨�
+        mast.setIoType(12);
+        mast.setIoTime(now);
+        //浼樺厛绾�
+        mast.setIoPri(300.0);
+        //婧愮珯鐐�
+        mast.setSourceLocNo(agvLocMast.getLocNo());
+        //鐩爣绔欑偣
+        mast.setLocNo(LocMast.getLocNo());
+        //璐ф灦缂栫爜
+        mast.setBarcode(agvLocMast.getBarcode());
+        //璐ф灦绫诲瀷
+        mast.setWhsType(30);
+
+        mast.setAppeUser(9527L);
+        mast.setAppeTime(now);
+        mast.setModiUser(9527L);
+        mast.setModiTime(now);
+        mast.setLogErrMemo("doAutoMove");
+        if (!agvWrkMastService.insertByIncrease(mast)) {
+            throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");
+        }
+
+        AgvWrkMast mast1 = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", LocMast.getLocNo()).eq("source_loc_no",agvLocMast.getLocNo()));
+        //鐢熸垚宸ヤ綔妗f槑缁�
+        List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvLocMast.getLocNo()));
+        agvLocDetls.forEach(agvLocDetl -> {
+            AgvWrkDetl wrkDetl = new AgvWrkDetl();
+            wrkDetl.setWrkNo(mast1.getWrkNo());
+            wrkDetl.sync(agvLocDetl);
+            wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
+            wrkDetl.setIoTime(now);
+            wrkDetl.setAppeUser(9527L);
+            wrkDetl.setAppeTime(now);
+            wrkDetl.setModiUser(9527L);
+            wrkDetl.setModiTime(now);
+            if (!agvWrkDetlService.insert(wrkDetl)) {
+                throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+            }
+        });
+        //鏇存柊鐩爣搴撲綅鐘舵��
+        updateAgvLocMast(agvLocMast,"R");
+        updateAgvLocMast(LocMast,"S");
+
+        return SUCCESS;
+    }
 }

--
Gitblit v1.9.1