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 |   74 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 72 insertions(+), 2 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 40251b3..9f1cdb0 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.DateUtils;
@@ -13,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;
@@ -20,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;
@@ -49,6 +52,10 @@
     private TagService tagService;
     @Autowired
     private TagMapper tagMapper;
+    @Autowired
+    private BasArmService basArmService;
+    @Autowired
+    private BasArmMastService basArmMastService;
 
     @Override
     @Transactional
@@ -564,7 +571,7 @@
                 } else {
                     tagId = tagService.getTop().getId();
                 }
-                mat.sync(param);
+                mat.sync(matParam);
 //            mat.setMatnr(param.getMatnr());
 //            mat.setMaktx(param.getMaktx());
 //            mat.setSpecs(param.getSpecs());
@@ -580,7 +587,7 @@
                     log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
                 }
             } else {
-                mat.sync(param);
+                mat.sync(matParam);
                 if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
                     throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
                 }
@@ -589,4 +596,67 @@
 
     }
 
+    @Override
+    @Transactional
+    public void taskArmReport(TaskArmReportParam param) {
+        BasArmMast basArmMast = new BasArmMast(param);
+        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.getStaNoSou());
+            break;
+        }
+        basArmMastService.insert(basArmMast);
+    }
+
+    @Override
+    @Transactional
+    public void taskArmCycleResult(TaskArmCycleResultParam param) {
+        BasArmMast basArmMast = basArmMastService.selectOne(
+                new EntityWrapper<BasArmMast>()
+                        .eq("sorting_line", Utils.armStaNo(param.getArm_no(),Integer.parseInt(param.getStaNo())))
+                        .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);
+    }
+
+    @Override
+    @Transactional
+    public void taskArmWorkspaceStatus(TaskArmWorkspaceStatusParam param) {
+        BasArmMast basArmMast = basArmMastService.selectOne(
+                new EntityWrapper<BasArmMast>()
+                        .eq("sorting_line", Utils.armStaNo(param.getArm_no(),Integer.parseInt(param.getId())))
+                        .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);
+    }
+
+    @Override
+    @Transactional
+    public void taskArmWorkOrderStatus(OrderArmEndParam param) {
+        BasArmMast basArmMast = basArmMastService.selectOne(
+                new EntityWrapper<BasArmMast>()
+                        .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);
+    }
+
 }

--
Gitblit v1.9.1