From 9d4cf882be7a2ad8d3cc422bcd0dbc461f626f58 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 15:12:30 +0800
Subject: [PATCH] feat(production): 迁移生产管控
---
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 216 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 124 insertions(+), 92 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 b5f630c..a238ae6 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
@@ -61,13 +62,13 @@
// 璁＄畻寰呭叆搴撴暟閲�
// 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
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) {
@@ -75,35 +76,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;
@@ -128,26 +129,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;
@@ -156,7 +157,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;
@@ -168,7 +169,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
continue;
}
@@ -191,14 +192,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
@@ -207,7 +208,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());
@@ -219,25 +220,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;
@@ -246,7 +247,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;
@@ -258,7 +259,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
continue;
}
@@ -276,14 +277,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;
@@ -291,9 +292,8 @@
LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect);
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;
@@ -305,7 +305,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
continue;
}
@@ -335,19 +335,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<>();
@@ -365,7 +365,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
continue;
}
@@ -388,7 +388,7 @@
currentStock += dto.getInboundNum().intValue() - totalInboundNum.intValue();
values.add(currentStock);
// 璁＄畻鍛ㄨ浆鐜�
- if(totalIn > 0){
+ if (totalIn > 0) {
turnoverRate = totalOut * 100 / totalIn;
}
}
@@ -424,7 +424,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;
}
// 璁＄畻鎬诲簱瀛樻暟閲�
@@ -482,6 +482,7 @@
inventoryInformationDto.setInventoryChangeValue(inventoryChangeValue.subtract(totalInventoryValue));
return inventoryInformationDto;
}
+
@Override
public IPage<ProcurementPageDto> listPageByProduction(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDto> procurementPageDtoIPage = procurementRecordMapper.listPageByProduction(page, procurementDto);
@@ -489,14 +490,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) {
@@ -506,7 +507,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
continue;
}
@@ -527,13 +528,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);
@@ -544,15 +545,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());
}
}
@@ -563,14 +564,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) {
@@ -580,7 +581,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
continue;
}
@@ -603,7 +604,7 @@
// 璁＄畻寰呭叆搴撴暟閲�
// 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
List<Integer> collect = procurementPageDtoCopyList.stream().map(ProcurementPageDtoCopy::getId).collect(Collectors.toList());
- if(CollectionUtils.isEmpty( collect)){
+ if (CollectionUtils.isEmpty(collect)) {
return procurementPageDtoCopyIPage;
}
// 1. 鏌ヨ閲囪喘璁板綍宸插叆搴撶殑鍑哄簱璁板綍锛堟寜storageId鍒嗙粍锛�
@@ -612,7 +613,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(
@@ -675,14 +676,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) {
@@ -692,7 +693,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
dto.setTotalInboundNum(BigDecimal.ZERO);
continue;
@@ -707,7 +708,7 @@
// 寰呭嚭搴撴暟閲� = 鎬绘暟閲� - 宸插嚭搴撴暟閲�
dto.setInboundNum0(dto.getInboundNum().subtract(totalInboundNum));
// 搴撳瓨浠峰��
- if(dto.getTaxInclusiveUnitPrice() != null){
+ if (dto.getTaxInclusiveUnitPrice() != null) {
dto.setTaxInclusiveTotalPrice(dto.getInboundNum0().multiply(dto.getTaxInclusiveUnitPrice()));
}
}
@@ -728,7 +729,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<>();
@@ -737,7 +738,7 @@
CustomStorage one = new CustomStorage();
one.setTaxInclusiveUnitPrice(procurementDto.getTaxInclusiveUnitPrice());
one.setTaxInclusiveTotalPrice(procurementDto.getTaxInclusiveTotalPrice());
- return customStorageMapper.update(one,customStorageLambdaQueryWrapper);
+ return customStorageMapper.update(one, customStorageLambdaQueryWrapper);
}
@Override
@@ -746,7 +747,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()
@@ -764,10 +765,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())
@@ -776,12 +780,10 @@
.createTime(LocalDateTime.now())
.createUser(loginUser.getUserId())
.updateTime(LocalDateTime.now())
- .boxNum(detail.getBoxNum())
- .cartonSpecifications(detail.getCartonSpecifications())
- .dollarPrice(detail.getDollarPrice())
.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<>();
@@ -803,14 +805,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) {
@@ -820,7 +822,7 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
continue;
}
@@ -836,15 +838,6 @@
return procurementPageDtoIPage;
}
- public List<Long> listCopyIds(String ids) {
- List<Long> idsSet = new ArrayList<>();
- String[] split = ids.split(",");
- for (String s : split) {
- idsSet.add(Long.valueOf(s));
- }
- return idsSet;
- }
-
@Override
public IPage<ProcurementPageDtoCopy> listPageCopy(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDtoCopy> procurementPageDtoCopyIPage = procurementRecordMapper.listPageCopy(page, procurementDto);
@@ -852,14 +845,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) {
@@ -869,13 +862,14 @@
.collect(Collectors.toList());
// 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
+ if (CollectionUtils.isEmpty(collect1)) {
dto.setInboundNum0(dto.getInboundNum());
dto.setTotalInboundNum(BigDecimal.ZERO);
continue;
}
+
// 璁＄畻宸插嚭搴撴暟閲忔�诲拰锛屽苟璁剧疆寰呭嚭搴撴暟閲�
- BigDecimal totalInboundNum = procurementRecords.stream()
+ BigDecimal totalInboundNum = collect1.stream()
.map(ProcurementRecordOut::getInboundNum)
.reduce(BigDecimal.ZERO, BigDecimal::add);
// 鍑哄簱鏁伴噺 = 鎬绘暟閲� - 寰呭嚭搴撴暟閲�
@@ -883,12 +877,13 @@
// 寰呭嚭搴撴暟閲� = 鎬绘暟閲� - 宸插嚭搴撴暟閲�
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();
@@ -901,9 +896,46 @@
return iPage;
}
+
@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;
}
--
Gitblit v1.9.3