From 49857a19175c2ade79882ada8b5beadf9d3a5c6c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期三, 11 三月 2026 18:34:22 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 167e77e..91389f9 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -188,15 +188,14 @@
throw new CoolException("浠诲姟妗ｄ笉瀛樺湪锛侊紒");
}
log.info("浠诲姟鎵ц鍙傛暟鍥炲啓:{}", JSON.toJSONString(params));
- if (params.getNotifyType().equals("task")) {
- //浠诲姟
- if (params.getMsgType().equals("task_complete") || params.getMsgType().equals("station_out_task_run")) {
- if (mast.getIoType() == 1 || mast.getIoType() == 11 || mast.getIoType() == 10 || mast.getIoType() == 53 || mast.getIoType() == 54 || mast.getIoType() == 57) {
-
- mast.setWrkSts(4L);
- } else if (mast.getIoType() == 101 || mast.getIoType() == 110 || mast.getIoType() == 103 || mast.getIoType() == 104 || mast.getIoType() == 107) {
+ if (params.getMsgType().equals("task_complete") || params.getMsgType().equals("station_out_task_run_complete")) {
+ if (mast.getIoType() == 1 || mast.getIoType() == 11 || mast.getIoType() == 10 || mast.getIoType() == 53 || mast.getIoType() == 54 || mast.getIoType() == 57) {
+ mast.setWrkSts(4L);
+ } else if (mast.getIoType() == 101 || mast.getIoType() == 110 || mast.getIoType() == 103 || mast.getIoType() == 104 || mast.getIoType() == 107) {
+ //TODO 鎭㈠姝ｅ父鍚庯紝杩欓噷浠ｇ爜瑕佹敞閲婃帀
+ if (mast.getWrkSts() != 14) {
//TODO 鎭㈠姝ｅ父鍚庯紝杩欓噷浠ｇ爜瑕佹敞閲婃帀
- if (mast.getIoType() == 103 || mast.getIoType() == 107) {
+ if (mast.getIoType() == 103) {
List<WrkDetl> wrkDetls103 = wrkDetlService
.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
if (wrkDetls103.isEmpty()) {
@@ -228,12 +227,12 @@
}
mast.setWrkSts(14L);
}
- if (!wrkMastService.updateById(mast)) {
- throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
- } else if (params.getMsgType().equals("task_cancel")) {
- //todo 鍙栨秷浠诲姟
}
+ if (!wrkMastService.updateById(mast)) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ } else if (params.getMsgType().equals("task_cancel")) {
+ //todo 鍙栨秷浠诲姟
}
return R.ok();
}
--
Gitblit v1.9.1