From 86c90f3262023af0ac4ce304f819608e73f54d92 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期四, 25 九月 2025 18:18:46 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   65 +++++++++++++++++++++++++++++---
 1 files changed, 58 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 66b36b5..ec98a76 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,23 +600,43 @@
     @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_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);
+        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", param.getStaNo())
+                        .eq("sorting_line", basArm.getSortingLineSou())
+                        .eq("arm_no", param.getArm_no())
                         .eq("status", 1)
         );
         if (Cools.isEmpty(basArmMast)){
@@ -628,17 +650,46 @@
     @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("sta_no", Integer.getInteger(param.getId()))
+                        .eq("sta_no", basArm.getStaNoSou())
+                        .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) {
+        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",basArm.getSortingLineSou())
+                        .eq("arm_no", param.getArm_no())
+                        .eq("status", 5)
+        );
+        if (!Cools.isEmpty(basArmMast)){
+            basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(), 5,6);
+        }
     }
 
 }

--
Gitblit v1.9.1