From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 4207b8b..2be238c 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -14,7 +14,7 @@
import java.util.Date;
/**
- * 璐ㄩ噺绠＄悊--鍘熸潗鏂�/杩囩▼/鍑哄巶妫�楠�
+ * 璐ㄩ噺绠＄悊--鍘熸潗鏂�/杩囩▼/鎴愬搧妫�楠�
* quality_inspect
*/
@TableName(value = "quality_inspect")
@@ -29,9 +29,9 @@
private Long id;
/**
- * 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鍑哄巶妫�楠�)
+ * 绫诲埆(0:鍘熸潗鏂欐楠�;1:杩囩▼妫�楠�;2:鎴愬搧妫�楠�)
*/
- @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鍑哄巶妫�楠�")
+ @Excel(name = "绫诲埆",readConverterExp = "0=鍘熸潗鏂欐楠�,1=杩囩▼妫�楠�,2=鎴愬搧妫�楠�")
@NotBlank(message = "绫诲埆涓嶈兘涓虹┖!!")
private Integer inspectType;
@@ -52,7 +52,7 @@
private String supplier;
/**
- * 瀹㈡埛鍚嶇О(杩囩▼妫�楠�/鍑哄巶妫�楠�)
+ * 瀹㈡埛鍚嶇О(杩囩▼妫�楠�/鎴愬搧妫�楠�)
*/
@Excel(name = "瀹㈡埛鍚嶇О")
private String customer;
@@ -88,6 +88,13 @@
private String model;
/**
+ * 鐗╂枡缂栫爜
+ */
+ @Excel(name = "鏂欏彿")
+ @TableField(exist = false)
+ private String materialCode;
+
+ /**
* 鍗曚綅
*/
@Excel(name = "鍗曚綅")
@@ -98,6 +105,22 @@
*/
@Excel(name = "鏁伴噺")
private BigDecimal quantity;
+
+ @Excel(name = "鍚堟牸鏁伴噺")
+ @TableField(exist = false)
+ private BigDecimal qualifiedQuantity;
+
+ /**
+ * 涓嶈壇鏁伴噺
+ */
+ @Excel(name = "涓嶈壇鏁伴噺")
+ private BigDecimal defectiveQuantity;
+
+ /**
+ * 涓嶈壇鍘熷洜
+ */
+ @Excel(name = "涓嶈壇鍘熷洜")
+ private String defectiveReason;
/**
* 妫�娴嬪崟浣�
@@ -144,7 +167,19 @@
* 鎶ュ伐id
*/
private Long productMainId;
+
+ private Long productModelId;
//涓嶅悎鏍肩幇璞�
private String defectivePhenomena;
+ @ApiModelProperty("鍏宠仈妫�娴嬫爣鍑嗕富琛╥d")
+ private Long testStandardId;
+
+
+ @TableField(exist = false)
+ private String workOrderNo;
+ @TableField(exist = false)
+ private String purchaseContractNo;
+ @TableField(exist = false)
+ private String batchNo;
}
--
Gitblit v1.9.3