From 165bc19e548f7d05c6f0332587a5f8e0496b9b55 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 21 十月 2025 20:21:38 +0800
Subject: [PATCH] 侧面输送线出库条码对接
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 531b742..aa8cb04 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -81,6 +81,9 @@
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
taskWrk.setCrnNo(locMast.getCrnNo());
taskWrk.setType(param.getType());
+ taskWrk.setMp(param.getMp());
+ taskWrk.setLx(param.getLx());
+ taskWrk.setLev(param.getLev());
if (param.getIoType() == 1) {
taskWrk.setWrkSts(1);
if (!Cools.isEmpty(param.getTargetPoint())) {
@@ -92,7 +95,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,12 +145,10 @@
} else {
staProtocol1 = staProtocol1.clone();
}
- if (staProtocol1.isLoading()) {
- return R.error(staProtocol.getSiteId() + "绔欑偣鏈夌墿!");
- }
- if (staProtocol.isLoading()) {
- return R.error(staProtocol.getSiteId() + "绔欑偣鏈夌墿!");
- }
+// if (staProtocol1.isLoading()) {
+// return R.error(staProtocol1.getSiteId() + "绔欑偣鏈夌墿!");
+// }
+
if (!staProtocol.isAutoing()) {
return R.error(staProtocol.getSiteId() + "绔欑偣fei鑷姩");
}
--
Gitblit v1.9.1