From 47cbc59169b787e8a5f9c6969e2a0259c06249ca Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 24 四月 2026 13:31:48 +0800
Subject: [PATCH] feat:库存管理成品/半成品/原材料
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 6 +++---
src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java | 4 ++--
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 2 +-
src/main/resources/mapper/stock/StockInventoryMapper.xml | 14 +++++++++-----
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 9d9101e..9327b29 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -238,7 +238,7 @@
BigDecimal productQty = productionProductOutput.getQuantity();
//鍙湁鍚堟牸鏁伴噺>0鎵嶈兘澧炲姞鐩稿簲鏁版嵁
ProductWorkOrder pwo = productWorkOrderMapper.selectById(productionProductMain.getWorkOrderId());
- String customer = "闀挎不甯傝酱鎵垮埗閫犳湁闄愬叕鍙�";
+ String customer = "闀挎不甯傚仴榻块娇绉戝櫒鏉愭湁闄愬叕鍙�";
if (productQty.compareTo(BigDecimal.ZERO) > 0) {
/*鏂板璐ㄦ*/
List<ProductProcessRouteItem> productProcessRouteItems = productProcessRouteItemMapper.selectList(Wrappers.<ProductProcessRouteItem>lambdaQuery().eq(ProductProcessRouteItem::getProductRouteId, productProcessRouteItem.getProductRouteId()));
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 95249fd..28b0901 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -79,7 +79,7 @@
QualityInspect qualityInspect = new QualityInspect();
BeanUtils.copyProperties(qualityInspectDto, qualityInspect);
if (qualityInspectDto.getInspectType() != 0) {
- qualityInspectDto.setCustomer("闀挎不甯傝酱鎵垮埗閫犳湁闄愬叕鍙�");
+ qualityInspectDto.setCustomer("闀挎不甯傚仴榻块娇绉戝櫒鏉愭湁闄愬叕鍙�");
}
qualityInspect.setInspectState(0);//榛樿鏈彁浜�
qualityInspectMapper.insert(qualityInspect);
@@ -112,7 +112,7 @@
ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(productionProductMain.getWorkOrderId());
ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());
batchNo = productOrder.getBatchNo();
- customer = "闀挎不甯傝酱鎵垮埗閫犳湁闄愬叕鍙�";
+ customer = "闀挎不甯傚仴榻块娇绉戝櫒鏉愭湁闄愬叕鍙�";
} else {
batchNo = qualityInspect.getBatchNo();
customer = qualityInspect.getSupplier();
@@ -137,7 +137,7 @@
} else {
//鍚堟牸鐩存帴鍏ュ簱
stockUtils.addStock(qualityInspect.getProductModelId(), qualityInspect.getQuantity(), StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(),
- qualityInspect.getId(), batchNo, customer != null ? customer : "闀挎不甯傝酱鎵垮埗閫犳湁闄愬叕鍙�", inspect.getProductionDate()
+ qualityInspect.getId(), batchNo, customer != null ? customer : "闀挎不甯傚仴榻块娇绉戝櫒鏉愭湁闄愬叕鍙�", inspect.getProductionDate()
);
}
qualityInspect.setInspectState(1);//宸叉彁浜�
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
index ba34331..190fc04 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java
@@ -73,13 +73,13 @@
ProductWorkOrder workOrder = productWorkOrderMapper.selectById(productionProductMain.getWorkOrderId());
ProductOrder orders = productOrderMapper.selectById(workOrder.getProductOrderId());
batchNo = orders.getBatchNo();
- customer = "闀挎不甯傝酱鎵垮埗閫犳湁闄愬叕鍙�";
+ customer = "闀挎不甯傚仴榻块娇绉戝櫒鏉愭湁闄愬叕鍙�";
} else {
batchNo = qualityInspect.getBatchNo();
if (qualityInspect.getSupplier() != null) {
customer = qualityInspect.getCustomer();
} else {
- customer = "闀挎不甯傝酱鎵垮埗閫犳湁闄愬叕鍙�";
+ customer = "闀挎不甯傚仴榻块娇绉戝櫒鏉愭湁闄愬叕鍙�";
}
}
if (ObjectUtils.isNotNull(qualityInspect) && qualityInspect.getInspectType() != 0) {
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index c67d021..517a17d 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -84,7 +84,7 @@
p.product_name,
si.batch_no,
si.customer,
- rp.product_name AS root_product_name,
+ rp.product_type AS productScope,
si.production_date
FROM
stock_inventory si
@@ -108,11 +108,15 @@
<if test="ew.productScope != null and ew.productScope != ''">
<choose>
<when test="ew.productScope == '鎴愬搧'">
- AND rp.product_name = '鎴愬搧'
+ AND rp.product_type = '鎴愬搧'
</when>
- <otherwise>
- AND rp.product_name != '鎴愬搧'
- </otherwise>
+ <when test="ew.productScope == '鍗婃垚鍝�'">
+ AND rp.product_type = '鍗婃垚鍝�'
+ </when>
+ <when test="ew.productScope == '鍘熸潗鏂�'">
+ AND (rp.product_type IS NULL
+ OR (rp.product_type != '鎴愬搧' AND rp.product_type != '鍗婃垚鍝�'))
+ </when>
</choose>
</if>
</where>
--
Gitblit v1.9.3