From 3870cf443bf0dfd9394bc545c8e90ac0d6dacaeb Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 08 九月 2025 17:55:05 +0800
Subject: [PATCH] 上料实体类调整、物料消耗明细基础代码、报工接口适配调整（适配上料表结构调整、并记录物料消耗明细）
---
src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java
index ab81cc0..fdb6ba0 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java
@@ -54,23 +54,14 @@
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
private Integer delFlag;
- /**宸ュ崟ID*/
- @Excel(name = "宸ュ崟ID", width = 15)
- @Dict(dictTable = "mes_production_work_order", dicCode = "id", dicText = "work_order_code")
- @ApiModelProperty(value = "宸ュ崟ID")
- private String workOrderId;
- /**璁惧ID*/
- @Excel(name = "璁惧ID", width = 15)
- @ApiModelProperty(value = "璁惧ID")
- private String equipmentId;
- /**宸ュ簭缂栫爜*/
- @Excel(name = "宸ュ簭缂栫爜", width = 15)
- @ApiModelProperty(value = "宸ュ簭缂栫爜")
- private String processCode;
- /**宸ュ簭鍚嶇О*/
- @Excel(name = "宸ュ簭鍚嶇О", width = 15)
- @ApiModelProperty(value = "宸ュ簭鍚嶇О")
- private String processName;
+ /**浜х嚎ID*/
+ @Excel(name = "浜х嚎ID", width = 15)
+ @ApiModelProperty(value = "浜х嚎ID")
+ private String factoryId;
+ /**搴撳瓨鍦癐D*/
+ @Excel(name = "搴撳瓨鍦癐D", width = 15)
+ @ApiModelProperty(value = "搴撳瓨鍦癐D")
+ private String warehouseId;
/**鐗╂枡缂栫爜*/
@Excel(name = "鐗╂枡缂栫爜", width = 15)
@ApiModelProperty(value = "鐗╂枡缂栫爜")
@@ -83,6 +74,10 @@
@Excel(name = "鎵规鍙�", width = 15)
@ApiModelProperty(value = "鎵规鍙�")
private String batchNumber;
+ /**閽㈢悆灏哄*/
+ @Excel(name = "閽㈢悆灏哄", width = 15)
+ @ApiModelProperty(value = "閽㈢悆灏哄")
+ private String steelBallSize;
/**鏁伴噺*/
@Excel(name = "鏁伴噺", width = 15)
@ApiModelProperty(value = "鏁伴噺")
--
Gitblit v1.9.3