From e0004817f2edb903fd9707b194ba8db2429e33ae Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 04 三月 2024 13:46:57 +0800
Subject: [PATCH] 入出库日志筛选 入库无需校验
---
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 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 85be991..f90e61a 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -125,7 +125,8 @@
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(0,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
});
}
@@ -152,12 +153,23 @@
@Override
public Page<Pla> getStockStatisAll(Page<Pla> page) {
+ List<Pla> plaList;
if(Cools.isEmpty(page.getCondition().get("brand"))){
- page.setRecords(baseMapper.getStockStatisAll());
+ plaList=baseMapper.getStockStatisAll();
}else {
- page.setRecords(baseMapper.getStockStatisAllByBrand(page.getCondition().get("brand").toString()));
+ 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