From eb2584960c947166a048be3f50860db7ab34a2a6 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 06 二月 2024 18:59:20 +0800
Subject: [PATCH] 输送线改造

---
 src/main/java/com/zy/common/web/WcsController.java |  211 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 173 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 444b81e..423ef66 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -1,10 +1,12 @@
 package com.zy.common.web;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.R;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
+import com.zy.asrs.mapper.WrkMastMapper;
 import com.zy.asrs.service.*;
 import com.zy.common.CodeRes;
 import com.zy.common.model.LocTypeDto;
@@ -18,8 +20,10 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -30,6 +34,8 @@
 @RestController
 @RequestMapping("/rpc")
 public class WcsController {
+
+    private static HashMap<String,String> currentContainerMap;
 
     @Autowired
     private WrkMastService wrkMastService;
@@ -55,6 +61,10 @@
     private AgvBasDevpService agvBasDevpService;
     @Autowired
     private AgvWrkMastService agvWrkMastService;
+    @Autowired
+    private WrkMastMapper wrkMastMapper;
+    @Autowired
+    private WrkMastLogService wrkMastLogService;
 //    @Autowired
 //    private ErpService erpService;
 
@@ -114,11 +124,11 @@
                 dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), 2);
                 break;
             case 103:// 鎷f枡鍏ュ簱
-                dto = pickWrkIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto, 2);
+                dto = pickWrkIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), param.getLiftNo(), locTypeDto, 2);
                 break;
             case 104:// 骞舵澘鍏ュ簱
             case 107:// 鐩樼偣鍏ュ簱
-                dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto, 2);
+                dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), param.getLiftNo(), locTypeDto, 2);
                 break;
             default:
                 break;
@@ -194,7 +204,7 @@
             case 103:// 鎷f枡鍏ュ簱
             case 104:// 骞舵澘鍏ュ簱
             case 107:// 鐩樼偣鍏ュ簱
-                dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), locTypeDto);
+                dto = pickWrkPlateIn(param.getWrkNo(), param.getIoType(), param.getSourceStaNo(), param.getLiftNo(), locTypeDto);
                 break;
             default:
                 break;
@@ -382,12 +392,12 @@
     }
 
     @Transactional
-    public StartupDto pickWrkPlateIn(Integer wrkNo, Integer ioType, Integer devpNo, LocTypeDto locTypeDto) {
-        return pickWrkPlateIn(wrkNo, ioType, devpNo, locTypeDto, 1);
+    public StartupDto pickWrkPlateIn(Integer wrkNo, Integer ioType, Integer devpNo, Integer liftNo, LocTypeDto locTypeDto) {
+        return pickWrkPlateIn(wrkNo, ioType, devpNo, liftNo, locTypeDto, 1);
     }
 
     @Transactional
-    public StartupDto pickWrkPlateIn(Integer wrkNo, Integer ioType, Integer devpNo, LocTypeDto locTypeDto, Integer version) {
+    public StartupDto pickWrkPlateIn(Integer wrkNo, Integer ioType, Integer devpNo, Integer liftNo, LocTypeDto locTypeDto, Integer version) {
         WrkMast wrkMast = wrkMastService.selectOfPick(wrkNo, ioType);
         if (Cools.isEmpty(wrkMast)) {
             log.error("{}浠诲姟銆恑oType = {}銆戝凡杩囨湡!!!", wrkNo, ioType);
@@ -406,8 +416,8 @@
         }
         StartupDto dto = null;
         if (version == 2) {
-            dto = commonService.getShuttleLocNo( ioType - 50, devpNo, matnrList, locTypeDto); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
-        }else {
+            dto = commonService.getShuttleLocNo(ioType - 50, devpNo, matnrList, locTypeDto); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
+        } else {
             dto = commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto, 0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
         }
         // 鏇存柊鐩爣搴撲綅鐘舵��
@@ -421,28 +431,49 @@
         } else {
             throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
         }
+
+        // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+            throw new CoolException(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗eけ璐�");
+        }
+
+        //鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
+        Integer staNo = liftNo * 100 + locMast.getLev1();
+        // 鏇存柊宸ヤ綔妗f暟鎹姸鎬�
+        wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 107->57
+        wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
+        wrkMast.setSourceStaNo(dto.getSourceStaNo()); // 婧愮珯
+        wrkMast.setStaNo(staNo);//鐩爣绔�
+        wrkMast.setLocNo(dto.getLocNo()); // 鐩爣搴撲綅
+        wrkMast.setShuttleNo(null); // 绌挎杞︽竻绌�
+        wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
+        wrkMast.setModiTime(new Date());
+        if (!wrkMastService.updateById(wrkMast)) {
+            throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗f暟鎹姸鎬佸け璐�");
+        }
+
         return dto;
     }
 
     @Transactional
