From e02d6b65fae6f05e37f42c66242f05391c4a6d1a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 19 一月 2026 16:39:21 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 11 +-
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 39 +++++++++
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java | 2
src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java | 22 +++--
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 4
src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java | 140 ++++++++++++++++++++++++++---------
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java | 8 ++
src/main/resources/mapper/basic/ProductModelMapper.xml | 1
doc/20260119-procurement_record_storage.sql | 2
src/main/resources/mapper/system/SysUserMapper.xml | 2
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 1
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java | 2
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementAddDto.java | 1
13 files changed, 180 insertions(+), 55 deletions(-)
diff --git a/doc/20260119-procurement_record_storage.sql b/doc/20260119-procurement_record_storage.sql
new file mode 100644
index 0000000..923bbd3
--- /dev/null
+++ b/doc/20260119-procurement_record_storage.sql
@@ -0,0 +1,2 @@
+alter table procurement_record_storage
+ add quality_inspect_id bigint null comment '璐ㄦid';
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementAddDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementAddDto.java
index 98ea4eb..6bb4e47 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementAddDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementAddDto.java
@@ -22,5 +22,6 @@
private String typeName;
private Integer purchaseLedgerId;
+ private Long qualityInspectId;
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
index a23002a..1d06eb6 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -192,4 +192,6 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate endDate;
+ private Long productModelId;
+
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
index 0e18336..29e77c4 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
@@ -100,4 +100,6 @@
* 浜у搧ID
*/
private Long productModelId;
+
+ private Long qualityInspectId;
}
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 35ec34c..b812cdf 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -781,7 +781,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<>();
@@ -896,6 +897,42 @@
@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;
}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
index a828596..1406667 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -50,10 +50,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -258,48 +255,119 @@
@Override
+ @Transactional(rollbackFor = Exception.class)
public int delRegistration(Long[] ids) {
- // 鍒犻櫎閲囪喘鍙拌处浜у搧寮�绁ㄨ褰曞璞�
- LambdaQueryWrapper<ProductRecord> productRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
- productRecordLambdaQueryWrapper.in(ProductRecord::getId, Arrays.asList(ids));
- List<ProductRecord> productRecords = productRecordMapper.selectList(productRecordLambdaQueryWrapper);
- if(CollectionUtils.isEmpty(productRecords)){
+
+ // 鏌ヨ瑕佸垹闄ょ殑浜у搧鏉ョエ璁板綍
+ LambdaQueryWrapper<ProductRecord> productWrapper = new LambdaQueryWrapper<>();
+ productWrapper.in(ProductRecord::getId, Arrays.asList(ids));
+ List<ProductRecord> productRecords = productRecordMapper.selectList(productWrapper);
+
+ if (CollectionUtils.isEmpty(productRecords)) {
return 0;
}
- LambdaQueryWrapper<TicketRegistration> ticketRegistrationLambdaQueryWrapper = new LambdaQueryWrapper<>();
- ticketRegistrationLambdaQueryWrapper.in(TicketRegistration::getId, productRecords.stream().map(ProductRecord::getTicketRegistrationId).collect(Collectors.toList()));
- List<TicketRegistration> ticketRegistrations = ticketRegistrationMapper.selectList(ticketRegistrationLambdaQueryWrapper);
- // 淇敼浜у搧淇℃伅
- for (ProductRecord productRecord : productRecords) {
- BigDecimal subtract = ticketRegistrations.get(0).getInvoiceAmount().subtract(productRecords.get(0).getTicketsAmount());
- // 灏忎簬绛変簬0鍒犻櫎 锛屽ぇ浜�0淇敼
- if(subtract.compareTo(BigDecimal.ZERO) <= 0){
- ticketRegistrationMapper.deleteById(ticketRegistrations.get(0));
- // 鍒犻櫎浠樻娴佹按璁板綍
- paymentRegistrationMapper.delete(new LambdaQueryWrapper<PaymentRegistration>().eq(PaymentRegistration::getTicketRegistrationId, ticketRegistrations.get(0).getId()));
- }else if(subtract.compareTo(BigDecimal.ZERO) > 0){
- ticketRegistrations.get(0).setInvoiceAmount(subtract);
- ticketRegistrationMapper.updateById(ticketRegistrations.get(0));
- }
- LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductLambdaQueryWrapper = new LambdaQueryWrapper<>();
- salesLedgerProductLambdaQueryWrapper.eq(SalesLedgerProduct::getId, productRecord.getSaleLedgerProjectId())
- .eq(SalesLedgerProduct::getType, 2);
- List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(salesLedgerProductLambdaQueryWrapper);
- if(!CollectionUtils.isEmpty(salesLedgerProducts)){
- for (SalesLedgerProduct salesLedgerProduct : salesLedgerProducts) {
- salesLedgerProduct.setFutureTickets(salesLedgerProduct.getFutureTickets().add(productRecord.getTicketsNum()));
- salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getFutureTicketsAmount().add(productRecord.getTicketsAmount()));
- salesLedgerProductMapper.updateById(salesLedgerProduct);
+ // 鏀堕泦鍏宠仈ID
+ Set<Long> ticketRegistrationIds = productRecords.stream()
+ .map(ProductRecord::getTicketRegistrationId)
+ .collect(Collectors.toSet());
- }
+ Set<Long> salesLedgerProductIds = productRecords.stream()
+ .map(ProductRecord::getSaleLedgerProjectId)
+ .collect(Collectors.toSet());
+
+ // 鏌ヨ鏉ョエ鐧昏
+ List<TicketRegistration> ticketRegistrations =
+ ticketRegistrationMapper.selectBatchIds(ticketRegistrationIds);
+
+ // 澶勭悊鏉ョエ鐧昏閲戦銆佷粯娆炬祦姘�
+ for (TicketRegistration ticket : ticketRegistrations) {
+
+ // 璇ユ潵绁ㄧ櫥璁颁笅鎵�鏈変骇鍝佽褰�
+ List<ProductRecord> recordsOfTicket = productRecords.stream()
+ .filter(r -> r.getTicketRegistrationId().equals(ticket.getId()))
+ .collect(Collectors.toList());
+
+ // 璁＄畻瑕佸洖閫�鐨勯噾棰�
+ BigDecimal rollbackAmount = recordsOfTicket.stream()
+ .map(ProductRecord::getTicketsAmount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ BigDecimal remain = ticket.getInvoiceAmount().subtract(rollbackAmount);
+
+ if (remain.compareTo(BigDecimal.ZERO) <= 0) {
+ // 鍒犻櫎鏉ョエ鐧昏
+ ticketRegistrationMapper.deleteById(ticket.getId());
+ // 鍒犻櫎浠樻娴佹按
+ paymentRegistrationMapper.delete(
+ new LambdaQueryWrapper<PaymentRegistration>()
+ .eq(PaymentRegistration::getTicketRegistrationId, ticket.getId())
+ );
+ } else {
+ ticket.setInvoiceAmount(remain);
+ ticketRegistrationMapper.updateById(ticket);
}
}
- // 鍒犻櫎閲囪喘鍙拌处浜у搧寮�绁ㄨ褰�
- productRecordMapper.delete(productRecordLambdaQueryWrapper);
+
+ // 鍥為��閿�鍞彴璐︿骇鍝佺殑鏈潵绁�
+ for (ProductRecord record : productRecords) {
+
+ LambdaQueryWrapper<SalesLedgerProduct> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(SalesLedgerProduct::getId, record.getSaleLedgerProjectId())
+ .eq(SalesLedgerProduct::getType, 2);
+
+ SalesLedgerProduct product = salesLedgerProductMapper.selectOne(wrapper);
+ if (product != null) {
+ product.setFutureTickets(
+ product.getFutureTickets().add(record.getTicketsNum())
+ );
+ product.setFutureTicketsAmount(
+ product.getFutureTicketsAmount().add(record.getTicketsAmount())
+ );
+ salesLedgerProductMapper.updateById(product);
+ }
+ }
+
+ // 鍒犻櫎浜у搧鏉ョエ璁板綍
+ productRecordMapper.delete(productWrapper);
+
+ // 閲嶆柊璁＄畻 currentInvoiceAmount
+ for (Long productId : salesLedgerProductIds) {
+ refreshCurrentInvoiceAmount(productId);
+ }
+
return 1;
}
+ private void refreshCurrentInvoiceAmount(Long salesLedgerProductId) {
+
+ // 鏌ヨ璇ヤ骇鍝佹渶鏂颁竴鏉℃潵绁ㄨ褰�
+ LambdaQueryWrapper<ProductRecord> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(ProductRecord::getSaleLedgerProjectId, salesLedgerProductId)
+ .orderByDesc(ProductRecord::getCreatedAt)
+ .last("limit 1");
+
+ ProductRecord latestRecord = productRecordMapper.selectOne(wrapper);
+
+ SalesLedgerProduct product =
+ salesLedgerProductMapper.selectById(salesLedgerProductId);
+
+ if (product == null) {
+ return;
+ }
+
+ if (latestRecord == null) {
+ // 娌℃湁浠讳綍鏉ョエ璁板綍
+ product.setTicketsAmount(BigDecimal.ZERO);
+ } else {
+ // 姘歌繙鍙栨渶鏂颁竴鏉�
+ product.setTicketsAmount(latestRecord.getTicketsAmount());
+ }
+
+ salesLedgerProductMapper.updateById(product);
+ }
+
+
@Override
public TicketRegistrationDto getRegistrationById(TicketRegistrationDto ticketRegistrationDto) {
TicketRegistration ticketRegistration = ticketRegistrationMapper.selectById(ticketRegistrationDto.getId());
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index fa50217..1555082 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
+import com.ruoyi.procurementrecord.service.ProcurementRecordService;
+import com.ruoyi.procurementrecord.service.impl.ProcurementRecordServiceImpl;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
@@ -12,6 +15,7 @@
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
import com.ruoyi.quality.service.IQualityUnqualifiedService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -34,6 +38,8 @@
@Resource
private IQualityInspectFileService qualityInspectFileService;
+ @Autowired
+ private ProcurementRecordService procurementRecordService;
/**
@@ -62,6 +68,8 @@
//鍒犻櫎妫�楠岄檮浠�
qualityInspectFileService.remove(Wrappers.<QualityInspectFile>lambdaQuery()
.in(QualityInspectFile::getInspectId,ids));
+ //鍒犻櫎鍏ュ簱璁板綍
+ procurementRecordService.remove(Wrappers.<ProcurementRecordStorage>lambdaQuery().in(ProcurementRecordStorage::getQualityInspectId,ids));
//鍒犻櫎妫�楠屽崟
return AjaxResult.success(qualityInspectService.removeBatchByIds(ids));
}
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index f39a456..f4b6e2c 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -113,7 +113,7 @@
if ("鍚堟牸".equals(qualityInspect.getCheckResult())) {
ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
procurementRecordOutAdd.setType(1);
- procurementRecordOutAdd.setTypeName("閲囪喘鍏ュ簱");
+ procurementRecordOutAdd.setTypeName("閲囪喘鍘熸潗鏂欐楠屽悎鏍煎叆搴�");
procurementRecordOutAdd.setNickName(loginUser.getNickName());
procurementRecordOutAdd.setPurchaseLedgerId(Math.toIntExact(qualityInspect.getPurchaseLedgerId()));
if (qualityInspect.getPurchaseLedgerId() == null) {
@@ -131,13 +131,14 @@
details.setProductModelId(qualityInspect.getProductModelId());
detailss.add( details);
procurementRecordOutAdd.setDetails(detailss);
+ procurementRecordOutAdd.setQualityInspectId(qualityInspect.getId());
procurementRecordService.add(procurementRecordOutAdd);
}
}else if (qualityInspect.getInspectType() == 1) {
//鏌ヨUnitPrice/TotalPrice
ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
procurementRecordOutAdd.setType(2);
- procurementRecordOutAdd.setTypeName("鐢熶骇鍏ュ簱");
+ procurementRecordOutAdd.setTypeName("鐢熶骇杩囩▼妫�楠屽悎鏍煎叆搴�");
procurementRecordOutAdd.setNickName(loginUser.getNickName());
List<Details> details = new ArrayList<>();
Details details1 = new Details();
@@ -158,7 +159,8 @@
.updateTime(LocalDateTime.now())
.updateUser(loginUser.getUserId())
.createBy(procurementRecordOutAdd.getNickName())
- .productModelId(details1.getProductModelId());
+ .productModelId(details1.getProductModelId())
+ .qualityInspectId(qualityInspect.getId());
procurementRecordService.save(procurementRecordBuilder.build());
@@ -168,7 +170,7 @@
SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectSalesLedgerProductByMainId(qualityInspect.getProductMainId());
ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
procurementRecordOutAdd.setType(2);
- procurementRecordOutAdd.setTypeName("鐢熶骇鍏ュ簱");
+ procurementRecordOutAdd.setTypeName("鐢熶骇鍑哄巶妫�楠屽悎鏍煎叆搴�");
procurementRecordOutAdd.setNickName(loginUser.getNickName());
List<Details> details = new ArrayList<>();
Details details1 = new Details();
@@ -179,6 +181,7 @@
details1.setProductModelId(salesLedgerProduct.getProductModelId());
details.add(details1);
procurementRecordOutAdd.setDetails(details);
+ procurementRecordOutAdd.setQualityInspectId(qualityInspect.getId());
procurementRecordService.add(procurementRecordOutAdd);
}
qualityInspect.setInspectState(1);//宸叉彁浜�
diff --git a/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java b/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
index ee7f721..63f417b 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShipmentApprovalController.java
@@ -89,19 +89,21 @@
// 瀹℃壒閫氳繃
if (req.getApproveStatus() == 3) {
- // 鏌ヨ閲囪喘鍏ュ簱璁板綍
- LambdaQueryWrapper<ProcurementRecordStorage> lambdaQueryWrapper = new LambdaQueryWrapper<ProcurementRecordStorage>()
- .eq(ProcurementRecordStorage::getSalesLedgerProductId, req.getSalesLedgerProductId());
- ProcurementRecordStorage procurementRecordStorage = procurementRecordStorageService.getOne(lambdaQueryWrapper);
-
- if (procurementRecordStorage == null) {
- // 淇濊瘉鍓嶉潰鐨勪慨鏀瑰叏閮ㄥ洖婊�
- throw new ServiceException("閲囪喘璁板綍涓嶅瓨鍦紝瀹℃壒鍥炴粴");
- }
+// // 鏌ヨ閲囪喘鍏ュ簱璁板綍
+// LambdaQueryWrapper<ProcurementRecordStorage> lambdaQueryWrapper = new LambdaQueryWrapper<ProcurementRecordStorage>()
+// .eq(ProcurementRecordStorage::getSalesLedgerProductId, req.getSalesLedgerProductId());
+// ProcurementRecordStorage procurementRecordStorage = procurementRecordStorageService.getOne(lambdaQueryWrapper);
+//
+// if (procurementRecordStorage == null) {
+// // 淇濊瘉鍓嶉潰鐨勪慨鏀瑰叏閮ㄥ洖婊�
+// throw new ServiceException("閲囪喘璁板綍涓嶅瓨鍦紝瀹℃壒鍥炴粴");
+// }
// 鐢熸垚鍑哄簱璁板綍
ProcurementRecordOutAdd procurementRecordOutAdd = new ProcurementRecordOutAdd();
- procurementRecordOutAdd.setId(procurementRecordStorage.getId());
+// procurementRecordOutAdd.setId(procurementRecordStorage.getId());
+ procurementRecordOutAdd.setId(0);
+ procurementRecordOutAdd.setProductModelId(salesLedgerProduct.getProductModelId());
procurementRecordOutAdd.setSalesLedgerProductId((long) Math.toIntExact(salesLedgerProduct.getId()));
procurementRecordOutAdd.setType(2);
procurementRecordOutAdd.setUserId(Math.toIntExact(getUserId()));
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
index acab688..270f256 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -98,10 +98,10 @@
if(ledgerProduct.getId().intValue() == registrationProductDto.getSalesLedgerProductId()){
invoiceNum = invoiceNum.add(registrationProductDto.getInvoiceNum());
invoiceAmount = invoiceAmount.add(registrationProductDto.getInvoiceAmount());
- noInvoiceNum = ledgerProduct.getQuantity().subtract(invoiceNum);
- noInvoiceAmount = ledgerProduct.getTaxInclusiveTotalPrice().subtract(invoiceAmount);
}
}
+ noInvoiceNum = ledgerProduct.getQuantity().subtract(invoiceNum);
+ noInvoiceAmount = ledgerProduct.getTaxInclusiveTotalPrice().subtract(invoiceAmount);
ledgerProduct.setInvoiceNum(invoiceNum);
ledgerProduct.setInvoiceAmount(invoiceAmount);
ledgerProduct.setNoInvoiceNum(noInvoiceNum);
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index afdfc4a..e003c4f 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -13,7 +13,6 @@
<result column="tenant_id" property="tenantId" />
<result column="product_name" property="productName" />
<result column="product_id" property="productId" />
- <result column="product_code" property="productCode" />
</resultMap>
<select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
select pm.*,p.product_name
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 6270d57..e1d9381 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -361,6 +361,7 @@
<select id="listPageByProductProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
select
t1.*,
+ t1.inbound_num as inboundNum0,
t2.model as specification_model ,
t2.unit,
t3.product_name as product_category
diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index d0a03fb..d837b7e 100644
--- a/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/src/main/resources/mapper/system/SysUserMapper.xml
@@ -88,7 +88,7 @@
<if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
AND date_format(u.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
</if>
- <if test="params.deptId != null">
+ <if test="deptId != null">
AND u.user_id IN
(
SELECT user_id FROM sys_user_dept WHERE dept_id = #{deptId}
--
Gitblit v1.9.3