From 64dbf42de49ecc047f2fce08eba71e18401324d8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 28 二月 2024 16:27:27 +0800
Subject: [PATCH] 新增库存明细重量统计，完善出入库日志记录
---
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 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 55d65d0..f90e61a 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -2,6 +2,7 @@
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;
@@ -27,7 +28,7 @@
@Autowired
private PlaQtyService plaQtyService;
- public Pla selectByBatchAndPackageNo(String batch, String packageNo) {
+ public Pla selectByBatchAndPackageNo(String batch, Integer packageNo) {
return this.selectOne(new EntityWrapper<Pla>().eq("batch",batch).eq("package_no",packageNo));
}
@@ -65,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();
}
}
@@ -84,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);
}
@@ -118,12 +119,14 @@
//鐩存帴鏇存柊pla鐨勫簱瀛�
Pla pla = this.selectByBatchAndPackageNo(plaQty.getBatch(), plaQty.getPackageNo());
//pla.setStatus(GlobleParameter.PLA_STATUS_0);
+ pla.setModifyTime(new Date());
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());
});
}
@@ -136,8 +139,38 @@
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