From 159f0c64d0d05b2c08c1881e904cd359ee62af24 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 29 九月 2025 14:01:14 +0800
Subject: [PATCH] #和得服务器
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 100 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 90 insertions(+), 10 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 9f1cdb0..321769b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -56,6 +56,8 @@
private BasArmService basArmService;
@Autowired
private BasArmMastService basArmMastService;
+ @Autowired
+ private BasArmMastSignService basArmMastSignService;
@Override
@Transactional
@@ -609,32 +611,78 @@
basArmMast.setStaNo(basArm.getStaNoSou());
break;
}
- basArmMastService.insert(basArmMast);
+ BasArmMast basArmMastOld = basArmMastService.selectOne(
+ new EntityWrapper<BasArmMast>()
+ .eq("sorting_line", basArmMast.getSortingLine())
+ .eq("arm_no", basArmMast.getArmNo())
+ .eq("status", 0)
+ );
+ if (Cools.isEmpty(basArmMastOld)){
+ basArmMastService.insert(basArmMast);
+ } else {
+ throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ }
}
@Override
@Transactional
public void taskArmCycleResult(TaskArmCycleResultParam param) {
+ BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
+ .eq("arm_no", param.getArm_no())
+ .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", Utils.armStaNo(param.getArm_no(),Integer.parseInt(param.getStaNo())))
+ .eq("sorting_line", basArm.getSortingLineSou())
.eq("arm_no", param.getArm_no())
.eq("status", 1)
);
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
@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("sorting_line", Utils.armStaNo(param.getArm_no(),Integer.parseInt(param.getId())))
+ .eq("sta_no", basArm.getStaNoSou())
.eq("arm_no", param.getArm_no())
.eq("status", 2)
);
@@ -647,16 +695,48 @@
@Override
@Transactional
public void taskArmWorkOrderStatus(OrderArmEndParam param) {
+ BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
+ .eq("arm_no", param.getArm_no())
+ .eq("sorting_line", 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)
);
- if (Cools.isEmpty(basArmMast)){
- throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ if (!Cools.isEmpty(basArmMast)){
+ basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(), 5,6);
}
- basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(), 5,6);
+ }
+
+ @Override
+ @Transactional
+ public boolean TaskArmWorkOrderSign(OrderArmEndParam param) {
+ BasArmMastSign basArmMastSign = basArmMastSignService.selectOne(
+ new EntityWrapper<BasArmMastSign>()
+ .eq("matnr", param.getSku())
+ .eq("order_no", param.getOrderNo())
+ );
+ if (Cools.isEmpty(basArmMastSign)){
+// throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ return false;
+ }
+ BasArmMastSign basArmMastSignNew = basArmMastSignService.selectOne(
+ new EntityWrapper<BasArmMastSign>()
+ .eq("matnr", param.getSku())
+ .eq("order_no", param.getOrderNo())
+ .eq("create_time", basArmMastSign.getCreateTime())
+ .eq("status", 0)
+ );
+ if (Cools.isEmpty(basArmMastSignNew)){
+ return false;
+ }
+ return true;
}
}
--
Gitblit v1.9.1