From d6388d041cc58b9f2be3ddcddfb6042e7af094f7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 11 五月 2026 10:11:00 +0800
Subject: [PATCH] fix(stock): 修复库存盘点计划中的出入库记录类型错误
---
src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
index 1721e81..ac13e04 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java
@@ -12,13 +12,13 @@
@EqualsAndHashCode(callSuper = true)
@Data
-@Schema(name = "ProductionProductMainDto", description = "鐢熶骇鎶ュ伐鏌ヨ瀵硅薄")
+@Schema(name = "ProductionProductMainDto", description = "鐢熶骇鎶ュ伐鏌ヨ鍙傛暟")
public class ProductionProductMainDto extends ProductionProductMain {
- @Schema(description = "浜у搧宸ヨ壓璺嚎鏄庣粏ID")
+ @Schema(description = "浜у搧宸ヨ壓璺嚎宸ュ簭ID")
private Long productProcessRouteItemId;
- @Schema(description = "鐢熶骇鎶ュ伐琛╥d")
+ @Schema(description = "鎶ュ伐ID")
private Long productMainId;
@Schema(description = "绉熸埛ID")
@@ -42,13 +42,13 @@
@Schema(description = "浜у搧鍚嶇О")
private String productName;
- @Schema(description = "浜у搧鍨嬪彿鍚嶇О")
+ @Schema(description = "浜у搧瑙勬牸鍨嬪彿")
private String productModelName;
@Schema(description = "鍗曚綅")
private String unit;
- @Schema(description = "閿�鍞悎鍚岀紪鍙�")
+ @Schema(description = "閿�鍞悎鍚屽彿")
private String salesContractNo;
@Schema(description = "鎺掍骇鏃ユ湡")
@@ -63,6 +63,18 @@
@Schema(description = "宸ュ簭")
private String process;
+ @Schema(description = "宸ヨ祫瀹氶")
+ private BigDecimal workHours;
+
+ @Schema(description = "宸ヨ祫")
+ private BigDecimal wages;
+
@Schema(description = "宸ュ簭鍙傛暟鍒楄〃")
private List<ProductionOrderRoutingOperationParam> productionOperationParamList;
+
+ @Schema(description = "杞﹂棿id")
+ private Long workshopId;
+
+ @Schema(description = "杞﹂棿鍚嶇О")
+ private String workshopName;
}
--
Gitblit v1.9.3