From 2a542491b78e75cfa0a22b4c6eb6e6087bf2746e Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 11 十一月 2023 13:28:10 +0800
Subject: [PATCH] bug修复

---
 src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java |   62 +++++++++++++++++++++++++++----
 1 files changed, 54 insertions(+), 8 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 bf76e41..971d784 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -13,7 +13,10 @@
 import com.zy.asrs.service.AgvLocDetlService;
 import com.zy.asrs.service.AgvLocMastService;
 import com.zy.asrs.service.AgvWrkDetlService;
+import com.zy.asrs.utils.Utils;
 import com.zy.common.model.LocDto;
+import com.zy.common.model.TaskDto;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -23,6 +26,7 @@
 import java.util.stream.Collectors;
 
 @Service
+@Slf4j
 public class AgvLocDetlServiceImpl extends ServiceImpl<AgvLocDetlMapper, AgvLocDetl> implements AgvLocDetlService {
 
     @Autowired
@@ -34,8 +38,9 @@
 
     public void addLocDetlInfo(String locNo, int taskCode) {
         List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", taskCode));
-        List<AgvLocDetl> agvLocDetlList = agvWrkDetls.stream().map(agvWrkDetl -> {
+        agvWrkDetls.stream().map(agvWrkDetl -> {
             AgvLocDetl agvLocDetl = new AgvLocDetl();
+            log.info("agvWrkDetl: " + agvLocDetl.getBarcode());
             BeanUtils.copyProperties(agvWrkDetl, agvLocDetl);
             agvLocDetl.setLocNo(locNo);
             this.insert(agvLocDetl);
@@ -69,7 +74,7 @@
                 LocDto locDto = new LocDto(agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getBatch(), orderNo, anfme);
                 locDto.setCsocode(csocode);
                 locDto.setIsoseq(isoseq);
-                locDto.setContainerCode(agvLocDetl.getZpallet());
+                locDto.setContainerCode(agvLocDetl.getSuppCode());
                 //褰撳墠搴撲綅鎵�澶勬ゼ灞�
                 int floor = Integer.parseInt(agvLocDetl.getLocNo().split("@")[1]);
                 locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
@@ -91,7 +96,7 @@
     }
 
     public Page<AgvLocDetl> getStockStatis(Page<AgvLocDetl> page) {
-        page.setRecords(baseMapper.getStockStatis(page.getCondition()));
+        page.setRecords(baseMapper.getStockStatis1(page.getCondition()));
         page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
         return page;
     }
@@ -130,14 +135,18 @@
         return this.selectList(wrapper);
     }
 
-    public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch) {
+    public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch, String csocode, String isocode) {
+        EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
+        Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
+        wrapper.eq("loc_no", locNo);
         if (anfme <= 0) {
-            return this.delete(new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).eq("loc_no", locNo));
+            return this.baseMapper.deleteLocDetl(locNo,anfme,matnr,batch,csocode,isocode) > 0;
         } else {
-            AgvLocDetl agvLocDetl = this.selectOne(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo).eq("matnr", matnr));
+            AgvLocDetl agvLocDetl = this.selectOne(wrapper);
             agvLocDetl.setAnfme(anfme);
-            return this.update(agvLocDetl,new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo).eq("matnr", matnr));
+            //return this.update(agvLocDetl,wrapper);
             //return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0;
+            return this.baseMapper.updateAnfme(locNo,anfme,matnr,batch,csocode,isocode) > 0;
         }
     }
 
@@ -157,9 +166,46 @@
 
     private void wapperSetCondition(Wrapper wrapper,String column, String condition){
         if(Cools.isEmpty(condition)){
-            wrapper.isNull(column);
+            wrapper.andNew().eq(column,"").or().isNull(column);
+            //wrapper.isNull(column);
         }else {
             wrapper.eq(column,condition);
         }
     }
+
+    public AgvLocDetl selectByLocNo(String locNo){
+        return this.selectOne(new EntityWrapper<AgvLocDetl>().eq("loc_no",locNo));
+    }
+
+    @Override
+    public List<AgvLocDetl> selectByTaskDto(TaskDto taskDto) {
+        List<AgvLocDetl> agvLocDetls = new ArrayList<>();
+
+        taskDto.getLocDtos().forEach(locDto -> {
+            AgvLocDetl agvLocDetl = this.selectByMatnrAndBatchAndCsocodeAndisoCode(locDto.getLocNo(),locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
+            //AgvLocDetl agvLocDetl = this.selectLocdetl(locDto.getLocNo(),locDto.getMatnr(),locDto.getBatch(),locDto.getCsocode(),locDto.getIsoseq());
+            agvLocDetls.add(agvLocDetl);
+        });
+        return agvLocDetls;
+    }
+
+    @Override
+    public AgvLocDetl selectByMatnrAndBatchAndCsocodeAndisoCode(String locNo, String matnr, String batch, String csocode, String isocode) {
+        EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
+        wrapper.eq("loc_no",locNo);
+        Utils.confirmOnlyMat(wrapper,matnr,batch,csocode,isocode);
+        return this.selectOne(wrapper);
+    }
+
+    @Override
+    public Double selectSumAnfmeByLocNo(String locNo) {
+        return this.baseMapper.sumByLocNo(locNo);
+    }
+
+    @Override
+    public AgvLocDetl selectLocdetl(String locNo, String matnr, String batch, String csocode, String isocode) {
+        return this.baseMapper.selectLocdetl(locNo,matnr,batch,csocode,isocode);
+    }
+
+
 }

--
Gitblit v1.9.1