From f7273277023f3497ac071bf98f556a569cb4dd25 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 17 九月 2026 16:24:10 +0800
Subject: [PATCH] feat(mes): 重构袋码生成与物料分类功能
---
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java | 62 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 9 deletions(-)
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java
index 35723c4..a718008 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemRespVO.java
@@ -25,17 +25,38 @@
@Schema(description = "瑙勬牸鍨嬪彿", example = "M8*20")
private String specification;
- @Schema(description = "鐗╂枡鍒嗙被缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long categoryId;
-
- @Schema(description = "鐗╂枡鍒嗙被鍚嶇О", example = "浜旈噾閰嶄欢")
- private String categoryName;
-
@Schema(description = "璁￠噺鍗曚綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long unitMeasureId;
@Schema(description = "璁￠噺鍗曚綅鍚嶇О", example = "涓�")
private String unitMeasureName;
+
+ @Schema(description = "杈呭崟浣�1缂栧彿", example = "2")
+ private Long unitMeasureId2;
+
+ @Schema(description = "杈呭崟浣�1鍚嶇О")
+ private String unitMeasureName2;
+
+ @Schema(description = "杈呭崟浣�1鎹㈢畻姣旂巼", example = "12")
+ private BigDecimal unitMeasureRate1;
+
+ @Schema(description = "杈呭崟浣�2缂栧彿", example = "3")
+ private Long unitMeasureId3;
+
+ @Schema(description = "杈呭崟浣�2鍚嶇О")
+ private String unitMeasureName3;
+
+ @Schema(description = "杈呭崟浣�2鎹㈢畻姣旂巼", example = "100")
+ private BigDecimal unitMeasureRate2;
+
+ @Schema(description = "榛樿浠撳簱缂栧彿", example = "1")
+ private Long warehouseId;
+
+ @Schema(description = "榛樿浠撳簱缂栫爜", example = "WH001")
+ private String warehouseCode;
+
+ @Schema(description = "榛樿浠撳簱鍚嶇О", example = "鍘熸枡浠�")
+ private String warehouseName;
@Schema(description = "鍝佺墝缂栧彿", example = "1")
private Long brandId;
@@ -48,9 +69,6 @@
@Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
private Integer status;
-
- @Schema(description = "閲囪喘浠锋牸", example = "10.00")
- private BigDecimal purchasePrice;
@Schema(description = "閿�鍞环鏍�", example = "15.00")
private BigDecimal salesPrice;
@@ -73,6 +91,29 @@
@Schema(description = "鏄惁鎵规绠＄悊", example = "false")
private Boolean isBatchManaged;
+ // ==================== 鎵规灞炴�ч厤缃� ====================
+
+ @Schema(description = "鐢熶骇鏃ユ湡", example = "false")
+ private Boolean produceDateFlag;
+
+ @Schema(description = "鏈夋晥鏈�", example = "false")
+ private Boolean expireDateFlag;
+
+ @Schema(description = "鍏ュ簱鏃ユ湡", example = "false")
+ private Boolean receiptDateFlag;
+
+ @Schema(description = "渚涘簲鍟�", example = "false")
+ private Boolean vendorFlag;
+
+ @Schema(description = "閲囪喘璁㈠崟缂栧彿", example = "false")
+ private Boolean purchaseOrderCodeFlag;
+
+ @Schema(description = "鐢熶骇鎵瑰彿", example = "false")
+ private Boolean lotNumberFlag;
+
+ @Schema(description = "璐ㄩ噺鐘舵��", example = "false")
+ private Boolean qualityStatusFlag;
+
@Schema(description = "鏄惁楂樺�肩墿鏂�", example = "false")
private Boolean isHighValue;
@@ -82,6 +123,9 @@
@Schema(description = "澶囨敞", example = "澶囨敞淇℃伅")
private String remark;
+ @Schema(description = "鏄惁宸插悓姝ュ埌 MES", example = "true")
+ private Boolean syncedMes;
+
@Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
--
Gitblit v1.9.3