From aa221b6b6c3939130c78e4219207d14ce877ff30 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 15:57:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/web/WcsController.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index fc8ca3a..07864aa 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -121,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:// 鎷ｆ枡鍏ュ簱
@@ -137,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);
}
@@ -199,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:// 鎷ｆ枡鍏ュ簱
@@ -213,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);
}
@@ -255,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);
@@ -367,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());
@@ -489,7 +489,7 @@
}
List<LocDetl> locDetls1 = locDetlService.selectByLocNo(locMast.getLocNo());
- log.info("宸ヤ綔鍙凤細" + wrkMast.getWrkNo() + "锛屾墭鐩樼爜锛�" + wrkMast.getBarcode() + "锛屼慨鏀瑰簱浣嶇姸鎬丱=>Q鎴愬姛锛屽簱瀛樻槑缁嗭細" + JSON.toJSONString(locDetls1));
+ log.info("宸ヤ綔鍙凤細" + wrkMast.getWrkNo() + "锛岃揣鏋剁爜锛�" + wrkMast.getBarcode() + "锛屼慨鏀瑰簱浣嶇姸鎬丱=>Q鎴愬姛锛屽簱瀛樻槑缁嗭細" + JSON.toJSONString(locDetls1));
} else {
throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
@@ -578,7 +578,7 @@
String containerCode = param.getContainerCode();
if(Cools.isEmpty(containerCode)){
- throw new CoolException("鏂欑鐮佷负绌�");
+ throw new CoolException("璐ф灦鐮佷负绌�");
}
if(!Character.isDigit(containerCode.charAt(0))){
@@ -595,7 +595,7 @@
//鎷ｆ枡銆佺洏鐐瑰畬鎴愪换鍔�
if(!Cools.isEmpty(agvWrkMast) && (agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107) && agvWrkMast.getWrkSts() == 205){
//缁戝畾绔欑偣
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode,agvWrkMast.getWhsType().shortValue());
//鐢熸垚鎷ｆ枡銆佺洏鐐瑰啀鍏ュ簱浠诲姟
List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
@@ -610,7 +610,7 @@
//鍏ュ簱浠诲姟
if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
//缁戝畾绔欑偣
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",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);
@@ -618,7 +618,7 @@
return R.ok();
}
- return R.error("娌℃湁鏌ヨ鍒拌鏂欑淇℃伅");
+ return R.error("娌℃湁鏌ヨ鍒拌璐ф灦淇℃伅");
}
@@ -633,7 +633,7 @@
String containerCode = param.getContainerCode().split(";")[0];
if(Cools.isEmpty(containerCode)){
- throw new CoolException("鏂欑鐮佷负绌�");
+ throw new CoolException("璐ф灦鐮佷负绌�");
}
if(!Character.isDigit(containerCode.charAt(0))){
@@ -644,21 +644,22 @@
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);
+ agvWrkMast.setModiTime(new Date());
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);
// }
@@ -685,7 +686,7 @@
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()));
@@ -712,7 +713,7 @@
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);
--
Gitblit v1.9.1