From d11feb8336d609a47695f849cc377a0a5f8dbb3b Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 26 八月 2025 15:01:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java
index af2443c..7bb3ee3 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java
@@ -1,6 +1,9 @@
package org.jeecg.modules.mes.entity;
-import com.baomidou.mybatisplus.annotation.*;
+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.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,10 +11,10 @@
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;
/**
@@ -57,16 +60,22 @@
private String requestCode;
/**宸ュ崟ID*/
@ApiModelProperty(value = "宸ュ崟ID")
+ @Dict(dictTable = "mes_production_work_order", dicText = "work_order_code", dicCode = "id")
private String workOrderId;
/**SAP棰勭暀鍙�*/
@ApiModelProperty(value = "SAP棰勭暀鍙�")
private String reservationCode;
/**鍙戝竷鐘舵��*/
- @Dict(dicCode = "publish_status")
+ @Dict(dicCode = "material_transfer_publish_status")
@ApiModelProperty(value = "鍙戝竷鐘舵��")
private String publishStatus;
+ /**鍙戝竷鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鍙戝竷鏃堕棿")
+ private Date publishTime;
/**璇锋眰鐘舵��*/
- @Dict(dicCode = "request_status")
+ @Dict(dicCode = "material_transfer_request_status")
@ApiModelProperty(value = "璇锋眰鐘舵��")
private String requestStatus;
/**璇锋眰鏃堕棿*/
@@ -74,19 +83,21 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "璇锋眰鏃堕棿")
private Date requestTime;
- /**鍘熷簱瀛樺湴*/
- @ApiModelProperty(value = "鍘熷簱瀛樺湴")
+ /**璧疯繍搴撳瓨鍦�*/
+ @ApiModelProperty(value = "璧疯繍搴撳瓨鍦�")
+ @Dict(dicCode = "original_warehouse_list")
private String originalWarehouseId;
/**鐩爣搴撳瓨鍦�*/
@ApiModelProperty(value = "鐩爣搴撳瓨鍦�")
+ @Dict(dictTable = "base_line_side_warehouse", dicText = "warehouse_name", dicCode = "id")
private String targetWarehouseId;
/**浼樺厛绾э紙鎷夊姩绫诲瀷锛�*/
@Dict(dicCode = "material_transfer_category")
@ApiModelProperty(value = "鎷夊姩绫诲瀷")
private String materialTransferCategory;
/**鏈�鏅氶厤閫佹椂闂�*/
- @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")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "鏈�鏅氶厤閫佹椂闂�")
private Date latestDeliveryTime;
/**鐗╂枡缂栫爜*/
@@ -97,21 +108,8 @@
private String materialName;
/**鐞嗚鎷夊姩鏁伴噺*/
@ApiModelProperty(value = "鐞嗚鎷夊姩鏁伴噺")
- private Double specifiedQuantity;
+ private BigDecimal specifiedQuantity;
/**瀹為檯鎷夊姩鏁伴噺*/
@ApiModelProperty(value = "瀹為檯鎷夊姩鏁伴噺")
- private Double actualQuantity;
- /**杞﹂棿鍓╀綑鏁伴噺*/
- @ApiModelProperty(value = "杞﹂棿鍓╀綑鏁伴噺")
- private Double remainingQuantity;
-
- @TableField(exist = false)
- @ApiModelProperty(value = "宸ュ崟鍙�")
- private String workOrderCode;
- @TableField(exist = false)
- @ApiModelProperty(value = "鐩爣搴撳瓨鍦�")
- private String targetWarehouseName;
- @TableField(exist = false)
- @ApiModelProperty(value = "鍘熷簱瀛樺湴")
- private String originalWarehouseName;
+ private BigDecimal actualQuantity;
}
--
Gitblit v1.9.3