From 5a8064c78b2138ededdca56ec1fcf8eb7e8bb9ae Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期五, 13 六月 2025 15:18:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 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 18227a5..c8a7846 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);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
@@ -91,8 +91,8 @@
} 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());//璧风偣
+ taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint()) - 1));
// }
// taskWrk.setTargetPoint(param.getTargetPoint());
} else if (param.getIoType() == 3) {
@@ -132,6 +132,15 @@
} 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("鐩爣绔欑偣鏈夌墿!");
+ }
staProtocol.setWorkNo((short) commonService.getWorkNo(param.getFlag()));
staProtocol.setStaNo(param.getTargetSite().shortValue());
basDevpService.updateById(basDevp);
--
Gitblit v1.9.1