From e756eaba7a7868d27cad5a93e9f6d046671116c4 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期一, 29 九月 2025 14:44:01 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 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 77c261b..7183047 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -619,6 +619,18 @@
);
if (Cools.isEmpty(basArmMastOld)){
basArmMastService.insert(basArmMast);
+ try{
+ BasArmMastSign basArmMastSign = basArmMastSignService.selectOne(
+ new EntityWrapper<BasArmMastSign>()
+ .eq("matnr", param.getSku())
+ .eq("order_no", param.getOrderNo())
+ );
+ if (Cools.isEmpty(basArmMastSign)){
+ basArmMastSign.setStatus(1);
+ basArmMastSignService.updateById(basArmMastSign);
+ }
+ } catch (Exception e){
+ }
} else {
throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
}
@@ -629,12 +641,28 @@
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("sorting_line", Integer.parseInt(param.getStaNo()))
.eq("status", 1)
);
if (Cools.isEmpty(basArm)){
throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
}
+
+ BasArmMast basArmMastListError = basArmMastService.selectOne(
+ new EntityWrapper<BasArmMast>()
+ .eq("sorting_line", basArm.getSortingLineSou())
+ .eq("arm_no", param.getArm_no())
+ .eq("status", 9)
+ );
+ if (!Cools.isEmpty(basArmMastListError)){
+ if (Integer.parseInt(param.getPick_num()) ==1){
+ basArmMastListError.setStatus(2);
+ basArmMastService.updateById(basArmMastListError);
+ }
+ return;
+ }
+
+
BasArmMast basArmMast = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
.eq("sorting_line", basArm.getSortingLineSou())
@@ -644,9 +672,13 @@
if (Cools.isEmpty(basArmMast)){
throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
}
-
- basArmMast.setStatus(2);
- basArmMastService.updateById(basArmMast);
+ if (Integer.parseInt(param.getPick_num()) !=1){
+ basArmMast.setStatus(9);
+ basArmMastService.updateById(basArmMast);
+ } else {
+ basArmMast.setStatus(2);
+ basArmMastService.updateById(basArmMast);
+ }
}
@Override
@@ -677,7 +709,7 @@
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("sorting_line", Integer.parseInt(param.getStaNo()))
.eq("status", 1)
);
if (Cools.isEmpty(basArm)){
--
Gitblit v1.9.1