From 7a6f10169c1f56e7f0394463e1294fd2da3f6725 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 16:00:36 +0800
Subject: [PATCH] yys 1.修改bug
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 10 ++++++----
src/main/java/com/ruoyi/production/pojo/ProductProcess.java | 2 +-
src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index 8f38511..e032c43 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -74,7 +74,7 @@
private Long tenantId;
@ApiModelProperty(value ="鏄惁璐ㄦ")
- @Excel(name = "鏄惁璐ㄦ", readConverterExp = "0=鍚�,1=鏄�")
+ @Excel(name = "鏄惁璐ㄦ", readConverterExp = "鍚�=false,鏄�=true")
private Boolean isQuality;
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 1970897..bf46405 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -290,6 +290,7 @@
productOrder.setSaleLedgerProductId(salesLedgerProduct.getId());
String string = productOrderServiceImpl.generateNextOrderNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")));
productOrder.setNpsNo(string);
+ productOrder.setStatus("寰呯敓浜�");
productOrder.setQuantity(salesLedgerProduct.getQuantity());//闇�姹傛暟閲�
productOrder.setCompleteQuantity(BigDecimal.ZERO);//瀹屾垚鏁伴噺
productOrderMapper.insert(productOrder);
@@ -307,19 +308,20 @@
productProcessRouteMapper.insert(productProcessRoute);
// 缁戝畾鐢熶骇bom娓呭崟
List<ProductBom> productBoms = productBomMapper.selectList(new LambdaQueryWrapper<ProductBom>()
- .eq(ProductBom::getProductModelId, processRoute.getProductModelId())
+ .eq(ProductBom::getProductModelId, salesLedgerProduct.getProductModelId())
.orderByDesc(ProductBom::getId));
if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(productBoms)){
ProductBom productBom = productBoms.get(0);
// 鑾峰彇bom瀛愯〃淇℃伅
List<ProductStructure> productStructures = productStructureMapper.selectList(new LambdaQueryWrapper<ProductStructure>()
+ .isNotNull(ProductStructure::getParentId)
.eq(ProductStructure::getBomId, productBom.getId()));
if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(productStructures)){
productStructures.forEach(item ->{
ProductStructureRecord item1 = new ProductStructureRecord();
BeanUtils.copyProperties(item, item1);
item1.setProductOrderId(productOrder.getId());
- item1.setDemandedQuantity(item.getUnitQuantity().add(productOrder.getQuantity()));
+ item1.setDemandedQuantity(item.getUnitQuantity().multiply(productOrder.getQuantity()));
item1.setBomId(Long.valueOf(productBom.getId()));
productStructureRecordMapper.insert(item1);
});
@@ -464,10 +466,10 @@
productOrderMapper.delete(new LambdaQueryWrapper<ProductOrder>()
.in(ProductOrder::getSaleLedgerProductId, productIds));
// 鍒犻櫎闄勪欢
- commonFileService.deleteByBusinessIds(productIds, FileNameType.PRODUCT_ORDER.getValue());
+ commonFileService.deleteByBusinessIds(orderIds, FileNameType.PRODUCT_ORDER.getValue());
// 鍒犻櫎鐢熶骇璁㈠崟-鐗╂枡娓呭崟
productStructureRecordMapper.delete(new LambdaQueryWrapper<ProductStructureRecord>()
- .in(ProductStructureRecord::getProductOrderId, productIds));
+ .in(ProductStructureRecord::getProductOrderId, orderIds));
}
}
diff --git a/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml b/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml
index 8c66b7f..21944e9 100644
--- a/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml
@@ -15,7 +15,7 @@
slp.specification_model as model,
slp.unit as unit,
rsp.*,
- GREATEST(slp.quantity - COALESCE(rs.total_return_num, 0), 0) AS un_quantity,
+ GREATEST(si.shipping_num - COALESCE(rs.total_return_num, 0), 0) AS un_quantity,
COALESCE(rs.total_return_num, 0) AS total_return_num
FROM return_sale_product rsp
LEFT JOIN return_management rm ON rm.id = rsp.return_management_id
--
Gitblit v1.9.3