From af11d4845251da536d564a82fa019b4306875da9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 29 五月 2021 14:48:54 +0800
Subject: [PATCH] Merge branch 'htwms' of https://gitee.com/luxiaotao1123/wms-cloud into htwms

---
 src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java |   62 ++++++++++++++++++------------
 1 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
index 5a1277b..8b51c74 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java
@@ -7,26 +7,24 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import zy.cloud.wms.common.config.CodeCoolException;
-import zy.cloud.wms.manager.entity.CustOrder;
+import zy.cloud.wms.common.model.MatnrDto;
 import zy.cloud.wms.manager.entity.LocDetl;
 import zy.cloud.wms.manager.entity.Mat;
 import zy.cloud.wms.manager.entity.Prior;
 import zy.cloud.wms.manager.entity.param.StockTransferParam;
 import zy.cloud.wms.manager.mapper.LocDetlMapper;
-import zy.cloud.wms.manager.service.CustOrderService;
 import zy.cloud.wms.manager.service.LocDetlService;
 import zy.cloud.wms.manager.service.MatService;
 import zy.cloud.wms.manager.service.PriorService;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service("locDetlService")
 public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
 
-    @Autowired
-    private CustOrderService custOrderService;
     @Autowired
     private MatService matService;
     @Autowired
@@ -62,21 +60,17 @@
     }
 
     @Override
-    public void checkLocDetlCount(String number) {
-        List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("number", number).eq("status", 1));
+    public void checkLocDetlCount(List<MatnrDto> dtos) {
         StringBuilder errorMsg = new StringBuilder();
         boolean error = false;
-        for (CustOrder custOrder : custOrders) {
-            Double count = this.baseMapper.selectCountByMatnr(custOrder.getUserCode());
-            if (count == null) {
-                count = 0.0D;
-            }
-            if (count < custOrder.getQty()) {
+        for (MatnrDto dto : dtos) {
+            Double count = Optional.ofNullable(baseMapper.selectCountByMatnr(dto.getMatnr())).orElse(0.0D);
+            if (count < dto.getCount()) {
                 if (!error) {
                     error = true;
                 }
-                Mat mat = matService.selectByMatnr(custOrder.getUserCode());
-                errorMsg.append(mat == null ? custOrder.getUserCode() : mat.getMaktx()).append("搴撳瓨涓嶈冻锛岀己璐ф暟閲忥細").append(custOrder.getQty() - count).append("</br>");
+                Mat mat = matService.selectByMatnr(dto.getMatnr());
+                errorMsg.append(mat == null ? dto.getMatnr() : mat.getMaktx()).append("搴撳瓨涓嶈冻锛岀己璐ф暟閲忥細").append(dto.getCount() - count).append("</br>");
             }
         }
         if (error) {
@@ -85,21 +79,17 @@
     }
 
     @Override
-    public List<StockTransferParam> checkLocDetlCountOfRes(String number) {
-        List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("number", number).eq("status", 1));
+    public List<StockTransferParam> checkLocDetlCountOfRes(List<MatnrDto> dtos) {
         boolean asrs = false;
         List<StockTransferParam> params = new ArrayList<>();
-        for (CustOrder custOrder : custOrders) {
-            Double count = this.baseMapper.selectCountByMatnr(custOrder.getUserCode());
-            if (count == null) {
-                count = 0.0D;
-            }
-            if (count < custOrder.getQty()) {
+        for (MatnrDto dto : dtos) {
+            Double count = Optional.ofNullable(baseMapper.selectCountByMatnr(dto.getMatnr())).orElse(0.0D);
+            if (count < dto.getCount()) {
                 if (!asrs) { asrs = true; }
                 StockTransferParam param = new StockTransferParam();
-                param.setMatnr(custOrder.getUserCode());
-                param.setAnfme(custOrder.getQty() - count);
-                param.setTotal(custOrder.getQty());
+                param.setMatnr(dto.getMatnr());
+                param.setAnfme(dto.getCount() - count);
+                param.setTotal(dto.getCount());
                 params.add(param);
             }
         }
@@ -136,5 +126,27 @@
         return this.baseMapper.selectCountByMatnr(matnr);
     }
 
+    @Override
+    public List<LocDetl> findByNodeUuid(String uuid) {
+        return this.baseMapper.selectByNodeUuid(uuid);
+    }
+
+    @Override
+    public Page<LocDetl> getStockStatis(Page<LocDetl> page) {
+        page.setRecords(baseMapper.getStockStatis(page.getCondition()));
+        page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
+        return page;
+    }
+
+    @Override
+    public List<LocDetl> getStockStatisExcel() {
+        return this.baseMapper.getStockStatisExcel();
+    }
+
+    @Override
+    public Double getStockByDocType34(String matnr) {
+        return this.baseMapper.getStockByDocType34(matnr);
+    }
+
 
 }

--
Gitblit v1.9.1