From 260dd6fe156265832544715192ce1491e9c2afd6 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 26 六月 2026 13:41:13 +0800
Subject: [PATCH] fix(stock): 解决库存管理中的重复键异常问题 - 在采购台账服务中添加净合同金额字段设置 - 在销售台账服务中添加净合同金额字段设置 - 在入库记录服务中为库存插入操作添加重复键异常处理 - 在入库记录服务中为非库存插入操作添加重复键异常处理 - 在库存服务中为库存插入操作添加重复键异常处理 - 统一处理数据库唯一键约束冲突,避免系统错误

---
 src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
index a15270c..61c5d19 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrderPick.java
@@ -66,6 +66,19 @@
     @Schema(description = "闇�姹傛暟閲�")
     private BigDecimal demandedQuantity;
 
+    @Schema(description = "琛ユ枡鎬婚噺")
+    private BigDecimal  feedingQty;
+
+    @Schema(description = "閫�鏂欐暟閲�")
+    private BigDecimal  returnQty;
+
+    @Schema(description = "瀹為檯鏁伴噺")
+    private BigDecimal  actualQty;
+
+    @Schema(description = "鏄惁宸查��鏂�")
+    @TableField("is_returned")
+    private Boolean returned;
+
     @Schema(description = "鏄惁bom棰嗘枡")
     @TableField("is_bom")
     private Boolean bom;

--
Gitblit v1.9.3