From ed0a79ffec5d25dae6b0b24393c331ab36d7d50b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 04 六月 2024 15:35:12 +0800
Subject: [PATCH] # 自动回流数量限制
---
src/main/java/com/zy/common/web/WcsController.java | 223 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 191 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index b116eb1..fb0ed88 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,8 +8,8 @@
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.AgvBasDevpDto;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
@@ -22,6 +23,7 @@
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -32,6 +34,8 @@
@RestController
@RequestMapping("/rpc")
public class WcsController {
+
+ private static HashMap<String,String> currentContainerMap;
@Autowired
private WrkMastService wrkMastService;
@@ -59,6 +63,12 @@
private AgvWrkMastService agvWrkMastService;
@Autowired
private WrkMastMapper wrkMastMapper;
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private AgvWrkDetlService agvWrkDetlService;
+ @Autowired
+ private AgvLocDetlService agvLocDetlService;
// @Autowired
// private ErpService erpService;
@@ -111,10 +121,10 @@
StartupDto dto = null;
switch (param.getIoType()) {
- case 1://婊℃墭鐩樺叆搴�
+ case 1://婊¤揣鏋跺叆搴�
dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats, waitPakins, 2);
break;
- case 10://绌烘墭鐩樺叆搴�
+ case 10://绌鸿揣鏋跺叆搴�
dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), 2);
break;
case 103:// 鎷ｆ枡鍏ュ簱
@@ -127,7 +137,7 @@
default:
break;
}
- log.info("/pakin/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode());
+ log.info("/pakin/loc/v1:"+dto + "======璐ф灦鐮�:"+param.getBarcode());
return R.ok().add(dto);
}
@@ -189,10 +199,10 @@
StartupDto dto = null;
switch (param.getIoType()) {
- case 1://婊℃墭鐩樺叆搴�
+ case 1://婊¤揣鏋跺叆搴�
dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats, waitPakins);
break;
- case 10://绌烘墭鐩樺叆搴�
+ case 10://绌鸿揣鏋跺叆搴�
dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
break;
case 103:// 鎷ｆ枡鍏ュ簱
@@ -203,7 +213,7 @@
default:
break;
}
- log.info("/pakin/loc/v1:"+dto + "======鎵樼洏鐮�:"+param.getBarcode());
+ log.info("/pakin/loc/v1:"+dto + "======璐ф灦鐮�:"+param.getBarcode());
return R.ok().add(dto);
}
@@ -245,13 +255,13 @@
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
wrkMast.setLocNo(dto.getLocNo());
- wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
+ wrkMast.setBarcode(barcode); // 璐ф灦鐮�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("Y");
- wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ wrkMast.setCtnType(sourceStaNo.getCtnType()); // 璐ф灦绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
@@ -357,7 +367,7 @@
wrkMast.setLinkMis("Y");
wrkMast.setBarcode(barcode);
// wrkMast.setSteNo(findSte(wrkMast.getLocNo()));
- wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ wrkMast.setCtnType(sourceStaNo.getCtnType()); // 璐ф灦绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(new Date());
wrkMast.setModiTime(new Date());
@@ -426,6 +436,11 @@
throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+ throw new CoolException(wrkMast.getWrkNo() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
+ }
+
//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
Integer staNo = liftNo * 100 + locMast.getLev1();
// 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
@@ -437,7 +452,7 @@
wrkMast.setShuttleNo(null); // 绌挎杞︽竻绌�
wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
wrkMast.setModiTime(new Date());
- if (wrkMastMapper.updateById(wrkMast) > 0) {
+ if (!wrkMastService.updateById(wrkMast)) {
throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
}
@@ -472,6 +487,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 +504,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() + "淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
}
//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
@@ -510,7 +539,7 @@
wrkMast.setShuttleNo(null); // 绌挎杞︽竻绌�
wrkMast.setLiftNo(null);// 鎻愬崌鏈烘竻绌�
wrkMast.setModiTime(new Date());
- if (wrkMastMapper.updateById(wrkMast) > 0) {
+ if (!wrkMastService.updateById(wrkMast)) {
throw new CoolException(wrkMast.getWrkNo() + "鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
}
@@ -549,7 +578,7 @@
String containerCode = param.getContainerCode();
if(Cools.isEmpty(containerCode)){
- throw new CoolException("鏂欑鐮佷负绌�");
+ throw new CoolException("璐ф灦鐮佷负绌�");
}
if(!Character.isDigit(containerCode.charAt(0))){
@@ -561,24 +590,154 @@
if(Cools.isEmpty(agvBasDevp) || !"O".equals(agvBasDevp.getLocSts())){
throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦ㄦ垨鑰呯珯鐐逛笉涓虹┖");
}
- if(Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
- throw new CoolException("璇ユ枡绠变綅缁勬墭");
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", containerCode));
+
+ //鎷ｆ枡銆佺洏鐐瑰畬鎴愪换鍔�
+ if(!Cools.isEmpty(agvWrkMast) && (agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107) && agvWrkMast.getWrkSts() == 205){
+ //缁戝畾绔欑偣
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode,agvWrkMast.getWhsType().shortValue());
+
+ //鐢熸垚鎷ｆ枡銆佺洏鐐瑰啀鍏ュ簱浠诲姟
+ List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
+ agvWrkMast.setMk("Y");
+ agvWrkMast.setLocNo(agvBasDevp.getDevNo());
+ agvWrkMastList.add(agvWrkMast);
+ agvWorkService.pickIn(agvWrkMastList);
+
+ return R.ok();
}
- //鍘绘壘agv宸ヤ綔妗ｄ换鍔�
- 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,agvWrkMast.getWhsType().shortValue());
+ //鐢熸垚宸ヤ綔妗�
+ 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 containerCode = param.getContainerCode().split(";")[0];
+
+ if(Cools.isEmpty(containerCode)){
+ throw new CoolException("璐ф灦鐮佷负绌�");
+ }
+
+ if(!Character.isDigit(containerCode.charAt(0))){
+ containerCode = containerCode.substring(3,containerCode.length());
+ }
+
+
+ String devNo = param.getDevNo();
+ String currentContainerCode = currentContainerMap.get(devNo);
+
+ //鍒ゆ柇璐ф灦鏄惁鍙戠敓鍙樺寲
+ if(!Cools.isEmpty(currentContainerCode) && !Cools.eq(containerCode,currentContainerCode)){
+ //鏌ヨ鏃ц揣鏋剁殑宸ヤ綔妗�
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(currentContainerCode);
+ if(!Cools.isEmpty(agvWrkMast) && agvWrkMast.getIoType() == 101){
+ //灏嗗伐浣滃厷鐘舵�佹敼涓鸿揣鏋剁鍦�
+ agvWrkMast.setWrkSts(206L);
+ agvWrkMastService.updateById(agvWrkMast);
+// //鍙戦�佽揣鏋剁珛鍦鸿姹傦紝瀹屾垚宸ヤ綔妗�
+// 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杈撻�佺嚎鎷ｆ枡銆佺洏鐐广�佸叆搴撲俊鎭�
+ */
+ @PostMapping("/info")
+ @ResponseBody
+ public R containerMove(@RequestBody ReplenishmentParam param){
+
+ String devNo = param.getDevNo();
+ String containerCode = currentContainerMap.get(devNo);
+
+ AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();
+
+ //鏌ユ壘璇ヨ揣鏋剁殑宸ヤ綔妗�
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
+ if(!Cools.isEmpty(agvWrkMast)){
+ List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
+
+ for (AgvWrkDetl agvWrkDetl : agvWrkDetlList){
+ agvWrkDetl.setVolume(agvWrkDetl.getAnfme());
+ if(agvWrkMast.getIoType() == 103){
+ //瀵绘壘鏄惁鏈夌浉鍚岀墿鏂欑殑宸ヤ綔妗ｆ槑缁嗭紝骞惰繑鍥炴暟閲忎箣鍜�
+ double anfme = getAllAnfmeInAgvWrkDetlList(agvWrkDetlList,agvWrkDetl);
+ AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getSourceLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
+ //鐢ㄤ簬缁撲綑鏁伴噺鏄剧ず
+ agvWrkDetl.setVolume(agvLocDetl.getAnfme() - anfme);
+ }
+ if(agvWrkMast.getIoType() == 53){
+ AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
+ if(Cools.isEmpty(agvLocDetl)){
+ agvWrkDetl.setVolume(0.0);
+ }else {
+ agvWrkDetl.setVolume(agvLocDetl.getAnfme());
+ }
+ }
+ };
+
+ agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
+ agvBasDevpDto.setAgvWrkMast(agvWrkMast);
+ }
+ //鏌ユ壘璇ヨ揣鏋剁殑鍏ュ簱閫氱煡妗�
+ List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", containerCode));
+ if(!Cools.isEmpty(agvWaitPakinList)){
+ agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
+ }
+
+ System.out.println("currentContainerMap: " + currentContainerMap);
+
+
+ System.out.println("agvBasDevpDto: " + agvBasDevpDto);
+
+ return R.ok(agvBasDevpDto);
+ }
+
+ private double getAllAnfmeInAgvWrkDetlList(List<AgvWrkDetl> agvWrkDetlList, AgvWrkDetl wd0) {
+ double allAnfme = 0;
+ for (AgvWrkDetl wd1 : agvWrkDetlList){
+ if(Cools.eq(wd0.getMatnr(),wd1.getMatnr())
+ && Cools.eq(wd0.getBatch(),wd1.getBatch())
+ && Cools.eq(wd0.getThreeCode(),wd1.getThreeCode())
+ && Cools.eq(wd0.getDeadTime(),wd1.getDeadTime())){
+ allAnfme += wd1.getAnfme();
+ }
+ }
+ return allAnfme;
+ }
+
}
--
Gitblit v1.9.1