From dfc9552392f9f973ab52e55d58a7ae2acdaeb1f3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期日, 09 三月 2025 14:19:43 +0800
Subject: [PATCH] 四期

---
 src/main/java/com/zy/asrs/mapper/AgvWrkDetlMapper.java           |    4 
 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java    |    7 +
 src/main/java/com/zy/common/service/AgvCommonService.java        |   25 ++++++
 src/main/java/com/zy/asrs/controller/AgvMobileController.java    |    2 
 src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java |   10 +
 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java   |  159 +++++++++++++++++++++++++++++++++++++++
 src/main/java/com/zy/asrs/controller/OrderDetlController.java    |    9 -
 src/main/java/com/zy/asrs/service/AgvWorkService.java            |    2 
 8 files changed, 202 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 629ebd5..7676b34 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -203,7 +203,7 @@
                 return R.error("缂哄皯瀹瑰櫒鍙傛暟");
             }
             pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0, 2)));
-            workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false);
+            workService.emptyPlateInV3(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false);
         }
 
         return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 54bbc39..6d70670 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -396,13 +396,8 @@
 
     @RequestMapping(value = "/orderDetl/pakout/workNum")
     @ManagerAuth
-    public R listWorkDetl(@RequestParam OrderDetl param) {
-        List<AgvWrkDetl> agvWrkDetls = agvWrkDetlMapper.listAnfmeByMatnr(param.getMatnr(), param.getThreeCode(), param.getOrderNo());
-        if (agvWrkDetls != null) {
-            for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
-
-            }
-        }
+    public R listWorkDetl() {
+        List<AgvWrkDetl> agvWrkDetls = agvWrkDetlMapper.listAnfmeByMatnr();
         return R.ok(agvWrkDetls);
 
     }
diff --git a/src/main/java/com/zy/asrs/mapper/AgvWrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/AgvWrkDetlMapper.java
index 6ad6064..c323a1c 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvWrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvWrkDetlMapper.java
@@ -38,7 +38,7 @@
     Double sumAnfmeByMatnr(@Param("matnr") String matnr, @Param("threeCode") String threeCode, @Param("orderNo") String orderNo);
 
 
-    @Select("SELECT d.* from agv_wrk_detl d ,agv_wrk_mast m where d.wrk_no=m.wrk_no and m.io_type in (101,103,53) and d.matnr = #{matnr}   AND d.three_code = #{threeCode}  AND d.order_no = #{orderNo} AND d.process_sts != 1")
-    List<AgvWrkDetl> listAnfmeByMatnr(@Param("matnr") String matnr, @Param("threeCode") String threeCode, @Param("orderNo") String orderNo);
+    @Select("SELECT d.matnr,d.three_code,d.order_no,SUM(d.anfme) anfme from agv_wrk_detl d ,agv_wrk_mast m where d.wrk_no=m.wrk_no and m.io_type in (101,103,53)  AND d.process_sts != 1 GROUP BY d.matnr,d.three_code,d.order_no")
+    List<AgvWrkDetl> listAnfmeByMatnr();
 
 }
diff --git a/src/main/java/com/zy/asrs/service/AgvWorkService.java b/src/main/java/com/zy/asrs/service/AgvWorkService.java
index 06bafe4..430bbc3 100644
--- a/src/main/java/com/zy/asrs/service/AgvWorkService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWorkService.java
@@ -48,6 +48,8 @@
 
     String emptyPlateInV2(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn,String factory);
 
+    String emptyPlateInV3(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn);
+
 
     void emptyPlateOut(String station, int containerType, Long userId);
 
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 2cba774..9af4f46 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -444,7 +444,7 @@
 //            return R.error("褰撳墠搴撲綅涓嶄负鍦ㄥ簱锛屾垨鑰呯┖璐ф灦锛屼笉鏀寔绉诲簱");
 
         // 鏍¢獙妤煎眰
-        if (agvLocMast.getLocType1() != 3) { // 涓嶄负绠卞3鍖哄煙
+        if (agvLocMast.getLocType1() != 3 && agvLocMast.getLocType1() != 6) { // 涓嶄负绠卞3鍖哄煙
             if (agvLocMast.getFloor() != floor) {
                 throw new CoolException("褰撳墠搴撲綅涓嶆敮鎸佽法妤煎眰杞Щ");
             } else {
@@ -456,12 +456,16 @@
                     throw new CoolException("褰撳墠搴撲綅璇烽�夋嫨璋冩嫧鍗曡皟鎷紒");
                 } else if ((agvLocMast.getFloor() == 2 || agvLocMast.getFloor() == 3) && (floor == 1 || floor == 4)) {
                     throw new CoolException("褰撳墠搴撲綅璇烽�夋嫨璋冩嫧鍥炴祦鍗曞洖閫�锛�");
+                } else if (agvLocMast.getFloor() == 1 && agvLocMast.getLev1() == 2 && floor == 4) {
+                    ioType = 11;
                 } else {
                     ioType = 12;
                 }
             } else {
                 if (agvLocMast.getFloor() == 1) {
                     if (agvLocMast.getLev1() == 1 && floor == 1) {
+                        ioType = 11;
+                    } else if (agvLocMast.getLev1() == 2 && floor == 4) {
                         ioType = 11;
                     } else {
                         ioType = 12;
@@ -516,7 +520,7 @@
         //璐ф灦缂栫爜
         mast.setBarcode(agvLocMast.getBarcode());
         //璐ф灦绫诲瀷
-        mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
+        mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0, 2)));
 
         mast.setAppeUser(userId);
         mast.setAppeTime(now);
@@ -864,7 +868,7 @@
         // TODO: 鍥涙湡
         List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("supp_code", param.getBarcode()));
         String factory = param.getFactory();
