From 323d014b95241cd42dfa01227dd4a15575f58a2b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 16 九月 2025 11:01:33 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java |   46 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index 25adb11..ea35956 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -11,12 +11,12 @@
 import com.zy.asrs.entity.AgvLocDetl;
 import com.zy.asrs.entity.AgvLocMast;
 import com.zy.asrs.entity.AgvWrkDetl;
-import com.zy.asrs.entity.OrderDetl;
 import com.zy.asrs.mapper.AgvLocDetlMapper;
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.Utils;
 import com.zy.common.model.LocDto;
 import com.zy.common.model.TaskDto;
+import com.zy.system.service.ConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.DataFormatter;
@@ -52,20 +52,26 @@
     private SnowflakeIdWorker snowflakeIdWorker;
     @Autowired
     private FlowLogService flowLogService;
+    @Autowired
+    private ConfigService configService;
 
     public void addLocDetlInfo(String locNo, int taskCode) {
         Date now = new Date();
         List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", taskCode));
         long flowId = snowflakeIdWorker.nextId();
         agvWrkDetls.stream().map(agvWrkDetl -> {
-            AgvLocDetl agvLocDetl = new AgvLocDetl();
-            //log.info("agvWrkDetl: " + agvLocDetl.getBarcode());
-            BeanUtils.copyProperties(agvWrkDetl, agvLocDetl);
-            agvLocDetl.setLocNo(locNo);
-            //log.info("zc娣诲姞搴撳瓨鏃ュ織:{}", JSON.toJSON(agvLocDetl));
-            this.insert(agvLocDetl);
-            // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
-            OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode());
+            AgvLocDetl agvLocDetl = this.selectOne(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo).eq("matnr", agvWrkDetl.getMatnr()).eq("three_code", agvWrkDetl.getThreeCode()));
+            if (agvLocDetl != null) {
+                this.updateAnfme(agvLocDetl.getAnfme() + agvWrkDetl.getAnfme(), agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getBatch(), agvLocDetl.getThreeCode(), agvLocDetl.getDeadTime());
+            } else {
+                agvLocDetl = new AgvLocDetl();
+                //log.info("agvWrkDetl: " + agvLocDetl.getBarcode());
+                BeanUtils.copyProperties(agvWrkDetl, agvLocDetl);
+                agvLocDetl.setLocNo(locNo);
+                //log.info("zc娣诲姞搴撳瓨鏃ュ織:{}", JSON.toJSON(agvLocDetl));
+                this.insert(agvLocDetl);
+                // 娴佹按 -- 鏂板璁㈠崟鏄庣粏
+                //OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode());
 //            FlowLog flowLog = new FlowLog();
 //            flowLog.setFid(String.valueOf(flowId));
 //            flowLog.setSpare2(String.valueOf(taskCode));
@@ -91,6 +97,7 @@
 //            if (!flowLogService.insert(flowLog)) {
 //                throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
 //            }
+            }
             return agvLocDetl;
         }).collect(Collectors.toList());
 
@@ -103,7 +110,13 @@
             if (type.equals(AsrsConstants.ERCHANG)) {
                 wrapper.notLike("loc_no", "F3");
             } else {
-                if (matnr.startsWith("401") || matnr.startsWith("402")) {
+                boolean flag = false;
+                for (String s : configService.getMatCode()) {
+                    if (matnr.startsWith(s)) {
+                        flag = true;
+                    }
+                }
+                if (flag) {
                     //wrapper.notLike("loc_no", "F3");
                     wrapper.notLike("loc_no", "F1");
                 } else {
@@ -194,8 +207,12 @@
     /*
     鏇存柊搴撳瓨鏄庣粏
      */
-    public void updateStock(String sourceLoc, String targetLoc) {
-        this.baseMapper.updateStock(sourceLoc, targetLoc);
+    public void updateStock(String sourceLoc, String targetLoc, Long userId) {
+        if (Cools.isEmpty(userId)) {
+            this.baseMapper.updateStock(sourceLoc, targetLoc);
+        } else {
+            this.baseMapper.updateStock2(sourceLoc, targetLoc, userId);
+        }
     }
 
     public Page<AgvLocDetl> getStockStatis(Page<AgvLocDetl> page) {
@@ -221,6 +238,11 @@
     }
 
     @Override
+    public List<AgvLocDetl> selectItem2(String locNo, String matnr, String batch, String csocode, String isoCode) {
+        return this.baseMapper.selectItemByOrderNo2(locNo, matnr, batch, csocode, isoCode);
+    }
+
+    @Override
     public Double getSumAnfmeProcess(String matnr, String threeCode) {
         return this.baseMapper.selectSumAnfmeByMatnrProcess(matnr, threeCode);
     }

--
Gitblit v1.9.1