From d7621e3cbf301453fe87ee584f34333378a5afb3 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期日, 21 九月 2025 21:02:50 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 66b36b5..628319e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -598,7 +598,7 @@
@Transactional
public void taskArmReport(TaskArmReportParam param) {
BasArmMast basArmMast = new BasArmMast(param);
- List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<BasArm>().eq("sorting_line", basArmMast.getStaNo()));
+ List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<BasArm>().eq("sorting_line", basArmMast.getSortingLine()));
for (BasArm basArm : basArmList) {
if (basArm.getStatus()!=1){
continue;
@@ -615,6 +615,7 @@
BasArmMast basArmMast = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
.eq("sorting_line", param.getStaNo())
+ .eq("arm_no", param.getArm_no())
.eq("status", 1)
);
if (Cools.isEmpty(basArmMast)){
@@ -630,15 +631,29 @@
public void taskArmWorkspaceStatus(TaskArmWorkspaceStatusParam param) {
BasArmMast basArmMast = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
- .eq("sta_no", Integer.getInteger(param.getId()))
+ .eq("sorting_line", Integer.getInteger(param.getId()))
+ .eq("arm_no", param.getArm_no())
.eq("status", 2)
);
if (Cools.isEmpty(basArmMast)){
throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
}
+ basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),2,3);
+ }
-// basArmMast.setStatus(2);
-// basArmMastService.updateArmMastStatus(1,basArm.getSortingLine(),3,4);
+ @Override
+ @Transactional
+ public void taskArmWorkOrderStatus(OrderArmEndParam param) {
+ BasArmMast basArmMast = basArmMastService.selectOne(
+ new EntityWrapper<BasArmMast>()
+ .eq("sorting_line", Integer.getInteger(param.getStaNo()))
+ .eq("arm_no", param.getArm_no())
+ .eq("status", 5)
+ );
+ if (Cools.isEmpty(basArmMast)){
+ throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ }
+ basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),5,6);
}
}
--
Gitblit v1.9.1