-        AgvLocMast newLocMast = agvCommonService.getLocByLocRule20(3, 1, factory,false);
+        AgvLocMast newLocMast = agvCommonService.getLocByLocRule20(3, 1, factory, false);
         if (newLocMast == null) {
             throw new CoolException("鏃犲彲鐢ㄥ簱浣�");
         }
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 7c43a50..4e595cd 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -169,7 +169,7 @@
                             locDto.getIsoseq(),
                             locDto.getProcessSts());
                     //OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
-                   // AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
+                    // AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
                     // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
 //                    FlowLog flowLog = new FlowLog();
 //                    flowLog.setFid(String.valueOf(flowId));
@@ -742,7 +742,7 @@
 //                }
 //            }
             // 棰勭暀20涓簱浣�
-            agvLocMast = agvCommonService.getLocByLocRule20(3, 1, code,false);
+            agvLocMast = agvCommonService.getLocByLocRule20(3, 1, code, false);
 
 
             String devNo = agvBasDevp.getDevNo();
@@ -786,6 +786,161 @@
     }
 
     /*
+  鍏ュ簱
+   */
+    @Transactional
+    public String emptyPlateInV3(String station, String containerCode, Short containerType, Long userId, boolean emptyAutoIn) {
+
+        Date now = new Date();
+
+        Short locType = 0;
+
+        AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
+        if (Cools.isEmpty(agvBasDevp)) {
+            throw new CoolException("鏆傛棤" + station + "绔欑偣");
+        }
+        int br = 0;
+        if (containerType == 21 && agvBasDevp.getFloor() == 2) {
+            containerType = 20;
+        }
+        switch (containerType) {
+            case 10:
+                br = 1;
+                break;
+            case 20:
+                br = 2;
+                break;
+            case 21:
+                br = 4;
+                break;
+            case 30:
+                br = 3;
+                break;
+            case 31:
+                br = 6;
+                break;
+            case 40:
+                br = 5;
+                break;
+        }
+        if (br == 4 && agvBasDevp.getLocType1() == 2) {
+            br = 2;
+        }
+        if (agvBasDevp.getLocType1() != br) {
+            throw new CoolException("绔欑偣绫诲瀷鍜岃揣鏋剁被鍨嬩笉绗︼紒");
+        }
+        AtomicReference<String> factory = new AtomicReference<>();
+        if (containerType == 40) {
+            locType = 5;
+        } else if (containerType == 21 && agvBasDevp.getFloor() == 3) {
+            locType = 4;
+        } else if (containerType == 20 && agvBasDevp.getFloor() == 3) {
+            locType = 2;
+        } else if (containerType == 30) {
+            locType = 3;
+        } else if (containerType == 31) {
+            locType = 6;
+        } else {
+            locType = agvBasDevp.getLocType1();
+        }
+
+        if (!Cools.eq(agvBasDevp.getBarcode(), containerCode) && !agvBasDevp.getLocSts().equals("O") && !emptyAutoIn) {
+            throw new CoolException("褰撳墠宸ヤ綔浣嶇姸鎬佷负" + agvBasDevp.getLocSts() + ",鏃犳硶杩涜鍏ュ簱");
+        }
+
+        //鏌ヨ宸ヤ綔妗�
+        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
+        if (!Cools.isEmpty(agvWrkMast) && !emptyAutoIn) {
+            throw new CoolException("褰撳墠璐ф灦宸叉湁鍏ュ簱浠诲姟锛屾棤娉曡繘琛屽叆搴�");
+        }
+
+        //妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
+        AgvLocMast agvLocMast = new AgvLocMast();
+
+        //鏌ヨ搴撳瓨
+        AgvLocMast locMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
+        if (!Cools.isEmpty(locMast)) {
+            throw new CoolException("褰撳墠璐ф灦宸插湪搴撳瓨涓紝鏃犳硶杩涜鍏ュ簱");
+        }
+
+        //鏌ヨ鍏ュ簱閫氱煡妗�
+        List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectByContainerCode(containerCode);
+        if (!Cools.isEmpty(agvWaitPakinList)) {
+            AtomicBoolean isCurrLev = new AtomicBoolean(false);
+            agvWaitPakinList.forEach(agvWaitPakin -> {
+                factory.set(OrderUtils.getFactory(agvWaitPakin.getThreeCode()));
+                if (!Cools.isEmpty(agvWaitPakin.getProcessSts())) {
+                    if (agvWaitPakin.getProcessSts() == 1) {
+                        isCurrLev.set(true);
+                    }
+                }
+            });
+
+
+            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "elevatorTasks"));
+            if (Cools.isEmpty(config)) {
+                if (isCurrLev.get()) {
+                    agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
+                } else {
+                    agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
+                }
+            } else {
+                if (station.endsWith("F4") && locType == 3) {
+                    agvLocMast = agvCommonService.getLocNoOnXiSuer(locType, 1);
+                } else if (locType == 6) {
+                    agvLocMast = agvCommonService.getLocNoOnXiSuer20(locType, 1);
+                } else {
+                    List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
+                    if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
+                        agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
+                    } else {
+                        if (isCurrLev.get()) {
+                            agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
+                        } else {
+                            agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
+                        }
+                        //agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
+                    }
+                }
+            }
+            if (agvLocMast==null){
+                throw new CoolException("娌℃湁璇ョ被鍨嬬殑绌哄簱浣嶄簡");
+            }
+
+            String devNo = agvBasDevp.getDevNo();
+            String locNo = agvLocMast.getLocNo();
+
+
+            //鐢熸垚宸ヤ綔妗�
+            AgvWrkMast wrkMast = createWrkMast(1, 201L, devNo, locNo, containerCode, now, userId, containerType, agvLocMast.getPltType());
+            //鐢熸垚宸ヤ綔妗f槑缁�
+            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());
+            });
+            //淇敼鍏ュ簱閫氱煡妗g姸鎬�
+            agvWaitPakinService.updateIoStatus(containerCode, "Y");
+            //鏇存柊婧愮珯鐐圭姸鎬�
+            updateAgvBasDevp(agvBasDevp, "R", containerType);
+        } else {
+            //鏌ヨ宸ヤ綔妗�
+            AgvWrkMast agvWrkMast1 = agvWrkMastService.selectByContainerCode(containerCode);
+            if (!Cools.isEmpty(agvWrkMast1)) {
+                throw new CoolException("褰撳墠璐ф灦宸叉湁鍏ュ簱浠诲姟锛屾棤娉曡繘琛屽叆搴�");
+            }
+            agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), true, true);
+            // 鐢熸垚宸ヤ綔妗� 10.绌烘澘鍏ュ簱
+            createWrkMast(10, 201L, agvBasDevp.getDevNo(), agvLocMast.getLocNo(), containerCode, now, userId, containerType, agvLocMast.getPltType());
+            //鏇存柊婧愮珯鐐圭姸鎬�
+            updateAgvBasDevp(agvBasDevp, "R", containerType, containerCode);
+        }
+
+        //鏇存柊鐩爣搴撲綅鐘舵�佸拰淇℃伅
+        updateAgvLocMast(agvLocMast, "S");
+        return agvLocMast.getLocNo();
+    }
+
+    /*
     绌烘澘鍑哄簱
      */
     @Transactional
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index e64b67a..15fad84 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -192,7 +192,12 @@
                     break;
                 case 11:
                 case 12:
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+                    AgvLocDetl agvLocDetl1 = agvLocDetlService.selectByLocNo(agvWrkMast.getLocNo());
+                    if (agvLocDetl1 == null) {
+                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "D", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+                    } else {
+                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
+                    }
                     //鏇存柊搴撳瓨鏄庣粏
                     agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
                     //淇敼婧愬簱浣嶇姸鎬佷负O
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index 7fc5a4e..e09b94e 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -405,6 +405,31 @@
         return null;
     }
 
+    public AgvLocMast getLocNoOnXiSuer20(int type, int floor) {
+        EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
+        wrapper.eq("loc_sts", "O").eq("loc_type1", type);
+        wrapper.eq("floor", floor).eq("lev1", 2);
+        List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(wrapper);
+        if (Cools.isEmpty(agvLocMasts)) {
+            return null;
+        } else {
+            int num = 15;
+            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "LOC_6_NUM"));
+            if (config != null && !Cools.isEmpty(config.getValue())) {
+                num = Integer.parseInt(config.getValue());
+            }
+            if (agvLocMasts.size()>num){
+                for (AgvLocMast agvLocMast : agvLocMasts) {
+                    AgvLocMast agvLocMast1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocMast.getLocNo()));
+                    if (agvLocMast1.getLocSts().equals("O")) {
+                        return agvLocMast1;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
 
     //闅忔満鍙栦竴涓揣浣�
     private AgvLocMast getLocNoRule(int type, int floor, boolean isEmpty, boolean isCurrLev) {

--
Gitblit v1.9.1