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 | 55 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 21 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 cd53747..fdb6ba0 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java
@@ -1,25 +1,24 @@
package org.jeecg.modules.mes.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
* @Description: 涓婃枡
* @Author: jeecg-boot
- * @Date: 2025-07-04
+ * @Date: 2025-07-07
* @Version: V1.0
*/
@Data
@@ -55,10 +54,14 @@
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
private Integer delFlag;
- /**鐢宠鍗旾D*/
- @Excel(name = "鐢宠鍗旾D", width = 15)
- @ApiModelProperty(value = "鐢宠鍗旾D")
- private String requestId;
+ /**浜х嚎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 = "鐗╂枡缂栫爜")
@@ -67,16 +70,26 @@
@Excel(name = "鐗╂枡鍚嶇О", width = 15)
@ApiModelProperty(value = "鐗╂枡鍚嶇О")
private String materialName;
- /**鐞嗚鎷夊姩鏁伴噺*/
- @Excel(name = "鐞嗚鎷夊姩鏁伴噺", width = 15)
- @ApiModelProperty(value = "鐞嗚鎷夊姩鏁伴噺")
- private Double specifiedQuantity;
- /**瀹為檯鎷夊姩鏁伴噺*/
- @Excel(name = "瀹為檯鎷夊姩鏁伴噺", width = 15)
- @ApiModelProperty(value = "瀹為檯鎷夊姩鏁伴噺")
- private Double actualQuantity;
- /**杞﹂棿鍓╀綑鏁伴噺*/
- @Excel(name = "杞﹂棿鍓╀綑鏁伴噺", width = 15)
- @ApiModelProperty(value = "杞﹂棿鍓╀綑鏁伴噺")
- private Double remainingQuantity;
+ /**鎵规鍙�*/
+ @Excel(name = "鎵规鍙�", width = 15)
+ @ApiModelProperty(value = "鎵规鍙�")
+ private String batchNumber;
+ /**閽㈢悆灏哄*/
+ @Excel(name = "閽㈢悆灏哄", width = 15)
+ @ApiModelProperty(value = "閽㈢悆灏哄")
+ private String steelBallSize;
+ /**鏁伴噺*/
+ @Excel(name = "鏁伴噺", width = 15)
+ @ApiModelProperty(value = "鏁伴噺")
+ private BigDecimal quantity;
+ /**鍓╀綑鏁伴噺*/
+ @Excel(name = "鍓╀綑鏁伴噺", width = 15)
+ @ApiModelProperty(value = "鍓╀綑鏁伴噺")
+ private BigDecimal remainingQuantity;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String workOrderCode;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ private String equipmentName;
}
--
Gitblit v1.9.3