-    public StartupDto pickWrkIn(Integer wrkNo, Integer ioType, Integer devpNo, LocTypeDto locTypeDto, Integer version) {
+    public StartupDto pickWrkIn(Integer wrkNo, Integer ioType, Integer devpNo, Integer liftNo, LocTypeDto locTypeDto, Integer version) {
         WrkMast wrkMast = wrkMastService.selectOfPick(wrkNo, ioType);
         if (Cools.isEmpty(wrkMast)) {
             log.error("{}浠诲姟銆恑oType = {}銆戝凡杩囨湡!!!", wrkNo, ioType);
             throw new CoolException(CodeRes.NONE_MAST_800);
         }
-        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
-        if (Cools.isEmpty(wrkDetls)) {
-            throw new CoolException(CodeRes.NONE_DETL_900);
+        List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
+        if (locDetls.isEmpty()) {
+            throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦�");
         }
         // 妫�绱㈠簱浣�
-        List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
+        List<String> matnrList = locDetls.stream().map(LocDetl::getMatnr).distinct().collect(Collectors.toList());
         if (ioType == 103) {//鎷f枡浠诲姟
             if (devpNo == 325 || devpNo == 331 || devpNo == 333 || devpNo == 339) {
                 devpNo = 341;
             }
         }
-        StartupDto dto = commonService.getShuttleLocNo( ioType - 50, devpNo, matnrList, locTypeDto);//鑾峰彇搴撲綅
+        StartupDto dto = commonService.getShuttleLocNo(ioType - 50, devpNo, matnrList, locTypeDto);//鑾峰彇搴撲綅
 
         // 鏇存柊鐩爣搴撲綅鐘舵��
         LocMast locMast = locMastService.selectById(dto.getLocNo());
@@ -452,14 +483,13 @@
             if (!locMastService.updateById(locMast)) {
                 throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
             }
+
+            List<LocDetl> locDetls1 = locDetlService.selectByLocNo(locMast.getLocNo());
+            log.info("宸ヤ綔鍙凤細" + wrkMast.getWrkNo() + "锛屾墭鐩樼爜锛�" + wrkMast.getBarcode() + "锛屼慨鏀瑰簱浣嶇姸鎬丱=>Q鎴愬姛锛屽簱瀛樻槑缁嗭細" + JSON.toJSONString(locDetls1));
         } else {
             throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
         }
 
-        List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
-        if (locDetls.isEmpty()) {
-            throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦�");
-        }
         Date now = new Date();
         for (LocDetl locDetl : locDetls) {
             locDetl.setLocNo(dto.getLocNo());//淇敼鐩爣搴撲綅
@@ -470,17 +500,45 @@
             }
         }
 
-        //娓呯┖婧愬簱浣嶆暟鎹�
-        LocMast locMast1 = locMastService.selectByLoc(wrkMast.getSourceLocNo());
-        if (locMast1.getLocSts().equals("P")) {
-            locMast1.setLocSts("O"); // 娓呯┖搴撲綅
-            locMast1.setModiTime(new Date());
-            if (!locMastService.updateById(locMast1)) {
-                throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
-            }
-        }else {
-            throw new CoolException("婧愬簱浣嶇姸鎬佸紓甯�");
+        //妫�鏌ョ洰鏍囧簱浣嶏紝搴撳瓨鏄庣粏鏄惁娣诲姞鎴愬姛
+        List<LocDetl> checkLocDetls = locDetlService.selectByLocNo(dto.getLocNo());
+        if (checkLocDetls.isEmpty()) {
+            throw new CoolException("搴撳瓨鏄庣粏杩佺Щ澶辫触");
         }
+
+//        //娓呯┖婧愬簱浣嶆暟鎹�
+        LocMast locMast1 = locMastService.selectByLoc(wrkMast.getSourceLocNo());
+//        if (locMast1.getLocSts().equals("P")) {
+//            locMast1.setLocSts("O"); // 娓呯┖搴撲綅
+//            locMast1.setModiTime(new Date());
+//            if (!locMastService.updateById(locMast1)) {
+//                throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+//            }
+//        } else {
+//            throw new CoolException("婧愬簱浣嶇姸鎬佸紓甯�");
+//        }
+
+        // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+        if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+            throw new CoolException(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗eけ璐�");
+        }
+
+        //鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
+        Integer staNo = liftNo * 100 + locMast1.getLev1();
+
+        // 鏇存柊宸ヤ綔妗f暟鎹姸鎬�
+        wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54
+        wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
+        wrkMast.setSourceStaNo(dto.getSourceStaNo()); // 婧愮珯
+        wrkMast.setStaNo(staNo);//鐩爣绔�
+        wrkMast.setLocNo(dto.getLocNo()); // 鐩爣搴撲綅
+        wrkMast.setShuttleNo(null); // 绌挎杞︽竻绌�
+        wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
+        wrkMast.setModiTime(new Date());
+        if (!wrkMastService.updateById(wrkMast)) {
+            throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗f暟鎹姸鎬佸け璐�");
+        }
+
         return dto;
     }
 
