From 25c4d88c377055a726d8f79c9e11e2484b3c3442 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期二, 23 九月 2025 12:58:30 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 628319e..9f1cdb0 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -14,6 +14,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
@@ -21,6 +22,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.rmi.CORBA.Util;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -598,13 +600,14 @@
@Transactional
public void taskArmReport(TaskArmReportParam param) {
BasArmMast basArmMast = new BasArmMast(param);
- List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<BasArm>().eq("sorting_line", basArmMast.getSortingLine()));
+ List<BasArm> basArmList = basArmService.selectList(new EntityWrapper<BasArm>().eq("sorting_line_sou", basArmMast.getSortingLine()));
for (BasArm basArm : basArmList) {
if (basArm.getStatus()!=1){
continue;
}
basArmMast.setArmNo(basArm.getArmNo());
- basArmMast.setStaNo(basArm.getStaNo());
+ basArmMast.setStaNo(basArm.getStaNoSou());
+ break;
}
basArmMastService.insert(basArmMast);
}
@@ -614,7 +617,7 @@
public void taskArmCycleResult(TaskArmCycleResultParam param) {
BasArmMast basArmMast = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
- .eq("sorting_line", param.getStaNo())
+ .eq("sorting_line", Utils.armStaNo(param.getArm_no(),Integer.parseInt(param.getStaNo())))
.eq("arm_no", param.getArm_no())
.eq("status", 1)
);
@@ -631,7 +634,7 @@
public void taskArmWorkspaceStatus(TaskArmWorkspaceStatusParam param) {
BasArmMast basArmMast = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
- .eq("sorting_line", Integer.getInteger(param.getId()))
+ .eq("sorting_line", Utils.armStaNo(param.getArm_no(),Integer.parseInt(param.getId())))
.eq("arm_no", param.getArm_no())
.eq("status", 2)
);
@@ -646,14 +649,14 @@
public void taskArmWorkOrderStatus(OrderArmEndParam param) {
BasArmMast basArmMast = basArmMastService.selectOne(
new EntityWrapper<BasArmMast>()
- .eq("sorting_line", Integer.getInteger(param.getStaNo()))
+ .eq("sorting_line", Utils.armStaNo(param.getArm_no(),Integer.parseInt(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);
+ basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(), 5,6);
}
}
--
Gitblit v1.9.1