From c0a718538ba8661f235d524ed335cbf7b1919962 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 23 十月 2025 14:29:33 +0800
Subject: [PATCH] 出库导出excel

---
 src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 54 insertions(+), 6 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 d87ab5a..9eb8ebe 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.common.DateUtils;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.OrderDetl;
 import com.zy.asrs.entity.Pla;
@@ -27,8 +29,8 @@
     @Autowired
     private PlaQtyService plaQtyService;
 
-    public Pla selectByBatchAndPackageNo(String batch, Integer 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
@@ -91,13 +93,15 @@
     }
 
     //閫�鍥�
+    @Transactional
     public void returned(List<PlaQty> plaQties, User user) {
         plaQties.forEach(plaQty -> {
             PlaQty plaQtyOut = plaQtyService.selectById(plaQty.getId());
-            if(Cools.isEmpty(plaQtyOut.getReturned())){
+            if(Cools.isEmpty(plaQtyOut.getReturned()) || plaQtyOut.getReturned() == 0){
                 plaQtyOut.setReturned(plaQty.getOrderWeight());
             }else {
-                plaQtyOut.setReturned(plaQty.getOrderWeight()+plaQtyOut.getReturned());
+                throw new CoolException("璇ュ寘鐗╂枡宸查��鍥�");
+                //plaQtyOut.setReturned(plaQty.getOrderWeight()+plaQtyOut.getReturned());
             }
             plaQtyService.updateById(plaQtyOut);
 
@@ -108,6 +112,7 @@
             plaQtyReturned.setLocNo(plaQtyOut.getLocNo());
             plaQtyReturned.setOrderNo(plaQtyOut.getOrderNo());
             plaQtyReturned.setPakoutTime(Utils.getDateStr(new Date()));
+            plaQtyReturned.setBrand(plaQty.getBrand());
             plaQtyReturned.setOrderWeight(plaQty.getOrderWeight());
             plaQtyReturned.setTransfer("閫�鍥炲叆搴�");
             plaQtyReturned.setHandlerBy(user.getUsername());
@@ -116,15 +121,23 @@
             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());
+
+            // 閫�璐т汉 modify_user锛岄��璐у娉� create_user锛岄��璐ф爣璇� transfer
+            pla.setModifyUser(user.getUsername());
+            pla.setCreateUser(plaQty.getMemo());
+            pla.setTransfer("閫�璐�");
+            pla.setStash(""); // 搴撳尯
+            pla.setLocNo(""); // 搴撲綅
 
             pla.setWeightAnfme(pla.getWeightAnfme() + plaQty.getOrderWeight());
             pla.setStatus(GlobleParameter.PLA_STATUS_1);
             this.updateById(pla);
 
-            SaasUtils.insertLog(0,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),null,pla.getBatch(),pla.getPackageNo());
+            SaasUtils.insertLog(4,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),
+                    null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
 
         });
     }
@@ -147,4 +160,39 @@
     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;
+        Date stime = null;
+        Date etime = null;
+        Object create_time = page.getCondition().get("create_time");
+        Object brand = page.getCondition().get("brand");
+        Object status = page.getCondition().get("status");
+        String type = (String) page.getCondition().get("type");
+        String workshop = (String) page.getCondition().get("workshop");
+        String transfer = (String) page.getCondition().get("transfer");
+
+        String createTime = create_time == null ? null : create_time.toString();
+        if(!Cools.isEmpty(createTime)){
+            String[] dates = createTime.split(" - ");
+            stime = DateUtils.convert(dates[0]);
+            etime = DateUtils.convert(dates[1]);
+        }
+        plaList=baseMapper.getStockStatisAll(brand == null ? null:brand.toString(), status == null ? null:status.toString(),  stime,etime, type, workshop, transfer);
+
+        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