From 399e7d565f19f59a8da82277da8f3eab527c2c56 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 09 九月 2025 19:40:20 +0800
Subject: [PATCH] art: 上料接口，上下料查询接口
---
src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java | 93 +++++++++++++++++++++++++++-------------------
1 files changed, 55 insertions(+), 38 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..c062cc9 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java
@@ -1,82 +1,99 @@
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
@TableName("mes_material_loading")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="mes_material_loading瀵硅薄", description="涓婃枡")
+@ApiModel(value = "mes_material_loading瀵硅薄", description = "涓婃枡")
public class MesMaterialLoading implements Serializable {
private static final long serialVersionUID = 1L;
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
private String id;
- /**鍒涘缓浜�*/
+ /**鍒涘缓浜�*/
@ApiModelProperty(value = "鍒涘缓浜�")
private String createBy;
- /**鍒涘缓鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ /**鍒涘缓鏃ユ湡*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鍒涘缓鏃ユ湡")
private Date createTime;
- /**鏇存柊浜�*/
+ /**鏇存柊浜�*/
@ApiModelProperty(value = "鏇存柊浜�")
private String updateBy;
- /**鏇存柊鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ /**鏇存柊鏃ユ湡*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鏇存柊鏃ユ湡")
private Date updateTime;
- /**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ /**鍒犻櫎鏍囪*/
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
private Integer delFlag;
- /**鐢宠鍗旾D*/
- @Excel(name = "鐢宠鍗旾D", width = 15)
- @ApiModelProperty(value = "鐢宠鍗旾D")
- private String requestId;
- /**鐗╂枡缂栫爜*/
- @Excel(name = "鐗╂枡缂栫爜", width = 15)
+ /**浜х嚎ID*/
+ @Excel(name = "浜х嚎ID", width = 15)
+ @ApiModelProperty(value = "浜х嚎ID")
+ @Dict(dictTable = "base_factory", dicCode = "id", dicText = "factory_name")
+ private String factoryId;
+ /**搴撳瓨鍦癐D*/
+ @Excel(name = "搴撳瓨鍦癐D", width = 15)
+ @ApiModelProperty(value = "搴撳瓨鍦癐D")
+ @Dict(dictTable = "base_line_side_warehouse", dicCode = "id", dicText = "warehouse_name")
+ private String warehouseId;
+ /**鐗╂枡缂栫爜*/
+ @Excel(name = "鐗╂枡缂栫爜", width = 15)
@ApiModelProperty(value = "鐗╂枡缂栫爜")
private String materialNumber;
- /**鐗╂枡鍚嶇О*/
- @Excel(name = "鐗╂枡鍚嶇О", width = 15)
+ /**鐗╂枡鍚嶇О*/
+ @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 = "閽㈢悆灏哄")
+ @Dict(dicCode = "steel_ball_size")
+ private String steelBallSize;
+ /**鏁伴噺*/
+ @Excel(name = "鏁伴噺", width = 15)
+ @ApiModelProperty(value = "鏁伴噺")
+ private BigDecimal quantity;
+ /**鍓╀綑鏁伴噺*/
+ @Excel(name = "鍓╀綑鏁伴噺", width = 15)
+ @ApiModelProperty(value = "鍓╀綑鏁伴噺")
+ private BigDecimal remainingQuantity;
+ /**涓嬫枡鏍囪*/
+ @Excel(name = "涓嬫枡鏍囪", width = 15)
+ @ApiModelProperty(value = "涓嬫枡鏍囪")
+ private String unloadingFlag;
+ /** 鍒嗙被 */
+ @TableField(exist = false)
+ private String category;
}
--
Gitblit v1.9.3