From feb9933a4640c0d02eace5a9a3ade4a8a33890ea Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 20 一月 2026 19:24:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 63 ++++++++++++-------------------
1 files changed, 24 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index e102f20..c4245cc 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -213,7 +213,30 @@
if(!param.getWarehouse().equals(warehouse)){
return Re.error("浠撳簱缂栧彿涓嶅尮閰�");
}
- return Re.ok();
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", param.getPortCode()));
+ if(param.getErrorMsg()!=null){
+ basDevp.setDecDesc(param.getErrorMsg());
+ basDevp.setDevMk("N");
+ }
+ return Re.ok(basDevpService.updateById(basDevp));
+ }
+
+ @PostMapping("/fromwcs/taskReport")
+ @ResponseBody
+ public synchronized Re taskReport(@RequestBody TaskMsg param){
+ log.info("鏀跺埌WCS浠诲姟鍏ュ簱寮傚父涓婃姤===>>鍏ュ弬:{}",param);
+ if(Cools.isEmpty(param.getWarehouse())){
+ return Re.error("浠撳簱缂栧彿涓嶈兘涓虹┖");
+ }
+ if(!param.getWarehouse().equals(warehouse)){
+ return Re.error("浠撳簱缂栧彿涓嶅尮閰�");
+ }
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", param.getPortCode()));
+ if(param.getTaskNo()!=null){
+ basDevp.setWrkNo(Integer.valueOf(param.getTaskNo()));
+ basDevp.setDevMk("Y");
+ }
+ return Re.ok(basDevpService.updateById(basDevp));
}
@PostMapping("/fromwcs/applyChangeEnd")
@@ -599,46 +622,8 @@
* 浠诲姟涓柇,4-鏀捐揣
* 瀹屾垚,8-浠诲姟缁撴潫
*/
-
if (statusParam.getTaskStatus() == 0) {
-// //鎷ｆ枡鍜岀洏鐐瑰啀鍏ュ簱鍒ゆ柇
-// if ((wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) && wrkMast.getWrkSts() == 14) {
-// List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
-// String sourcecLocNo = wrkMast.getSourceLocNo();
-// // 鑾峰彇鍚庝袱浣嶇殑灞傛暟锛堥珮浣庡簱浣嶆暟鎹級
-// String layerStr = sourcecLocNo.substring(sourcecLocNo.length() - 2);
-// int layer = Integer.parseInt(layerStr);
-// // 鍒ゆ柇灞傛暟
-// Short locType1 = (short) ((layer == 1) ? 1 : 2);
-// LocTypeDto locTypeDto = new LocTypeDto();
-// locTypeDto.setLocType1(locType1);
-// //娉ㄦ剰涓�涓澘鍙兘鏀惧悓涓�绉嶇墿鏂欙紙妫�绱㈡柊搴撲綅锛�
-//// StartupDto dto = commonService.getLocNoRunPick(4, 1, 101, wrkDetls.get(0).getMatnr(), wrkDetls.get(0).getBatch(), null, 4, locTypeDto, 2);
-// FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
-// findLocNoAttributeVo.setMatnr(wrkDetls.get(0).getMatnr());
-// StartupDto dto = commonService.getLocNoNew(1, 101, findLocNoAttributeVo,locTypeDto,null);
-// Date now = new Date();
-// wrkMast.setIoTime(now);
-// wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
-// wrkMast.setWrkSts(1L);//1.宸叉帴鏀�
-// wrkMast.setSourceStaNo(101); // 婧愮珯
-// wrkMast.setStaNo(null); // 鐩爣绔�
-// wrkMast.setLocNo(dto.getLocNo()); // 鐩爣搴撲綅
-// wrkMast.setSourceLocNo(sourcecLocNo);
-// wrkMast.setModiTime(now);
-// wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);
-//
-// // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
-// LocMast locMast2 = locMastService.selectById(dto.getLocNo());
-// locMast2.setLocSts("Q");
-// locMast2.setModiTime(new Date());
-// if (!locMastService.updateById(locMast2)) {
-//
-// throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
-// }
-// } else {
wrkMast.setWrkSts(1L);//1.宸叉帴鏀�
-// }
} else if (statusParam.getTaskStatus() == 1) {
wrkMast.setWrkSts(2L);//2.浠诲姟寮�濮�
} else if (statusParam.getTaskStatus() == 2) {
--
Gitblit v1.9.1