From 1b7fcf868eb74e741c5af7b7ad9562958f3c48a2 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期五, 26 九月 2025 15:21:46 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 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 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)
);
--
Gitblit v1.9.1