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/pms/entity/PmsMaterialProcess.java | 67 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 35 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/pms/entity/PmsMaterialProcess.java b/src/main/java/org/jeecg/modules/pms/entity/PmsMaterialProcess.java
index 86974f7..0a341d6 100644
--- a/src/main/java/org/jeecg/modules/pms/entity/PmsMaterialProcess.java
+++ b/src/main/java/org/jeecg/modules/pms/entity/PmsMaterialProcess.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;
@@ -10,8 +9,7 @@
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.jeecg.modules.sap.dto.OrderProcessDTO;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -20,65 +18,64 @@
/**
* @Description: 鐗╂枡宸ュ簭
* @Author: jeecg-boot
- * @Date: 2025-07-01
+ * @Date: 2025-07-01
* @Version: V1.0
*/
@Data
@TableName("pms_material_process")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="pms_material_process瀵硅薄", description="鐗╂枡宸ュ簭")
+@ApiModel(value = "pms_material_process瀵硅薄", description = "鐗╂枡宸ュ簭")
public class PmsMaterialProcess 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)
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- @TableLogic
- private Integer delFlag;
- /**鐗╂枡缂栫爜*/
- @Excel(name = "鐗╂枡缂栫爜", width = 15)
+ /**鐢熶骇璁㈠崟ID*/
+ @ApiModelProperty(value = "鐢熶骇璁㈠崟ID")
+ private String orderId;
+ /**鐗╂枡缂栫爜*/
@ApiModelProperty(value = "鐗╂枡缂栫爜")
private String materialNumber;
- /**鐗╂枡鍚嶇О*/
- @Excel(name = "鐗╂枡鍚嶇О", width = 15)
+ /**鐗╂枡鍚嶇О*/
@ApiModelProperty(value = "鐗╂枡鍚嶇О")
private String materialName;
- /**浜х嚎ID(SAP宸ヤ綔涓績)*/
- @Excel(name = "浜х嚎ID(SAP宸ヤ綔涓績)", width = 15)
- @ApiModelProperty(value = "浜х嚎ID(SAP宸ヤ綔涓績)")
- @Dict(dictTable = "base_factory", dicCode = "id", dicText = "factory_name")
- private String factoryId;
- /**宸ュ簭鍙�*/
- @Excel(name = "宸ュ簭鍙�", width = 15)
+ /**宸ュ簭鍙�*/
@ApiModelProperty(value = "宸ュ簭鍙�")
private String processCode;
- /**宸ュ簭鍚嶇О*/
- @Excel(name = "宸ュ簭鍚嶇О", width = 15)
+ /**宸ュ簭鍚嶇О*/
@ApiModelProperty(value = "宸ュ簭鍚嶇О")
private String processName;
- /**鎺у埗鐮�*/
- @Excel(name = "鎺у埗鐮�", width = 15)
+ /**鎺у埗鐮�*/
@ApiModelProperty(value = "鎺у埗鐮�")
private String controlCode;
+
+ public PmsMaterialProcess(){}
+
+ public PmsMaterialProcess(String orderId, String materialName, OrderProcessDTO dto) {
+ this.orderId = orderId;
+ this.materialNumber = dto.getMATNR();
+ this.materialName = materialName;
+ this.processCode = dto.getVORNR();
+ this.processName = dto.getLTXA1();
+ this.controlCode = dto.getSTEUS();
+ }
}
--
Gitblit v1.9.3