From 7acd9609e6fd88500f6056165a021b1f6ce0f697 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 20 八月 2025 18:14:18 +0800
Subject: [PATCH] art: 物料拉动业务相关接口添加，物料拉动新增接口，表设计修改
---
src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 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..32bd01b 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,23 @@
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
private Integer delFlag;
- /**鐢宠鍗旾D*/
- @Excel(name = "鐢宠鍗旾D", width = 15)
- @ApiModelProperty(value = "鐢宠鍗旾D")
- private String requestId;
+ /**宸ュ崟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;
/**鐗╂枡缂栫爜*/
@Excel(name = "鐗╂枡缂栫爜", width = 15)
@ApiModelProperty(value = "鐗╂枡缂栫爜")
@@ -67,16 +79,19 @@
@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 BigDecimal quantity;
+ /**鍓╀綑鏁伴噺*/
+ @Excel(name = "鍓╀綑鏁伴噺", width = 15)
+ @ApiModelProperty(value = "鍓╀綑鏁伴噺")
+ private BigDecimal remainingQuantity;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String workOrderCode;
}
--
Gitblit v1.9.3