From c3e47e5e70a9055b7d25c118eb1f7ec3c869e953 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 05 六月 2025 13:53:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wz-JiAo-wms' into wz-JiAo-wms
---
src/main/java/com/zy/common/web/WcsController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 4225924..ee11139 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -321,7 +321,8 @@
@PostMapping("/fromwcs/task")
@ResponseBody
public Re status(@RequestBody StatusParam statusParam) {
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", statusParam.getTaskId()));
+ String[] wrkNo=statusParam.getTaskId().split("-",2);
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.parseInt(wrkNo[0])));
if(Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()!=8){
return Re.error("娌℃湁鎵惧埌:"+statusParam.getTaskId()+"杩欐潯浠诲姟");
}else if(Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()==8){
--
Gitblit v1.9.1