From 04be06484c74bfae048f58bcb4f41791e0d02692 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 18:40:55 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 7 ++++---
1 files changed, 4 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 0c73e47..18227a5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -66,8 +66,8 @@
return map;
}
int workNoType = WorkNoType.PAKOUT.type;
- // 鍑哄簱鍒�2锛�3鍙峰爢鍨涙満锛岄渶瑕侀�氳繃浠诲姟鍙峰尯鍒嗗ぇ灏忔墭鐩橈紝浠诲姟鍙�3001-6000涓哄皬鎵樼洏锛屽嵆8~12鍒�
- if (param.getIoType() == 2 && (locMast.getCrnNo() == 3 || locMast.getCrnNo() == 2) && locMast.getBay1() > 7){
+ // 2锛�3鍙峰爢鍨涙満鍑哄簱锛岄渶瑕侀�氳繃鏉＄爜鍖哄垎澶у皬鎵樼洏锛�16寮�澶村皬鎵樼洏锛�18寮�澶村ぇ鎵樼洏锛屼换鍔″彿3001-6000涓哄皬鎵樼洏
+ 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,7 @@
taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
taskWrk.setCrnNo(locMast.getCrnNo());
+ taskWrk.setType(param.getType());
if (param.getIoType() == 1) {
taskWrk.setWrkSts(1);
if (!Cools.isEmpty(param.getTargetPoint())) {
@@ -131,7 +132,7 @@
} else {
staProtocol = staProtocol.clone();
}
- staProtocol.setWorkNo((short) commonService.getWorkNo(WorkNoType.PICK.type));
+ staProtocol.setWorkNo((short) commonService.getWorkNo(param.getFlag()));
staProtocol.setStaNo(param.getTargetSite().shortValue());
basDevpService.updateById(basDevp);
boolean result = MessageQueue.offer(SlaveType.Devp, 2, new Task(2, staProtocol));
--
Gitblit v1.9.1