From 391dd89a6583e0f1eceaf1297fd852e3da32bf68 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 17 四月 2025 16:39:30 +0800
Subject: [PATCH] 出库作业里面显示冻结/未冻结

---
 src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 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 6aa415c..9eb8ebe 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -30,7 +30,7 @@
     private PlaQtyService plaQtyService;
 
     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).eq(false,"status","鍏ㄩ儴鍑哄簱"));
+        return this.selectOne(new EntityWrapper<Pla>().eq("batch",batch).eq("package_no",packageNo).eq("brand",brand));
     }
 
     @Override
@@ -125,11 +125,18 @@
             //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(),
+            SaasUtils.insertLog(4,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),
                     null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
 
         });
@@ -163,13 +170,17 @@
         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);
+        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();
 

--
Gitblit v1.9.1