From a1e94379b115721b2e604070dc48063b8016f72f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 21 十月 2025 19:32:59 +0800
Subject: [PATCH] 侧面输送线出库码盘信息对接
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 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 138d440..aa8cb04 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -67,7 +67,7 @@
}
int workNoType = WorkNoType.PAKOUT.type;
// 2锛�3鍙峰爢鍨涙満鍑哄簱锛岄渶瑕侀�氳繃鏉＄爜鍖哄垎澶у皬鎵樼洏锛�16寮�澶村皬鎵樼洏锛�18寮�澶村ぇ鎵樼洏锛屼换鍔″彿3001-6000涓哄皬鎵樼洏
- if (param.getIoType() == 2 && (locMast.getCrnNo() == 3 || locMast.getCrnNo() == 2) && locMast.getBarcode().startsWith("16")){
+ if (param.getIoType() == 2 && (locMast.getCrnNo() == 3 || locMast.getCrnNo() == 2) && locMast.getBarcode().startsWith("16")) {
workNoType = WorkNoType.PICK.type;
}
int workNo1 = commonService.getWorkNo(workNoType);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
@@ -80,6 +80,10 @@
taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
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())) {
@@ -90,8 +94,12 @@
} else if (param.getIoType() == 2) {
taskWrk.setWrkSts(11);
// if (!Cools.isEmpty(param.getStartPoint())) {
- taskWrk.setStartPoint(param.getStartPoint());//璧风偣
- taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint())-1));
+ taskWrk.setStartPoint(param.getStartPoint());//璧风偣
+ 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) {
@@ -131,6 +139,19 @@
} else {
staProtocol = staProtocol.clone();
}
+ StaProtocol staProtocol1 = devpThread.getStation().get(param.getTargetSite());
+ if (staProtocol1 == null) {
+ return R.parse(param.getTargetSite() + "绾跨▼涓虹┖!");
+ } else {
+ staProtocol1 = staProtocol1.clone();
+ }
+// 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());
basDevpService.updateById(basDevp);
--
Gitblit v1.9.1