From d1d5454cb3512acb16a0f0e6d68e52f3ebc72e66 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 04 八月 2025 16:52:26 +0800
Subject: [PATCH] art: 生产订单列表、编辑功能修改
---
src/main/java/org/jeecg/modules/mes/entity/MesProductionOrder.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesProductionOrder.java b/src/main/java/org/jeecg/modules/mes/entity/MesProductionOrder.java
index e6e7f4d..2d2f5fa 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesProductionOrder.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesProductionOrder.java
@@ -2,7 +2,6 @@
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;
@@ -42,27 +41,23 @@
@ApiModelProperty(value = "鍒涘缓浜�")
private String createBy;
/**鍒涘缓鏃ユ湡*/
- @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")
@ApiModelProperty(value = "鏇存柊鏃ユ湡")
private Date updateTime;
/**鍒犻櫎鏍囪*/
@ApiModelProperty(value = "鍒犻櫎鏍囪")
- @TableLogic
private Integer delFlag;
/**鐢熶骇璁㈠崟鍙�*/
@ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
private String orderCode;
/**璁㈠崟绫诲瀷*/
@ApiModelProperty(value = "璁㈠崟绫诲瀷")
+ @Dict(dicCode = "production_order_category")
private String orderCategory;
/**鐗╂枡缂栧彿*/
@ApiModelProperty(value = "鐗╂枡缂栧彿")
@@ -71,28 +66,28 @@
@ApiModelProperty(value = "鐗╂枡鍚嶇О")
private String materialName;
/**璁″垝寮�濮嬫棩鏈�*/
- @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 planStart;
/**璁″垝缁撴潫鏃ユ湡*/
- @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 planEnd;
/**璁㈠崟鏁伴噺*/
@ApiModelProperty(value = "璁㈠崟鏁伴噺")
private BigDecimal orderQuantity;
- /**浜у搧鍗曚綅*/
- @Dict(dicCode = "production_unit")
- @ApiModelProperty(value = "浜у搧鍗曚綅")
+ /**鍩烘湰璁￠噺鍗曚綅*/
+ @ApiModelProperty(value = "鍩烘湰璁￠噺鍗曚綅")
private String productionUnit;
/**璁㈠崟鐘舵��*/
- @Dict(dicCode = "order_status")
@ApiModelProperty(value = "璁㈠崟鐘舵��")
private String orderStatus;
+ /**璁㈠崟鐘舵�佹弿杩�*/
+ @ApiModelProperty(value = "璁㈠崟鐘舵�佹弿杩�")
+ private String orderStatusName;
/**浼樺厛绾�*/
- @Dict(dicCode = "priority")
@ApiModelProperty(value = "浼樺厛绾�")
private String priority;
/**璁″垝宸ヨ壓璺嚎*/
@@ -148,6 +143,7 @@
this.orderQuantity = new BigDecimal(dto.getGAMNG());
this.productionUnit = dto.getGMEIN();
this.orderStatus = dto.getTXT04();
+ this.orderStatusName = dto.getTXT30();
this.priority = dto.getAPRIO();
this.processRoute = dto.getAUFPL();
this.materialListCode = dto.getSTLNR();
@@ -168,6 +164,7 @@
this.planEnd = DateUtils.str2Date(dto.getGLTRP(), DateUtils.date_sdf.get());
this.orderQuantity = new BigDecimal(dto.getGAMNG());
this.orderStatus = dto.getTXT04();
+ this.orderStatusName = dto.getTXT30();
this.priority = dto.getAPRIO();
this.orderCreateDate = dto.getUDATE();
this.orderUpdateDate = dto.getLAEDA();
--
Gitblit v1.9.3