From fb4c2cc68e4eb686b931425c0d24ac4515b31ca9 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 01 四月 2026 17:24:32 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 a5ff1a4..18bcdf0 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -189,9 +189,11 @@
}
log.info("浠诲姟鎵ц鍙傛暟鍥炲啓:{}", JSON.toJSONString(params));
if (params.getMsgType().equals("task_complete") || params.getMsgType().equals("station_out_task_run_complete")) {
+ JSONObject json = JSONObject.parseObject(params.getData());
+ log.info(params.getSuperTaskNo() + "==============>{}", json);
if (mast.getIoType() == 1 || mast.getIoType() == 11 || mast.getIoType() == 10 || mast.getIoType() == 53 || mast.getIoType() == 54 || mast.getIoType() == 57) {
if (params.getMsgType().equals("task_complete")) {
- if (mast.getIoType() == 53) {
+ if (mast.getIoType() == 53 && !Objects.isNull(json) && json.getInteger("ioType") == 1) {
List<WrkDetl> wrkDetls103 = wrkDetlService
.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
if (wrkDetls103.isEmpty()) {
@@ -220,8 +222,12 @@
}
}
}
+ mast.setWrkSts(4L);
+ } else if ((mast.getIoType() == 54 || mast.getIoType() == 57) ) {
+ mast.setWrkSts(4L);
+ } else if (mast.getIoType() != 53 ) {
+ mast.setWrkSts(4L);
}
- mast.setWrkSts(4L);
}
} else if (mast.getIoType() == 101 || mast.getIoType() == 110 || mast.getIoType() == 103 || mast.getIoType() == 104 || mast.getIoType() == 107) {
if (mast.getWrkSts() != 14) {
--
Gitblit v1.9.1