@@ -528,24 +586,101 @@
         if(Cools.isEmpty(agvBasDevp) || !"O".equals(agvBasDevp.getLocSts())){
             throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦ㄦ垨鑰呯珯鐐逛笉涓虹┖");
         }
-        if(Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
-            throw new CoolException("璇ユ枡绠变綅缁勬墭");
+
+        AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectByContainerCode(containerCode);
+        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", containerCode));
+
+        //鎷f枡銆佺洏鐐瑰畬鎴愪换鍔�
+        if(!Cools.isEmpty(agvWrkMast) && (agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107) && agvWrkMast.getWrkSts() == 205){
+            //缁戝畾绔欑偣
+            agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
+
+            //鐢熸垚鎷f枡銆佺洏鐐瑰啀鍏ュ簱浠诲姟
+            List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
+            agvWrkMast.setMk("Y");
+            agvWrkMast.setLocNo(agvBasDevp.getDevNo());
+            agvWrkMastList.add(agvWrkMast);
+            agvWorkService.pickIn(agvWrkMastList);
+
+            return R.ok();
         }
 
-        //鍘绘壘agv宸ヤ綔妗d换鍔�
-        if(!Cools.isEmpty(agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",containerCode)))){
-            throw new CoolException("璇ユ枡绠辨鍦ㄥ叆搴撲腑");
+        //鍏ュ簱浠诲姟
+        if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
+            //缁戝畾绔欑偣
+            agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
+            //鐢熸垚宸ヤ綔妗�
+            List<AgvBasDevp> agvBasDevpList = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("dev_no", param.getDevNo()));
+            agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, null, true);
+
+            return R.ok();
         }
-        //缁戝畾绔欑偣
-        agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
 
-        //鐢熸垚宸ヤ綔妗�
-        List<AgvBasDevp> agvBasDevpList = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("dev_no", param.getDevNo()));
-        agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, null, true);
+        return R.error("娌℃湁鏌ヨ鍒拌鏂欑淇℃伅");
 
+    }
+
+    @PostMapping("/current/containerCode")
+    @ResponseBody
+    public R move(@RequestBody ReplenishmentParam param){
+
+        if(Cools.isEmpty(currentContainerMap)){
+            currentContainerMap = new HashMap<>();
+        }
+
+        String devNo = param.getDevNo();
+        String containerCode = param.getContainerCode();
+        String currentContainerCode = currentContainerMap.get(devNo);
+
+        //鍒ゆ柇瀹瑰櫒鏄惁鍙戠敓鍙樺寲
+        if(!Cools.eq(containerCode,currentContainerCode)){
+            //鏌ヨ鏃у鍣ㄧ殑宸ヤ綔妗�
+            AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(currentContainerCode);
+            if(agvWrkMast.getIoType() == 101){
+                //鍙戦�佸鍣ㄧ珛鍦鸿姹傦紝瀹屾垚宸ヤ綔妗�
+                List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
+                agvWrkMastList.add(agvWrkMast);
+                try {
+                    int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
+                    if(code == 0){
+                        //灏嗗伐浣滃厷鐘舵�佹敼涓哄鍣ㄧ鍦�
+                        agvWrkMast.setWrkSts(206L);
+                        agvWrkMastService.updateById(agvWrkMast);
+                    }
+                } catch (IOException e) {
+                    log.error(e.getMessage());
+                }
+            }
+        }
+
+        currentContainerMap.put(devNo,containerCode);
 
         return R.ok();
     }
 
+    /*
+    鏄剧ずAGV杈撻�佺嚎鎷f枡銆佺洏鐐广�佸叆搴撲俊鎭�
+     */
+    @PostMapping("/info")
+    @ResponseBody
+    public R containerMove(@RequestBody ReplenishmentParam param){
+
+        String devNo = param.getDevNo();
+        String containerCode = currentContainerMap.get(devNo);
+
+        //鏌ユ壘璇ュ鍣ㄧ殑宸ヤ綔妗�
+        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
+        if(!Cools.isEmpty(agvWrkMast)){
+            return R.ok(agvWrkMast);
+        }
+        //鏌ユ壘璇ュ鍣ㄧ殑鍏ュ簱閫氱煡妗�
+        AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectByContainerCode(containerCode);
+        if(!Cools.isEmpty(agvWaitPakin)){
+            return R.ok(agvWaitPakin);
+        }
+
+        return R.error("娌℃湁璇ュ鍣ㄧ殑鍑哄簱銆佹嫞鏂欍�佸叆搴撲俊鎭瓑");
+    }
+
 
 }

--
Gitblit v1.9.1