From 19d222a720ba3d57964b2bee19d6e433851fb990 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 05 二月 2024 14:20:03 +0800
Subject: [PATCH] 输送线改造
---
src/main/java/com/zy/common/web/WcsController.java | 87 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index e96b97e..89b6f8c 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -1,5 +1,6 @@
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;
@@ -7,7 +8,6 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.Utils;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
@@ -59,6 +59,8 @@
private AgvWrkMastService agvWrkMastService;
@Autowired
private WrkMastMapper wrkMastMapper;
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
// @Autowired
// private ErpService erpService;
@@ -426,6 +428,11 @@
throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+ }
+
//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
Integer staNo = liftNo * 100 + locMast.getLev1();
// 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
@@ -472,6 +479,9 @@
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() + "鐩爣搴撲綅宸茶鍗犵敤");
}
@@ -486,16 +496,27 @@
}
}
- //娓呯┖婧愬簱浣嶆暟鎹�
+ //妫�鏌ョ洰鏍囧簱浣嶏紝搴撳瓨鏄庣粏鏄惁娣诲姞鎴愬姛
+ 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 (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() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
}
//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
@@ -561,20 +582,44 @@
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));
+
+ //鎷ｆ枡銆佺洏鐐瑰畬鎴愪换鍔�
+ if(!Cools.isEmpty(agvWrkMast) && (agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107) && agvWrkMast.getWrkSts() == 205){
+ //鐢熸垚鎷ｆ枡銆佺洏鐐瑰啀鍏ュ簱浠诲姟
+ List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
+ agvWrkMast.setMk("Y");
+ agvWrkMast.setLocNo(agvBasDevp.getDevNo());
+ agvWrkMastList.add(agvWrkMast);
+ agvWorkService.pickIn(agvWrkMastList);
+ //缁戝畾绔欑偣
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
+ return R.ok();
}
- //鍘绘壘agv宸ヤ綔妗ｄ换鍔�
- if(!Cools.isEmpty(agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",containerCode)))){
- throw new CoolException("璇ユ枡绠辨鍦ㄥ叆搴撲腑");
- }
- //缁戝畾绔欑偣
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
+ //鍏ュ簱浠诲姟
+ if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
+ //鐢熸垚宸ヤ綔妗�
+ List<AgvBasDevp> agvBasDevpList = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("dev_no", param.getDevNo()));
+ agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, null, true);
- //鐢熸垚宸ヤ綔妗�
- List<AgvBasDevp> agvBasDevpList = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("dev_no", param.getDevNo()));
- agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, null, true);
+ //缁戝畾绔欑偣
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
+ return R.ok();
+ }
+
+ return R.error("娌℃湁鏌ヨ鍒拌鏂欑淇℃伅");
+
+ }
+
+ /*
+ 鏄剧ずAGV杈撻�佺嚎鎷ｆ枡銆佺洏鐐广�佸叆搴撲俊鎭�
+ */
+ @PostMapping("/info")
+ @ResponseBody
+ public R showAgvBasDevInfo(@RequestBody ReplenishmentParam param){
return R.ok();
--
Gitblit v1.9.1