From 17d65c77c6fedf1b51afec166c5a9735c6e4d38e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 26 一月 2026 16:48:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 285 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 198 insertions(+), 87 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
index 4bfa4b8..501ef1a 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -1,11 +1,14 @@
package com.ruoyi.procurementrecord.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.basic.service.IProductModelService;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -54,19 +57,21 @@
private final StockUtils stockUtils;
private final ProductModelMapper productModelMapper;
+ private final IProductModelService productModelService;
+
@Override
public List<ProcurementDto> listProcurementBySalesLedgerId(ProcurementDto procurementDto) {
List<ProcurementDto> procurementDtos = procurementRecordMapper.listProcurementBySalesLedgerId(procurementDto);
// 璁＄畻寰呭叆搴撴暟閲�
// 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
List<Integer> collect = procurementDtos.stream().map(ProcurementDto::getId).collect(Collectors.toList());
- if(CollectionUtils.isEmpty( collect)){
+ if (CollectionUtils.isEmpty(collect)) {
return procurementDtos;
}
LambdaQueryWrapper<ProcurementRecordStorage> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordLambdaQueryWrapper.in(ProcurementRecordStorage::getSalesLedgerProductId, collect);
List<ProcurementRecordStorage> procurementRecordStorages = procurementRecordMapper.selectList(procurementRecordLambdaQueryWrapper);
- if(CollectionUtils.isEmpty(procurementRecordStorages)){
+ if (CollectionUtils.isEmpty(procurementRecordStorages)) {
return procurementDtos;
}
for (ProcurementDto dto : procurementDtos) {
@@ -74,35 +79,35 @@
List<ProcurementRecordStorage> collect1 = procurementRecordStorages.stream()
.filter(procurementRecordStorage -> procurementRecordStorage.getSalesLedgerProductId().equals(dto.getId()))
.collect(Collectors.toList());
-
+
// 濡傛灉娌℃湁鐩稿叧鐨勫叆搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setQuantity0(dto.getQuantity());
continue;
}
-
+
// 璁＄畻宸插叆搴撴暟閲忔�诲拰锛屽苟璁剧疆寰呭叆搴撴暟閲�
BigDecimal totalInboundNum = collect1.stream()
.map(ProcurementRecordStorage::getInboundNum)
.reduce(BigDecimal.ZERO, BigDecimal::add);
-
+
// 寰呭叆搴撴暟閲� = 鎬绘暟閲� - 宸插叆搴撴暟閲�
dto.setQuantity0(dto.getQuantity().subtract(totalInboundNum));
}
return procurementDtos;
}
- public ProcurementRecordStorage getProcurementRecordById(Integer id){
+ public ProcurementRecordStorage getProcurementRecordById(Integer id) {
ProcurementRecordStorage procurementRecordStorage = procurementRecordMapper.selectById(id);
- if(procurementRecordStorage == null) {
+ if (procurementRecordStorage == null) {
throw new RuntimeException("鏈壘鍒拌閲囪喘鍏ュ簱璁板綍");
}
return procurementRecordStorage;
}
- public List<ProcurementRecordStorage> getProcurementRecordByIds(List<Integer> id){
+ public List<ProcurementRecordStorage> getProcurementRecordByIds(List<Integer> id) {
List<ProcurementRecordStorage> procurementRecordStorage = procurementRecordMapper.selectBatchIds(id);
- if(procurementRecordStorage == null) {
+ if (procurementRecordStorage == null) {
throw new RuntimeException("鏈壘鍒拌閲囪喘鍏ュ簱璁板綍");
}
return procurementRecordStorage;
@@ -127,26 +132,26 @@
// 鍒犻櫎鎵�鏈夊搴旂殑鍑哄簱璁板綍
LambdaQueryWrapper<ProcurementRecordOut> procurementRecordOutLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordOutLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, procurementDto.getIds())
- .eq(ProcurementRecordOut::getType,procurementDto.getType());
+ .eq(ProcurementRecordOut::getType, procurementDto.getType());
List<ProcurementRecordOut> procurementRecordOuts = procurementRecordOutMapper.selectList(procurementRecordOutLambdaQueryWrapper);
- if(!CollectionUtils.isEmpty(procurementRecordOuts)){
+ if (!CollectionUtils.isEmpty(procurementRecordOuts)) {
procurementRecordOutMapper.deleteBatchIds(procurementRecordOuts.stream().map(ProcurementRecordOut::getId).collect(Collectors.toList()));
}
return 0;
}
@Override
- public void export(HttpServletResponse response,Integer type) {
+ public void export(HttpServletResponse response, Integer type) {
List<ProcurementPageDto> list = new ArrayList<>();
- if(type == 1){
+ if (type == 1) {
list = procurementRecordMapper.list();
- }else{
+ } else {
list = procurementRecordMapper.listOne();
}
// 璁＄畻寰呭叆搴撴暟閲�
// 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
List<Integer> collect = list.stream().map(ProcurementPageDto::getId).collect(Collectors.toList());
- if(CollectionUtils.isEmpty( collect)){
+ if (CollectionUtils.isEmpty(collect)) {
ExcelUtil<ProcurementPageDto> util = new ExcelUtil<ProcurementPageDto>(ProcurementPageDto.class);
util.exportExcel(response, list, "鍏ュ簱鍙拌处");
return;
@@ -155,7 +160,7 @@
procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect);
procurementRecordLambdaQueryWrapper.eq(ProcurementRecordOut::getType, type);
List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
- if(CollectionUtils.isEmpty( procurementRecords)){
+ if (CollectionUtils.isEmpty(procurementRecords)) {
ExcelUtil<ProcurementPageDto> util = new ExcelUtil<ProcurementPageDto>(ProcurementPageDto.class);
util.exportExcel(response, list, "鍏ュ簱鍙拌处");
return;
@@ -167,7 +172,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
continue;
}
@@ -190,14 +195,14 @@
public int updateManagement(ProcurementManagementUpdateDto procurementDto) {
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser sysUser = sysUserMapper.selectUserById(procurementDto.getCreateUser());
- if(sysUser == null){
+ if (sysUser == null) {
throw new RuntimeException("鍏ュ簱浜轰笉瀛樺湪");
}
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String entryDateStr = procurementDto.getEntryDate() + " 00:00:00";
String createTimeStr = procurementDto.getCreateTime() + " 00:00:00";
SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(procurementDto.getSalesLedgerProductId());
- if(salesLedgerProduct == null){
+ if (salesLedgerProduct == null) {
throw new RuntimeException("閿�鍞彴璐︿骇鍝佷笉瀛樺湪");
}
// 鏍规嵁澶х被锛岃鏍兼煡璇㈡墍鏈変骇鍝乮d
@@ -206,7 +211,7 @@
.eq(SalesLedgerProduct::getSpecificationModel, salesLedgerProduct.getSpecificationModel())
.eq(SalesLedgerProduct::getType, 1);
List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(salesLedgerProductLambdaQueryWrapper);
- if(CollectionUtils.isEmpty(salesLedgerProducts)){
+ if (CollectionUtils.isEmpty(salesLedgerProducts)) {
throw new RuntimeException("娌℃湁鎵惧埌瀵瑰簲鐨勪骇鍝�");
}
salesLedgerProduct.setMinStock(procurementDto.getMinStock());
@@ -218,25 +223,25 @@
procurementRecordStorage.setTotalPrice(procurementDto.getTotalPrice());
procurementRecordStorage.setCreateBy(sysUser.getNickName());
procurementRecordStorage.setCreateUser(sysUser.getUserId());
- procurementRecordStorage.setUpdateTime(LocalDateTime.parse(entryDateStr,df));
+ procurementRecordStorage.setUpdateTime(LocalDateTime.parse(entryDateStr, df));
procurementRecordStorage.setUpdateUser(loginUser.getUserId());
- procurementRecordStorage.setCreateTime(LocalDateTime.parse(createTimeStr,df));
- procurementRecordMapper.update(procurementRecordStorage,procurementRecordStorageLambdaQueryWrapper);
+ procurementRecordStorage.setCreateTime(LocalDateTime.parse(createTimeStr, df));
+ procurementRecordMapper.update(procurementRecordStorage, procurementRecordStorageLambdaQueryWrapper);
return 0;
}
@Override
- public void exportCopy(HttpServletResponse response,Integer type) {
+ public void exportCopy(HttpServletResponse response, Integer type) {
List<ProcurementPageDtoCopy> list = new ArrayList<>();
- if(type == 1){
+ if (type == 1) {
list = procurementRecordMapper.listCopy();
- }else{
+ } else {
list = procurementRecordMapper.listCopyOne();
}
// 璁＄畻寰呭叆搴撴暟閲�
// 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
List<Integer> collect = list.stream().map(ProcurementPageDtoCopy::getId).collect(Collectors.toList());
- if(CollectionUtils.isEmpty( collect)){
+ if (CollectionUtils.isEmpty(collect)) {
ExcelUtil<ProcurementPageDtoCopy> util = new ExcelUtil<ProcurementPageDtoCopy>(ProcurementPageDtoCopy.class);
util.exportExcel(response, list, "搴撳瓨绠＄悊");
return;
@@ -245,7 +250,7 @@
procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect);
procurementRecordLambdaQueryWrapper.eq(ProcurementRecordOut::getType, type);
List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
- if(CollectionUtils.isEmpty( procurementRecords)){
+ if (CollectionUtils.isEmpty(procurementRecords)) {
ExcelUtil<ProcurementPageDtoCopy> util = new ExcelUtil<ProcurementPageDtoCopy>(ProcurementPageDtoCopy.class);
util.exportExcel(response, list, "搴撳瓨绠＄悊");
return;
@@ -257,7 +262,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
continue;
}
@@ -275,14 +280,14 @@
}
@Override
- public void exportCopyTwo(HttpServletResponse response,Integer type) {
+ public void exportCopyTwo(HttpServletResponse response, Integer type) {
LambdaQueryWrapper<CustomStorage> customStorageLambdaQueryWrapper = new LambdaQueryWrapper<>();
customStorageLambdaQueryWrapper.groupBy(CustomStorage::getSupplierName, CustomStorage::getProductCategory, CustomStorage::getSpecificationModel);
List<CustomStorage> list = customStorageMapper.selectList(customStorageLambdaQueryWrapper);
// 璁＄畻寰呭叆搴撴暟閲�
// 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
List<Integer> collect = list.stream().map(CustomStorage::getId).collect(Collectors.toList());
- if(CollectionUtils.isEmpty( collect)){
+ if (CollectionUtils.isEmpty(collect)) {
ExcelUtil<CustomStorage> util = new ExcelUtil<CustomStorage>(CustomStorage.class);
util.exportExcel(response, list, "搴撳瓨绠＄悊");
return;
@@ -292,7 +297,7 @@
procurementRecordLambdaQueryWrapper.eq(ProcurementRecordOut::getType, type);
procurementRecordLambdaQueryWrapper.eq(ProcurementRecordOut::getType, type);
List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
- if(CollectionUtils.isEmpty( procurementRecords)){
+ if (CollectionUtils.isEmpty(procurementRecords)) {
ExcelUtil<CustomStorage> util = new ExcelUtil<CustomStorage>(CustomStorage.class);
util.exportExcel(response, list, "搴撳瓨绠＄悊");
return;
@@ -304,7 +309,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
continue;
}
@@ -334,19 +339,19 @@
reportData.put("tableData", procurementPageDtoCopyList);
// 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
List<Integer> collect = procurementPageDtoCopyList.stream().map(ProcurementPageDtoCopy::getId).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(collect)){
- return reportData;
+ if (CollectionUtils.isEmpty(collect)) {
+ return reportData;
}
LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect);
List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
- if(CollectionUtils.isEmpty( procurementRecords)){
- return reportData;
+ if (CollectionUtils.isEmpty(procurementRecords)) {
+ return reportData;
}
- int totalIn =0;
- int totalOut =0;
- int currentStock =0;
- int turnoverRate =0;
+ int totalIn = 0;
+ int totalOut = 0;
+ int currentStock = 0;
+ int turnoverRate = 0;
List<String> dates = new ArrayList<>();
List<Integer> values = new ArrayList<>();
List<String> comparisonDates = new ArrayList<>();
@@ -364,7 +369,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
continue;
}
@@ -387,7 +392,7 @@
currentStock += dto.getInboundNum().intValue() - totalInboundNum.intValue();
values.add(currentStock);
// 璁＄畻鍛ㄨ浆鐜�
- if(totalIn > 0){
+ if (totalIn > 0) {
turnoverRate = totalOut * 100 / totalIn;
}
}
@@ -423,7 +428,7 @@
public InventoryInformationDto getReportList() {
InventoryInformationDto inventoryInformationDto = new InventoryInformationDto();
IPage<ProcurementPageDto> procurementPageDtoIPage = this.listPage(new Page<>(1, -1), new ProcurementPageDto());
- if(CollectionUtils.isEmpty(procurementPageDtoIPage.getRecords())){
+ if (CollectionUtils.isEmpty(procurementPageDtoIPage.getRecords())) {
return inventoryInformationDto;
}
// 璁＄畻鎬诲簱瀛樻暟閲�
@@ -481,6 +486,7 @@
inventoryInformationDto.setInventoryChangeValue(inventoryChangeValue.subtract(totalInventoryValue));
return inventoryInformationDto;
}
+
@Override
public IPage<ProcurementPageDto> listPageByProduction(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDto> procurementPageDtoIPage = procurementRecordMapper.listPageByProduction(page, procurementDto);
@@ -488,14 +494,14 @@
// 璁＄畻寰呭叆搴撴暟閲�
// 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
List<Integer> collect = procurementPageDtos.stream().map(ProcurementPageDto::getId).collect(Collectors.toList());
- if(CollectionUtils.isEmpty( collect)){
+ if (CollectionUtils.isEmpty(collect)) {
return procurementPageDtoIPage;
}
LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect)
- .eq(ProcurementRecordOut::getType,2);
+ .eq(ProcurementRecordOut::getType, 2);
List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
- if(CollectionUtils.isEmpty( procurementRecords)){
+ if (CollectionUtils.isEmpty(procurementRecords)) {
return procurementPageDtoIPage;
}
for (ProcurementPageDto dto : procurementPageDtos) {
@@ -505,7 +511,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
continue;
}
@@ -526,13 +532,13 @@
@Override
public AjaxResult addCustom(List<CustomStorage> customStorage) {
LoginUser loginUser = SecurityUtils.getLoginUser();
- if(CollectionUtils.isEmpty(customStorage)){
+ if (CollectionUtils.isEmpty(customStorage)) {
return AjaxResult.error("鏁版嵁涓嶈兘涓虹┖");
}
customStorage.forEach(item -> {
// 鏌ヨ閲囪喘鍏ュ簱鏁伴噺
Long aLong = customStorageMapper.selectCount(null);
- item.setInboundBatches(aLong.equals(0L) ? "绗�1鎵规(鑷畾涔夊叆搴�)" : "绗�"+ (aLong + 1) + "鎵规(鑷畾涔夊叆搴�)" );
+ item.setInboundBatches(aLong.equals(0L) ? "绗�1鎵规(鑷畾涔夊叆搴�)" : "绗�" + (aLong + 1) + "鎵规(鑷畾涔夊叆搴�)");
item.setCreateBy(loginUser.getNickName());
item.setCode(OrderUtils.countTodayByCreateTime(customStorageMapper, ""));
customStorageMapper.insert(item);
@@ -543,15 +549,15 @@
@Override
public IPage<CustomStorage> listPageByCustom(Page page, CustomStorage customStorage) {
LambdaQueryWrapper<CustomStorage> customStorageLambdaQueryWrapper = new LambdaQueryWrapper<>();
- if(customStorage != null){
- if(!StringUtils.isEmpty(customStorage.getSupplierName())){
+ if (customStorage != null) {
+ if (!StringUtils.isEmpty(customStorage.getSupplierName())) {
customStorageLambdaQueryWrapper.like(CustomStorage::getSupplierName, customStorage.getSupplierName());
}
// 绛涢�夊叆搴撴椂闂�
- if(customStorage.getTimeStr() != null){
+ if (customStorage.getTimeStr() != null) {
customStorageLambdaQueryWrapper.eq(CustomStorage::getInboundDate, customStorage.getTimeStr());
}
- if(!StringUtils.isEmpty(customStorage.getProductCategory())){
+ if (!StringUtils.isEmpty(customStorage.getProductCategory())) {
customStorageLambdaQueryWrapper.like(CustomStorage::getProductCategory, customStorage.getProductCategory());
}
}
@@ -562,14 +568,14 @@
// 璁＄畻寰呭叆搴撴暟閲�
// 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
List<Integer> collect = procurementPageDtos.stream().map(CustomStorage::getId).collect(Collectors.toList());
- if(CollectionUtils.isEmpty( collect)){
+ if (CollectionUtils.isEmpty(collect)) {
return procurementPageDtoIPage;
}
LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect)
.eq(ProcurementRecordOut::getType, 3);
List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
- if(CollectionUtils.isEmpty( procurementRecords)){
+ if (CollectionUtils.isEmpty(procurementRecords)) {
return procurementPageDtoIPage;
}
for (CustomStorage dto : procurementPageDtos) {
@@ -579,7 +585,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
continue;
}
@@ -602,7 +608,7 @@
// 璁＄畻寰呭叆搴撴暟閲�
// 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
List<Integer> collect = procurementPageDtoCopyList.stream().map(ProcurementPageDtoCopy::getId).collect(Collectors.toList());
- if(CollectionUtils.isEmpty( collect)){
+ if (CollectionUtils.isEmpty(collect)) {
return procurementPageDtoCopyIPage;
}
// 1. 鏌ヨ閲囪喘璁板綍宸插叆搴撶殑鍑哄簱璁板綍锛堟寜storageId鍒嗙粍锛�
@@ -611,7 +617,7 @@
List<ProcurementRecordOut> recordOutList = procurementRecordOutMapper.selectList(queryWrapper);
// 2. 鎸塖alesLedgerProductId鍒嗙粍锛岀粺璁℃瘡涓猧d瀵瑰簲鐨勫凡鍑哄簱鏁伴噺鎬诲拰-宸插嚭搴撴暟閲�
- Map<Integer, BigDecimal> storageIdToTotalOutNumMap = recordOutList.stream()
+ Map<Long, BigDecimal> storageIdToTotalOutNumMap = recordOutList.stream()
.collect(Collectors.groupingBy(
ProcurementRecordOut::getSalesLedgerProductId,
Collectors.reducing(
@@ -674,14 +680,14 @@
// 璁＄畻寰呭叆搴撴暟閲�
// 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
List<Integer> collect = procurementPageDtoCopyList.stream().map(CustomStorage::getId).collect(Collectors.toList());
- if(CollectionUtils.isEmpty( collect)){
+ if (CollectionUtils.isEmpty(collect)) {
return pageList;
}
LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect);
procurementRecordLambdaQueryWrapper.eq(ProcurementRecordOut::getType, 3);
List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
- if(CollectionUtils.isEmpty( procurementRecords)){
+ if (CollectionUtils.isEmpty(procurementRecords)) {
return pageList;
}
for (CustomStorage dto : procurementPageDtoCopyList) {
@@ -691,7 +697,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
dto.setTotalInboundNum(BigDecimal.ZERO);
continue;
@@ -706,7 +712,7 @@
// 寰呭嚭搴撴暟閲� = 鎬绘暟閲� - 宸插嚭搴撴暟閲�
dto.setInboundNum0(dto.getInboundNum().subtract(totalInboundNum));
// 搴撳瓨浠峰��
- if(dto.getTaxInclusiveUnitPrice() != null){
+ if (dto.getTaxInclusiveUnitPrice() != null) {
dto.setTaxInclusiveTotalPrice(dto.getInboundNum0().multiply(dto.getTaxInclusiveUnitPrice()));
}
}
@@ -727,7 +733,7 @@
@Override
public int updateManagementByCustom(ProcurementManagementUpdateDto procurementDto) {
CustomStorage customStorage = customStorageMapper.selectById(procurementDto.getId());
- if(customStorage == null){
+ if (customStorage == null) {
throw new RuntimeException("鏉愭枡搴撳瓨涓嶅瓨鍦�");
}
LambdaQueryWrapper<CustomStorage> customStorageLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -736,7 +742,7 @@
CustomStorage one = new CustomStorage();
one.setTaxInclusiveUnitPrice(procurementDto.getTaxInclusiveUnitPrice());
one.setTaxInclusiveTotalPrice(procurementDto.getTaxInclusiveTotalPrice());
- return customStorageMapper.update(one,customStorageLambdaQueryWrapper);
+ return customStorageMapper.update(one, customStorageLambdaQueryWrapper);
}
@Override
@@ -745,7 +751,7 @@
procurementRecordStorageLambdaQueryWrapper.eq(ProcurementRecordStorage::getSalesLedgerProductId, salesProductId)
.eq(ProcurementRecordStorage::getType, 2);
List<ProcurementRecordStorage> procurementRecordStorages = procurementRecordMapper.selectList(procurementRecordStorageLambdaQueryWrapper);
- if(CollectionUtils.isEmpty( procurementRecordStorages)){
+ if (CollectionUtils.isEmpty(procurementRecordStorages)) {
return BigDecimal.ZERO;
}
return procurementRecordStorages.stream()
@@ -763,10 +769,13 @@
procurementRecordLambdaQueryWrapper.eq(ProcurementRecordStorage::getSalesLedgerProductId, detail.getId())
.eq(ProcurementRecordStorage::getType, procurementDto.getType());
Long aLong = procurementRecordMapper.selectCount(procurementRecordLambdaQueryWrapper);
-
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(detail.getId());
+ if (ObjectUtils.isNull(detail.getProductModelId())) {
+ detail.setProductModelId(salesLedgerProduct.getProductModelId());
+ }
ProcurementRecordStorage.ProcurementRecordStorageBuilder procurementRecordBuilder = ProcurementRecordStorage.builder()
.salesLedgerProductId(detail.getId())
- .inboundBatches(aLong.equals(0L) ? "绗�1鎵规("+ procurementDto.getTypeName() +")" : "绗�"+ (aLong + 1) + "鎵规(" + procurementDto.getTypeName() + ")" )
+ .inboundBatches(aLong.equals(0L) ? "绗�1鎵规(" + procurementDto.getTypeName() + ")" : "绗�" + (aLong + 1) + "鎵规(" + procurementDto.getTypeName() + ")")
.inboundNum(detail.getInboundQuantity())
.type(procurementDto.getType())
.warnNum(detail.getWarnNum())
@@ -777,7 +786,8 @@
.updateTime(LocalDateTime.now())
.updateUser(loginUser.getUserId())
.createBy(procurementDto.getNickName())
- .productModelId(detail.getProductModelId());
+ .productModelId(detail.getProductModelId())
+ .qualityInspectId(ObjectUtils.isNotNull(procurementDto.getQualityInspectId()) ? procurementDto.getQualityInspectId() : 0L);
this.save(procurementRecordBuilder.build());
// 鍏ュ簱鎴愬姛鍑忔帀閲囪喘鏁伴噺
// LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -799,14 +809,14 @@
// 璁＄畻寰呭叆搴撴暟閲�
// 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
List<Integer> collect = procurementPageDtos.stream().map(ProcurementPageDto::getId).collect(Collectors.toList());
- if(CollectionUtils.isEmpty( collect)){
+ if (CollectionUtils.isEmpty(collect)) {
return procurementPageDtoIPage;
}
LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect)
.eq(ProcurementRecordOut::getType, 1);
List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
- if(CollectionUtils.isEmpty( procurementRecords)){
+ if (CollectionUtils.isEmpty(procurementRecords)) {
return procurementPageDtoIPage;
}
for (ProcurementPageDto dto : procurementPageDtos) {
@@ -816,7 +826,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
continue;
}
@@ -839,14 +849,14 @@
// 璁＄畻寰呭叆搴撴暟閲�
// 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
List<Integer> collect = procurementPageDtoCopyList.stream().map(ProcurementPageDtoCopy::getId).collect(Collectors.toList());
- if(CollectionUtils.isEmpty( collect)){
+ if (CollectionUtils.isEmpty(collect)) {
return procurementPageDtoCopyIPage;
}
LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect);
- procurementRecordLambdaQueryWrapper.eq(ProcurementRecordOut::getType,1);
+ procurementRecordLambdaQueryWrapper.eq(ProcurementRecordOut::getType, 1);
List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
- if(CollectionUtils.isEmpty( procurementRecords)){
+ if (CollectionUtils.isEmpty(procurementRecords)) {
return procurementPageDtoCopyIPage;
}
for (ProcurementPageDtoCopy dto : procurementPageDtoCopyList) {
@@ -856,7 +866,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
dto.setTotalInboundNum(BigDecimal.ZERO);
continue;
@@ -871,28 +881,129 @@
// 寰呭嚭搴撴暟閲� = 鎬绘暟閲� - 宸插嚭搴撴暟閲�
dto.setInboundNum0(dto.getInboundNum().subtract(totalInboundNum));
// 搴撳瓨浠峰��
- if(dto.getUnitPrice() != null){
+ if (dto.getUnitPrice() != null) {
dto.setTotalPrice(dto.getInboundNum0().multiply(dto.getUnitPrice()));
}
}
return procurementPageDtoCopyIPage;
}
+
@Override
- public IPage<ProductModel> listPageProductionStock(Page page) {
- ProductModel productModel = new ProductModel();
- IPage<ProductModel> iPage = productModelMapper.listPageProductModel(page, productModel);
- iPage.getRecords().forEach(item -> {
- item.setInboundNum(stockUtils.getStockQuantity(item.getId()).get("inboundNum"));
- item.setOutboundNum(stockUtils.getStockQuantity(item.getId()).get("outboundNum"));
- item.setStockQuantity(stockUtils.getStockQuantity(item.getId()).get("stockQuantity"));
- });
- return iPage;
+ public IPage<ProductModel> listPageProductionStock(Page page, ProcurementPageDto dto) {
+ return productModelMapper.listPageProductionStock(page, dto);
}
@Override
public IPage<ProcurementPageDto> listPageByProductProduction(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDto> procurementPageDtoIPage = procurementRecordMapper.listPageByProductProduction(page, procurementDto);
+
+
+ List<ProcurementPageDto> procurementPageDtos = procurementPageDtoIPage.getRecords();
+ // 璁＄畻寰呭叆搴撴暟閲�
+ // 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
+ List<Integer> collect = procurementPageDtos.stream().map(ProcurementPageDto::getId).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(collect)) {
+ return procurementPageDtoIPage;
+ }
+ LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect)
+ .eq(ProcurementRecordOut::getType, 4);
+ List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
+ if (CollectionUtils.isEmpty(procurementRecords)) {
+ return procurementPageDtoIPage;
+ }
+ for (ProcurementPageDto dto : procurementPageDtos) {
+ // 鏍规嵁閲囪喘鍙拌处ID绛涢�夊搴旂殑鍑哄簱璁板綍
+ List<ProcurementRecordOut> collect1 = procurementRecords.stream()
+ .filter(ProcurementRecordOut -> ProcurementRecordOut.getProcurementRecordStorageId().equals(dto.getId()))
+ .collect(Collectors.toList());
+
+ // 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
+ if (CollectionUtils.isEmpty(collect1)) {
+ dto.setInboundNum0(dto.getInboundNum());
+ continue;
+ }
+
+ // 璁＄畻宸插嚭搴撴暟閲忔�诲拰锛屽苟璁剧疆寰呭嚭搴撴暟閲�
+ BigDecimal totalInboundNum = collect1.stream()
+ .map(ProcurementRecordOut::getInboundNum)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ // 寰呭嚭搴撴暟閲� = 鎬绘暟閲� - 宸插嚭搴撴暟閲�
+ dto.setInboundNum0(dto.getInboundNum().subtract(totalInboundNum));
+ }
return procurementPageDtoIPage;
}
+ @Override
+ public boolean frozenStorageQuality(List<Integer> frozenIds) {
+ if (frozenIds == null || frozenIds.isEmpty()) {
+ return true;
+ }
+
+ LambdaUpdateWrapper<ProcurementRecordStorage> storageLambdaUpdateWrapper = new LambdaUpdateWrapper<ProcurementRecordStorage>()
+ .set(ProcurementRecordStorage::getIsFrozen, true)
+ .in(ProcurementRecordStorage::getSalesLedgerProductId, frozenIds)
+ .eq(ProcurementRecordStorage::getIsFrozen, false);
+
+ return update(storageLambdaUpdateWrapper);
+ }
+
+ @Override
+ public boolean thawStorageQuality(List<Integer> thawIds) {
+ if (thawIds == null || thawIds.isEmpty()) {
+ return true;
+ }
+
+ LambdaUpdateWrapper<ProcurementRecordStorage> storageLambdaUpdateWrapper = new LambdaUpdateWrapper<ProcurementRecordStorage>()
+ .set(ProcurementRecordStorage::getIsFrozen, false)
+ .in(ProcurementRecordStorage::getSalesLedgerProductId, thawIds)
+ .eq(ProcurementRecordStorage::getIsFrozen, true);
+
+ return update(storageLambdaUpdateWrapper);
+ }
+
+ @Override
+ public boolean frozenFinishedQuality(List<Integer> frozenIds) {
+ if (frozenIds == null || frozenIds.isEmpty()) {
+ return true;
+ }
+
+ List<ProductModel> modelList = productModelService.list(new LambdaQueryWrapper<ProductModel>().in(ProductModel::getProductId, frozenIds));
+
+ List<Long> productModelIds = modelList.stream()
+ .map(ProductModel::getId)
+ .collect(Collectors.toList());
+
+ if (productModelIds.isEmpty()) {
+ return true;
+ }
+ LambdaUpdateWrapper<ProcurementRecordStorage> updateWrapper = new LambdaUpdateWrapper<ProcurementRecordStorage>()
+ .in(ProcurementRecordStorage::getProductModelId, productModelIds).set(ProcurementRecordStorage::getIsFrozen, 1);
+
+ return update(updateWrapper);
+ }
+
+ @Override
+ public boolean thawFinishedQuality(List<Integer> thawIds) {
+ if (thawIds == null || thawIds.isEmpty()) {
+ return true;
+ }
+
+ List<ProductModel> modelList = productModelService.list(new LambdaQueryWrapper<ProductModel>().in(ProductModel::getProductId, thawIds));
+
+ List<Long> productModelIds = modelList.stream()
+ .map(ProductModel::getId)
+ .collect(Collectors.toList());
+
+ if (productModelIds.isEmpty()) {
+ return true;
+ }
+ LambdaUpdateWrapper<ProcurementRecordStorage> updateWrapper = new LambdaUpdateWrapper<ProcurementRecordStorage>()
+ .in(ProcurementRecordStorage::getProductModelId, productModelIds).set(ProcurementRecordStorage::getIsFrozen, 0);
+
+ return update(updateWrapper);
+ }
+
+
}
--
Gitblit v1.9.3