From 988ac4e6d57fd550bcd34bc6227f900aef7b0f6b Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期一, 08 十二月 2025 09:03:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 16 +++++++++++++++-
1 files changed, 15 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 d209e64..0f5e6ec 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -19,6 +19,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.ReactiveTypeDescriptor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -103,6 +104,18 @@
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
+
+ WrkMast wrkMast1 = wrkMastService.selectByBarcode(param.getBarcode());
+ if (wrkMast1 != null) {
+ StartupDto startupDto = new StartupDto();
+ startupDto.setTaskNo(wrkMast1.getWrkNo());
+ startupDto.setSourceStaNo(wrkMast1.getSourceStaNo());
+ startupDto.setTaskPri(wrkMast1.getIoPri());
+ startupDto.setCrnNo(wrkMast1.getCrnNo());
+ startupDto.setLocNo(Utils.locToLocNo(wrkMast1.getLocNo()));
+ return R.ok().add(startupDto);
+ }
+
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
if (Cools.isEmpty(waitPakins)) {
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
@@ -181,6 +194,7 @@
return R.error("淇敼宸ヤ綔妗ｅけ璐�====>14");
}
}
+ break;
case "task_cancel":
workService.cancelWrkMast(notifyDto.getSuperTaskNo(), 9527L);
}
@@ -330,7 +344,7 @@
}
});
// 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
- if (!waitPakinService.updateIoStatus("Y", dto.getLocNo(), barcode)) {
+ if (!waitPakinService.updateIoStatus("Y", loc(dto.getLocNo()), barcode)) {
throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
}
// 鏇存柊婧愮珯鐐逛俊鎭�
--
Gitblit v1.9.1