From 7ad79ee463adbdbc51e37c12ae025fb8598ab670 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 14:25:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 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 d87ab5a..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,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,8 +28,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
@@ -116,7 +117,7 @@
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());
@@ -124,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());
});
}
@@ -147,4 +149,28 @@
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