From 51eb318f6df9ebc7d1ff47522e33b2ee7cea1ba8 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期日, 09 三月 2025 16:30:44 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 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 82b1fb1..9d67aa0 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
@@ -1,5 +1,6 @@
package com.billion.main.om.domain;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.billion.common.annotation.Excel;
import com.billion.main.common.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -16,6 +17,10 @@
@Data
public class OmProductionOrderInfo extends BaseEntity
{
+ @TableId
+ /** 涓婚敭id */
+ private Long id;
+
/** 宸ュ崟缂栧彿 */
@Excel(name = "宸ュ崟缂栧彿")
private String workOrderNo;
@@ -35,20 +40,39 @@
/** 璁″垝鏁伴噺 */
@Excel(name = "璁″垝鏁伴噺")
private Long planQty;
+ /** 璁″垝鏁伴噺 */
+ @Excel(name = "缂镐綋鏁伴噺")
+ private Long bodyQty;
+ /** 璁″垝鏁伴噺 */
+ @Excel(name = "缂哥洊鏁伴噺")
+ private Long headQty;
+ /** 璁″垝鏁伴噺 */
+ @Excel(name = "棰勮鏁伴噺")
+ private Long preQty;
/** 璁″垝寮�濮嬫椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "璁″垝寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁″垝寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date planStartTime;
/** 璁″垝缁撴潫鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "璁″垝缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁″垝缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date planEndTime;
/** 宸ュ崟鐘舵�侊紙1鏈紑濮�2鐢熶骇涓�3宸插畬鎴�4宸插叧闂級 */
@Excel(name = "宸ュ崟鐘舵��", readConverterExp = "1=鏈紑濮�,2=鐢熶骇涓�,3=宸插畬鎴�,4=宸插叧闂�")
private String orderStatus;
+
+ /** 宸ュ崟鐘舵�侊紙1鏈紑濮�2鐢熶骇涓�3宸插畬鎴�4宸插叧闂級 */
+ @Excel(name = "宸ュ崟缂镐綋鐘舵��", readConverterExp = "1=鏈紑濮�,2=鐢熶骇涓�,3=宸插畬鎴�,4=宸插叧闂�")
+ private String bodyStatus;
+ /** 宸ュ崟鐘舵�侊紙1鏈紑濮�2鐢熶骇涓�3宸插畬鎴�4宸插叧闂級 */
+ @Excel(name = "宸ュ崟缂哥洊鐘舵��", readConverterExp = "1=鏈紑濮�,2=鐢熶骇涓�,3=宸插畬鎴�,4=宸插叧闂�")
+ private String headStatus;
+ /** 宸ュ崟鐘舵�侊紙1鏈紑濮�2鐢熶骇涓�3宸插畬鎴�4宸插叧闂級 */
+ @Excel(name = "宸ュ崟棰勮鐘舵��", readConverterExp = "1=鏈紑濮�,2=鐢熶骇涓�,3=宸插畬鎴�,4=宸插叧闂�")
+ private String preStatus;
/** 澶囨敞 */
@Excel(name = "澶囨敞")
@@ -56,7 +80,7 @@
/** 鍙戝姩鏈哄瀷鍙� */
@Excel(name = "鍙戝姩鏈哄瀷鍙�")
- private String engineTye;
+ private String engineType;
/** 鏈哄瀷 */
@Excel(name = "鏈哄瀷")
@@ -65,7 +89,22 @@
/** 璁㈠崟鐘舵�� */
@Excel(name = "璁㈠崟鐘舵��")
private String flag;
+ /** 鍒涘缓鑰� */
+ private String createBy;
- public void setPlanStartTime(String startTime) {
- }
+ /** 鍒涘缓鏃堕棿 */
+ @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;
+
+ /** 閫昏緫鍒犻櫎 */
+ @Excel(name = "鏈哄瀷")
+ private String delFlag;
+
}
--
Gitblit v1.9.3