From 72403912dc984290de2ce7c812d3ae8ceda09bd4 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期一, 29 九月 2025 13:38:47 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   74 +++++++++++++++++++++++++++++++++---
 1 files changed, 67 insertions(+), 7 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..77c261b 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,15 +611,33 @@
             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("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)
         );
@@ -632,9 +652,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("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 +675,48 @@
     @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)
         );
-        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