From 4f5133a1aa9ae7842fa808be6d082a036e408f12 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 02 七月 2026 17:09:20 +0800
Subject: [PATCH] 采购退货时,对应批次库存已被销售发货出去一批(比如销售发货时,选择的采购入库的批次库存,剩下38个,但采购退货时,可退货数量还是显示150个。)

---
 src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java |   38 ++++++++++++++------------------------
 1 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
index b7adae6..c4363a8 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
@@ -16,23 +16,10 @@
 @Data
 public class ProductionPlanDto extends ProductionPlan {
 
-    /**
-     * 鐗╂枡缂栫爜
-     */
-    @Schema(description = "鐗╂枡缂栫爜")
-    @Excel(name = "鐗╂枡缂栫爜")
-    private String materialCode;
-
-    /**
-     * 浜у搧鍚嶇О
-     */
     @Schema(description = "浜у搧鍚嶇О")
     @Excel(name = "浜у搧鍚嶇О")
     private String productName;
 
-    /**
-     * 浜у搧瑙勬牸
-     */
     @Schema(description = "浜у搧瑙勬牸")
     @Excel(name = "浜у搧瑙勬牸")
     private String model;
@@ -52,17 +39,20 @@
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate planCompleteTime;
 
-    /**
-     * 鍏宠仈鐗╂枡淇℃伅琛�
-     */
-    @Schema(description = "鍏宠仈鐗╂枡淇℃伅琛↖D")
-    private Long productMaterialId;
+    @Schema(description = "浜у搧ID")
+    private Long productId;
 
-    /**
-     * 寮哄害
-     */
-    @Schema(description = "寮哄害")
-    @Excel(name = "寮哄害")
-    private String strength;
+    @Schema(description = "绛涢�夊紑濮嬫棩鏈�")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate requiredDateStart;
+
+    @Schema(description = "绛涢�夌粨鏉熸棩鏈�")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate requiredDateEnd;
+
+    @Schema(description = "閿�鍞悎鍚屽彿")
+    private String salesContractNo;
 
 }

--
Gitblit v1.9.3