From 012f80529db9aa5065f51bde3fd65ff1ffe9eb61 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 08:23:10 +0800
Subject: [PATCH] bug修复

---
 src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java |   61 +++++++++++++++++++++++++++---
 1 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
index 80f23d4..c87188c 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -2,8 +2,10 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.core.common.Cools;
+import com.core.exception.CoolException;
 import com.zy.asrs.entity.OrderDetl;
 import com.zy.asrs.entity.Pla;
 import com.zy.asrs.entity.PlaQty;
@@ -26,8 +28,8 @@
     @Autowired
     private PlaQtyService plaQtyService;
 
-    public Pla selectByBatchAndPackageNo(String batch, String packageNo) {
-        return this.selectOne(new EntityWrapper<Pla>().eq("batch",batch).eq("package_no",packageNo));
+    public Pla selectByBatchAndPackageNo(String batch, Integer packageNo, String brand) {
+        return this.selectOne(new EntityWrapper<Pla>().eq("batch",batch).eq("package_no",packageNo).eq("brand",brand));
     }
 
     @Override
@@ -64,7 +66,7 @@
             }
             //闇�瑕佸噺鍘绘娆″嚭搴撻瑙堝叾浠栬鍗曢渶鍑哄簱鐨勬暟閲�
             for (PlaQty plaQty : plaQties){
-                if(Cools.eq(plaQty.getBatch(),pla.getBatch()) && Cools.eq(plaQty.getPackageNo(),pla.getPackageNo())){
+                if(Cools.eq(plaQty.getBatch(),pla.getBatch()) && plaQty.getPackageNo() == pla.getPackageNo()){
                     weightAnfme -= plaQty.getQtyAnfme();
                 }
             }
@@ -83,7 +85,7 @@
         }
 
         if(anfme > 0){
-            PlaQty plaQty = new PlaQty(orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getId(),orderDetl.getOrderId(),orderDetl.getOrderNo(),anfme,null,new Date());
+            PlaQty plaQty = new PlaQty(orderDetl.getBatch(),Integer.parseInt(orderDetl.getBrand()),orderDetl.getId(),orderDetl.getOrderId(),orderDetl.getOrderNo(),anfme,null,new Date());
             plaQties.add(plaQty);
         }
 
@@ -115,15 +117,60 @@
             plaQtyService.insert(plaQtyReturned);
 
             //鐩存帴鏇存柊pla鐨勫簱瀛�
-            Pla pla = this.selectByBatchAndPackageNo(plaQty.getBatch(), plaQty.getPackageNo());
+            Pla pla = this.selectByBatchAndPackageNo(plaQty.getBatch(), plaQty.getPackageNo(),plaQty.getBrand());
             //pla.setStatus(GlobleParameter.PLA_STATUS_0);
+            pla.setModifyTime(new Date());
 
-            pla.setWeightAnfme(plaQty.getOrderWeight());
+            pla.setWeightAnfme(pla.getWeightAnfme() + plaQty.getOrderWeight());
             pla.setStatus(GlobleParameter.PLA_STATUS_1);
             this.updateById(pla);
 
-            SaasUtils.insertLog(0,pla.getLocNo(),pla.getBatch()+","+pla.getPackageNo(),plaQty.getOrderWeight(),user.getUsername());
+            SaasUtils.insertLog(0,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),
+                    null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
 
         });
     }
+
+    @Override
+    @Transactional
+    public void viladate(List<Pla> plas, User user) {
+        plas.forEach(pla -> {
+            if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_00)){
+               throw new CoolException("閫変腑鐨勬暟鎹笉鏄殏鍏ュ簱鐘舵�侊紝璇锋牳瀵圭姸鎬�");
+            }
+            pla = this.selectById(pla.getId());
+            pla.setModifyTime(new Date());
+            pla.setStatus(GlobleParameter.PLA_STATUS_0);
+            this.updateById(pla);
+        });
+    }
+
+    @Override
+    public List<Pla> selectToHistory() {
+        return this.selectList(new EntityWrapper<Pla>().eq("status",GlobleParameter.PLA_STATUS_4));
+    }
+
+    @Override
+    public Page<Pla> getStockStatisAll(Page<Pla> page) {
+
+        List<Pla> plaList;
+        if(Cools.isEmpty(page.getCondition().get("brand"))){
+            plaList=baseMapper.getStockStatisAll();
+        }else {
+            plaList = baseMapper.getStockStatisAllByBrand(page.getCondition().get("brand").toString());
+        }
+
+        double weightSum = plaList.stream().mapToDouble(Pla::getWeight).sum();
+
+        // 鏈�鍚庝竴鏉¤褰曚粎渚涘悎璁￠噸閲忎俊鎭睍绀�
+        Pla pla = new Pla();
+        pla.setBrand("鍚堣");
+        pla.setMatnr("");
+        pla.setWeight(weightSum);
+        plaList.add(pla);
+
+        page.setRecords(plaList);
+        page.setTotal(0);
+        return page;
+    }
 }

--
Gitblit v1.9.1