From 86c90f3262023af0ac4ce304f819608e73f54d92 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期四, 25 九月 2025 18:18:46 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 8 ++++----
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 30 +++++++++++++++++++++++++++---
2 files changed, 31 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 ba634e5..ec98a76 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -625,9 +625,17 @@
@Override
@Transactional
public void taskArmCycleResult(TaskArmCycleResultParam param) {
+ BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
+ .eq("arm_no", param.getArm_no())
+ .eq("sta_no", Integer.parseInt(param.getStaNo()))
+ .eq("status", 1)
+ );
+ if (Cools.isEmpty(basArm)){
+ throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
+ }
BasArmMast basArmMast = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
- .eq("sorting_line", Utils.armStaNo(param.getArm_no(),Integer.parseInt(param.getStaNo())))
+ .eq("sorting_line", basArm.getSortingLineSou())
.eq("arm_no", param.getArm_no())
.eq("status", 1)
);
@@ -642,9 +650,17 @@
@Override
@Transactional
public void taskArmWorkspaceStatus(TaskArmWorkspaceStatusParam param) {
+ BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
+ .eq("arm_no", param.getArm_no())
+ .eq("sta_no", Integer.parseInt(param.getId()))
+ .eq("status", 1)
+ );
+ if (Cools.isEmpty(basArm)){
+ throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
+ }
BasArmMast basArmMast = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
- .eq("sta_no", Utils.armStaNo(param.getArm_no(),Integer.parseInt(param.getId())))
+ .eq("sta_no", basArm.getStaNoSou())
.eq("arm_no", param.getArm_no())
.eq("status", 2)
);
@@ -657,9 +673,17 @@
@Override
@Transactional
public void taskArmWorkOrderStatus(OrderArmEndParam param) {
+ BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
+ .eq("arm_no", param.getArm_no())
+ .eq("sta_no", Integer.parseInt(param.getStaNo()))
+ .eq("status", 1)
+ );
+ if (Cools.isEmpty(basArm)){
+ throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
+ }
BasArmMast basArmMast = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
- .eq("sorting_line", Utils.armStaNo(param.getArm_no(),Integer.parseInt(param.getStaNo())))
+ .eq("sorting_line",basArm.getSortingLineSou())
.eq("arm_no", param.getArm_no())
.eq("status", 5)
);
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index c554e12..9776730 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -73,9 +73,9 @@
// 缁勮鐗╂枡淇℃伅
OrderToLine.MatList matMix = new OrderToLine.MatList(
orderDetl.getMatnr(), // matnr -> sku
- orderDetl.getSupp(), // supp -> po
+ orderDetl.getStandby1(), // supp -> po
orderDetl.getAnfme(), // 浣欐枡 -> 鍓╀綑浣欐枡缁熶竴鏃堕棿鎴虫爣璁�
- orderDetl.getSku(), //barcode -> upc 鏉＄爜
+ orderDetl.getStandby2(), //barcode -> upc 鏉＄爜
1,
null, //origin -> supplier 璐ф簮
bindingTag //浣欐枡鏍囪鐩稿悓
@@ -88,9 +88,9 @@
// 缁勮鐗╂枡淇℃伅
OrderToLine.MatList mat = new OrderToLine.MatList(
orderDetl.getMatnr(), // matnr -> sku
- orderDetl.getSupp(), // supp -> po
+ orderDetl.getStandby1(), // supp -> po
orderDetl.getAnfme(), //鏁存枡
- orderDetl.getSku(), //barcode -> upc
+ orderDetl.getStandby2(), //barcode -> upc
1,
null, //origin -> supplier 璐ф簮
System.currentTimeMillis()
--
Gitblit v1.9.1