From 1937b401e9a0b2d3863cea2e9fd87405195ec738 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 24 十月 2025 14:29:48 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   73 ++++++++++++++++++++++++++++--------
 1 files changed, 56 insertions(+), 17 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 77c261b..d64ca23 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -58,6 +58,8 @@
     private BasArmMastService basArmMastService;
     @Autowired
     private BasArmMastSignService basArmMastSignService;
+    @Autowired
+    private BasAgvMastService basAgvMastService;
 
     @Override
     @Transactional
@@ -620,7 +622,7 @@
         if (Cools.isEmpty(basArmMastOld)){
             basArmMastService.insert(basArmMast);
         } else {
-            throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+            throw new CoolException("绛夊緟鍓嶈竟璐х墿鎶撳彇锛侊紒锛�"+ JSON.toJSONString(param));
         }
     }
 
@@ -629,12 +631,42 @@
     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("sorting_line", Integer.parseInt(param.getStaNo()))
                 .eq("status", 1)
         );
         if (Cools.isEmpty(basArm)){
             throw new CoolException("鏈烘鑷傞厤缃紓甯革紝鏌ヨ涓嶅埌鏈烘鑷傛暟鎹紒锛侊紒"+ JSON.toJSONString(param));
         }
+
+        try{
+            BasArmMastSign basArmMastSign = basArmMastSignService.selectOne(
+                    new EntityWrapper<BasArmMastSign>()
+                            .eq("matnr", param.getSku())
+                            .eq("order_no", param.getOrderNo())
+                            .eq("create_time", param.getBindingTags())
+            );
+            if (!Cools.isEmpty(basArmMastSign)){
+                basArmMastSign.setStatus(1);
+                basArmMastSignService.updateById(basArmMastSign);
+            }
+        } catch (Exception e){
+        }
+
+        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", basArm.getSortingLineSou())
@@ -644,9 +676,13 @@
         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
@@ -677,7 +713,7 @@
     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("sorting_line", Integer.parseInt(param.getStaNo()))
                 .eq("status", 1)
         );
         if (Cools.isEmpty(basArm)){
@@ -697,20 +733,10 @@
     @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("create_time", param.getBindingTags())
                         .eq("status", 0)
         );
         if (Cools.isEmpty(basArmMastSignNew)){
@@ -719,4 +745,17 @@
         return true;
     }
 
+    @Override
+    @Transactional
+    public boolean TaskAgvReport(TaskAgvReportParam param) {
+        BasAgvMast basAgvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no", param.getTaskNo()));
+        if (Cools.isEmpty(basAgvMast)){
+            return false;
+        }
+        basAgvMast.setStatus(2);
+        basAgvMastService.updateById(basAgvMast);
+        return true;
+    }
+
+
 }

--
Gitblit v1.9.1