From 105d6b807d69eb95b3426f5cf6e87a8ff7b0611c Mon Sep 17 00:00:00 2001
From: 吴健 <14790700720@163.com>
Date: 星期三, 14 五月 2025 10:34:45 +0800
Subject: [PATCH] first-add
---
billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java | 51 +++++++++++++++++----------------------------------
1 files changed, 17 insertions(+), 34 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java b/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java
index 2358d59..1493824 100644
--- a/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java
+++ b/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.billion.common.annotation.Excel;
+import com.billion.main.common.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -14,18 +15,15 @@
* @date 2024-11-20
*/
@Data
-public class OmProductionOrderInfo
+public class OmProductionOrderInfo extends BaseEntity
{
- @TableId
- /** 涓婚敭id */
- private Long id;
/** 宸ュ崟缂栧彿 */
- @Excel(name = "宸ュ崟缂栧彿")
+// @Excel(name = "宸ュ崟缂栧彿")
private String workOrderNo;
/** 璁㈠崟缂栧彿 */
- @Excel(name = "璁㈠崟缂栧彿")
+// @Excel(name = "璁㈠崟缂栧彿")
private String salesOrderCode;
/** 浜у搧缂栧彿 */
@@ -33,7 +31,7 @@
private String productCode;
/** 浜х嚎缂栧彿 */
- @Excel(name = "浜х嚎缂栧彿")
+// @Excel(name = "浜х嚎缂栧彿")
private String lineCode;
/** 璁″垝鏁伴噺 */
@@ -41,46 +39,31 @@
private Long planQty;
/** 璁″垝寮�濮嬫椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璁″垝寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "璁″垝寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd")
private Date planStartTime;
/** 璁″垝缁撴潫鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璁″垝缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+// @Excel(name = "璁″垝缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date planEndTime;
/** 宸ュ崟鐘舵�侊紙1鏈紑濮�2鐢熶骇涓�3宸插畬鎴�4宸插叧闂級 */
- @Excel(name = "宸ュ崟鐘舵��", readConverterExp = "1=鏈紑濮�,2=鐢熶骇涓�,3=宸插畬鎴�,4=宸插叧闂�")
+// @Excel(name = "宸ュ崟鐘舵��", readConverterExp = "1=鏈紑濮�,2=鐢熶骇涓�,3=宸插畬鎴�,4=宸插叧闂�")
private String orderStatus;
/** 澶囨敞 */
@Excel(name = "澶囨敞")
private String remarks;
- /** 鍙戝姩鏈哄瀷鍙� */
- @Excel(name = "鍙戝姩鏈哄瀷鍙�")
- private String engineType;
+// /** 鍙戝姩鏈哄瀷鍙� */
+// @Excel(name = "鍙戝姩鏈哄瀷鍙�")
+// private String engineType;
+//
+// /** 鏈哄瀷 */
+// @Excel(name = "鏈哄瀷")
+// private String engineName;
- /** 鏈哄瀷 */
- @Excel(name = "鏈哄瀷")
- private String engineName;
- /** 璁㈠崟鐘舵�� */
- @Excel(name = "璁㈠崟鐘舵��")
- private String flag;
- /** 鍒涘缓鑰� */
- private String createBy;
-
- /** 鍒涘缓鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /** 鏇存柊鑰� */
- private String updateBy;
-
- /** 鏇存柊鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
}
--
Gitblit v1.9.3