From 8b43954926db6b4df6a61ab6e04d6cb11189069d Mon Sep 17 00:00:00 2001
From: 吴健 <14790700720@163.com>
Date: 星期二, 15 四月 2025 08:54:08 +0800
Subject: [PATCH] add-415
---
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java | 171 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 107 insertions(+), 64 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
index 54f74a6..c143f10 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
@@ -1,11 +1,14 @@
package com.jcdm.main.om.productionOrde.domain;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import com.jcdm.common.annotation.Excel;
import com.jcdm.common.core.domain.BaseEntity;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
/**
* 鐢熶骇宸ュ崟瀵硅薄 om_production_orde_info
@@ -13,6 +16,7 @@
* @author ruimin
* @date 2023-12-11
*/
+@Data
public class OmProductionOrdeInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -20,64 +24,92 @@
/** ID */
private Long id;
+
+
+ @Excel(name = "鐢熶骇閫氱煡鍗�")
+ private String productionNotice;
/** 鐢熶骇宸ュ崟鍙� */
- @Excel(name = "鐢熶骇宸ュ崟鍙�")
+ @Excel(name = "鐢熶骇璁㈠崟")
private String workOrderNo;
- /** 璁㈠崟缂栧彿 */
- @Excel(name = "璁㈠崟缂栧彿")
- private String salesOrderCode;
+ @TableField(exist = false)
+ private Long workOrderNoLong;
- /** 浜у搧缂栧彿 */
- @Excel(name = "浜у搧缂栧彿")
- private String productCode;
- /** 浜у搧鍚嶇О */
- @Excel(name = "浜у搧鍚嶇О")
- private String productName;
-
- /** 杞﹂棿缂栧彿 */
- @Excel(name = "杞﹂棿缂栧彿")
- private String workshopCode;
-
- /** 浜х嚎缂栧彿 */
- @Excel(name = "浜х嚎缂栧彿")
- private String lineCode;
-
- /** 宸ヨ壓娴佺▼ */
- @Excel(name = "宸ヨ壓娴佺▼")
- private String routeCode;
-
- /** 浜у搧BOM */
- @Excel(name = "浜у搧BOM")
- private String bomCode;
-
- /** 宸ヨ壓閰嶆柟 */
- @Excel(name = "宸ヨ壓閰嶆柟")
- private String recipeCode;
+ @Excel(name = "杞﹀瀷")
+ private String typeZ;
/** 璁″垝鏁伴噺 */
@Excel(name = "璁″垝鏁伴噺")
private Long planQty;
+ /** 浜у搧缂栧彿 */
+ @Excel(name = "浜у搧缂栧彿")
+ private String productCode;
+
+
+ /** 闇�姹傛棩鏈� */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "寮�宸ユ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date demandDate;
+
+
+
+ /** 宸ュ崟鐘舵�侊紙1鍒涘缓銆�2宸插彂甯冦��3鐢熶骇涓��4宸插喕缁撱��5宸插畬宸ャ��6宸插叧闂級 */
+ @Excel(name = "宸ュ崟鐘舵��", readConverterExp = "1=寰呬笅杈�,2=宸蹭笅杈�,3=宸插畬鎴�")
+ private String orderStatus;
+
+ /** 杞﹂棿缂栧彿 */
+ @Excel(name = "宸ュ巶缂栧彿")
+ private String workshopCode;
+
+
+ /** 鍒涘缓浜� */
+ @Excel(name = "鍒涘缓浜�")
+ private String createUser;
+
+
+ /** 浜у搧鍚嶇О */
+ @Excel(name = "鎴愬搧鎻忚堪")
+ private String productName;
+
+ /** 璁㈠崟缂栧彿 */
+
+ private String salesOrderCode;
+
+
+ /** 浜х嚎缂栧彿 */
+ private String lineCode;
+
+ /** 宸ヨ壓娴佺▼ */
+ private String routeCode;
+
+ /** 浜у搧BOM */
+ private String bomCode;
+
+ /** 宸ヨ壓閰嶆柟 */
+ private String recipeCode;
+
+
+
/** 瀹為檯鏁伴噺 */
- @Excel(name = "瀹為檯鏁伴噺")
+
private Long actualQty;
/** 涓嶈壇鏁伴噺 */
- @Excel(name = "涓嶈壇鏁伴噺")
+
private Long badQty;
/** 鎶ュ簾鏁伴噺 */
- @Excel(name = "鎶ュ簾鏁伴噺")
+
private Long scrapQty;
/** 杩斾慨鏁伴噺 */
- @Excel(name = "杩斾慨鏁伴噺")
+
private Long repairQty;
/** 瀹為檯涓婄嚎鏁伴噺 */
- @Excel(name = "瀹為檯涓婄嚎鏁伴噺")
+
private Long actualOnlineQty;
/** 涓婄嚎瀹屽伐鏍囪 */
@@ -85,68 +117,48 @@
private Long frontEndId;
- /** 闇�姹傛棩鏈� */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "闇�姹傛棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
- private Date demandDate;
+
/** 璁″垝寮�濮嬫椂闂� */
- @Excel(name = "璁″垝寮�濮嬫椂闂�")
private String planStartTime;
/** 璁″垝缁撴潫鏃堕棿 */
- @Excel(name = "璁″垝缁撴潫鏃堕棿")
+
private String planEndTime;
/** 瀹為檯寮�濮嬫椂闂� */
- @Excel(name = "瀹為檯寮�濮嬫椂闂�")
private String actualStartTime;
/** 瀹為檯缁撴潫鏃堕棿 */
- @Excel(name = "瀹為檯缁撴潫鏃堕棿")
private String actualEndTime;
/** 椤哄簭鍙� */
- @Excel(name = "椤哄簭鍙�")
private Long serialNumber;
- /** 宸ュ崟鐘舵�侊紙1鍒涘缓銆�2宸插彂甯冦��3鐢熶骇涓��4宸插喕缁撱��5宸插畬宸ャ��6宸插叧闂級 */
- @Excel(name = "宸ュ崟鐘舵��", readConverterExp = "1=鍒涘缓銆�2宸插彂甯冦��3鐢熶骇涓��4宸插喕缁撱��5宸插畬宸ャ��6宸插叧闂�")
- private String orderStatus;
- /** 鍒涘缓浜� */
- @Excel(name = "鍒涘缓浜�")
- private String createUser;
+
/** 淇敼浜� */
- @Excel(name = "淇敼浜�")
private String updateUser;
/** 澶囨敞 */
- @Excel(name = "澶囨敞")
private String remarks;
/** 娴佹按鍙� */
- @Excel(name = "娴佹按鍙�")
private String streamNumber;
/** 瀹㈡埛 */
- @Excel(name = "瀹㈡埛")
private String custom;
/** 甯傚満鍖哄煙缂栫爜 */
- @Excel(name = "甯傚満鍖哄煙缂栫爜")
private String marketAreaCode;
/** 杞欢鐗堟湰缂栫爜 */
- @Excel(name = "杞欢鐗堟湰缂栫爜")
private String softwareVersionCode;
/** 浜у搧鍏徃缂栫爜 */
- @Excel(name = "浜у搧鍏徃缂栫爜")
private String productCompanyCode;
- @Excel(name = "绉嶇被")
- private String typeZ;
+
private String typeL;
@@ -171,6 +183,38 @@
private String dateTimeRule;
private String startCode;
+ private String[] dateConditions;
+
+ private String startTime;
+
+ private String endTime;
+
+ @TableField(exist = false)
+ private String engineNo;
+
+ public String[] getDateConditions() {
+ return dateConditions;
+ }
+
+ public void setDateConditions(String[] dateConditions) {
+ this.dateConditions = dateConditions;
+ }
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
public String getDateTimeRule() {
return dateTimeRule;
@@ -189,8 +233,7 @@
}
/** 鐢熶骇閫氱煡鍗曞彿 */
- @Excel(name = "鐢熶骇閫氱煡鍗曞彿")
- private String productionNotice;
+
public String getProductionNotice() {
return productionNotice;
--
Gitblit v1.9.3