From 1ba71b9ee89817b1931e950c966a320c75ef02c3 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 08 九月 2025 15:18:53 +0800
Subject: [PATCH] 侧面输送线出库条码对接
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index c8a7846..8e0d452 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -92,7 +92,11 @@
taskWrk.setWrkSts(11);
// if (!Cools.isEmpty(param.getStartPoint())) {
taskWrk.setStartPoint(param.getStartPoint());//璧风偣
- taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint()) - 1));
+ if (Integer.parseInt(param.getTargetPoint()) == 211 || Integer.parseInt(param.getTargetPoint()) == 206 || Integer.parseInt(param.getTargetPoint()) == 202) {
+ taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint()) + 1));
+ } else {
+ taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint()) - 1));
+ }
// }
// taskWrk.setTargetPoint(param.getTargetPoint());
} else if (param.getIoType() == 3) {
@@ -138,8 +142,12 @@
} else {
staProtocol1 = staProtocol1.clone();
}
- if (staProtocol1.isLoading()) {
- return R.error("鐩爣绔欑偣鏈夌墿!");
+// if (staProtocol1.isLoading()) {
+// return R.error(staProtocol1.getSiteId() + "绔欑偣鏈夌墿!");
+// }
+
+ if (!staProtocol.isAutoing()) {
+ return R.error(staProtocol.getSiteId() + "绔欑偣fei鑷姩");
}
staProtocol.setWorkNo((short) commonService.getWorkNo(param.getFlag()));
staProtocol.setStaNo(param.getTargetSite().shortValue());
--
Gitblit v1.9.1