From f306557dbcfc1583a45e26d86fdfe0aa4b446fb4 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期三, 14 五月 2025 18:45:04 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java | 67 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
index 087713f..b92f664 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
@@ -5,8 +5,6 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import java.io.Serial;
import java.math.BigDecimal;
@@ -29,16 +27,16 @@
private Long id;
/** 涓昏鍒掑憳 */
- @Excel(name = "涓昏鍒�")
+// @Excel(name = "涓昏鍒�")
private String masterPlanner;
/** 鍛ㄦ棩 */
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍛ㄦ棩", width = 30, dateFormat = "yyyy-MM-dd")
+// @Excel(name = "鍛ㄦ棩", width = 30, dateFormat = "yyyy-MM-dd")
private Date weekDay;
/** 鍛ㄥ害 */
- @Excel(name = "鍛ㄥ害")
+// @Excel(name = "鍛ㄥ害")
private String weekCycle;
/** 涓讳欢鏂欏彿 */
@@ -46,7 +44,7 @@
private String mainPartNumber;
/** 涓讳欢鍥惧彿 */
- @Excel(name = "涓讳欢鍥惧彿")
+// @Excel(name = "涓讳欢鍥惧彿")
private String mainPartDrawingNumber;
/** 瀹㈡埛鍚嶇О */
@@ -78,7 +76,7 @@
private String drawingNo;
/** 鐗堟湰鍙� */
- @Excel(name = "鐗堟湰鍙�")
+// @Excel(name = "鐗堟湰鍙�")
private String versionNumber;
/** 鐢熶骇鏁伴噺 */
@@ -86,7 +84,7 @@
private BigDecimal productionQuantity;
/** 鑹搧鏁伴噺 */
- @Excel(name = "鑹搧鏁伴噺")
+// @Excel(name = "鑹搧鏁伴噺")
private BigDecimal goodProductsQuantity;
/** 宸ュ簭鍙� */
@@ -98,12 +96,12 @@
private String workCenter;
/** 鎵�灞為儴闂� */
- @Excel(name = "鎵�灞為儴闂�")
+// @Excel(name = "鎵�灞為儴闂�")
private String department;
/** 璁″垝寮�宸ユ棩 */
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd")
+// @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd")
private Date planStartDay;
/** 璁″垝瀹屽伐鏃� */
@@ -112,27 +110,27 @@
private Date planEndDay;
/** 澶囨枡鏂欏彿 */
- @Excel(name = "澶囨枡鏂欏彿")
+// @Excel(name = "澶囨枡鏂欏彿")
private String standbyNumber;
/** 澶囨枡鍚嶇О */
- @Excel(name = "澶囨枡鍚嶇О")
+// @Excel(name = "澶囨枡鍚嶇О")
private String standbyName;
/** 澶囨枡搴撳瓨 */
- @Excel(name = "澶囨枡搴撳瓨")
+// @Excel(name = "澶囨枡搴撳瓨")
private Integer standbyStock;
/** 涓嬮亾宸ュ簭鎵�灞為儴闂� */
- @Excel(name = "涓嬮亾宸ュ簭鎵�灞為儴闂�")
+// @Excel(name = "涓嬮亾宸ュ簭鎵�灞為儴闂�")
private String nextProcessDeparment;
/** 鏄惁鎸傝捣 */
- @Excel(name = "鏄惁鎸傝捣")
+// @Excel(name = "鏄惁鎸傝捣")
private String isSuspended;
/** 澶栧崗鏍囪瘑 */
- @Excel(name = "澶栧崗鏍囪瘑")
+// @Excel(name = "澶栧崗鏍囪瘑")
private String isOutsourcing;
/** 璐﹀ */
@@ -140,36 +138,36 @@
private String account;
/** 涓婇樁鐗╂枡 */
- @Excel(name = "涓婇樁鐗╂枡")
+// @Excel(name = "涓婇樁鐗╂枡")
private String advancedMaterials;
/** 涓婇樁鍗曟嵁鍙� */
- @Excel(name = "涓婇樁鍗曟嵁鍙�")
+// @Excel(name = "涓婇樁鍗曟嵁鍙�")
private String advancedDocumentNumber;
/** 涓婇樁闇�姹傛棩鏈� */
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "涓婇樁闇�姹傛棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+// @Excel(name = "涓婇樁闇�姹傛棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
private Date advancedRequirementDay;
/** 璁″垝榻愬 */
- @Excel(name = "璁″垝榻愬")
+// @Excel(name = "璁″垝榻愬")
private Integer isPlanComplete;
/** 搴撳瓨榻愬 */
- @Excel(name = "搴撳瓨榻愬")
+// @Excel(name = "搴撳瓨榻愬")
private Integer isStockComplete;
/** 鏄惁鏈夋姌杩斿伐搴� */
- @Excel(name = "鏄惁鏈夋姌杩斿伐搴�")
+// @Excel(name = "鏄惁鏈夋姌杩斿伐搴�")
private Integer hasTurnback;
/** 椋庨櫓鏍囪瘑 */
- @Excel(name = "椋庨櫓鏍囪瘑")
+// @Excel(name = "椋庨櫓鏍囪瘑")
private Integer hasRisk;
/** 浣滀笟锛堝伐搴忓悕绉帮級 */
- @Excel(name = "浣滀笟")
+// @Excel(name = "浣滀笟")
private String stdOp;
/** 宸ュ巶 */
@@ -177,16 +175,16 @@
private String plant;
/** 褰撳墠宸ュ簭鐘舵�� */
- @Excel(name = "褰撳墠宸ュ簭鐘舵��")
+// @Excel(name = "褰撳墠宸ュ簭鐘舵��")
private String opStatus;
/** 涓嬩竴宸ュ簭鍚嶇О */
- @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
+// @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
private String nextOpName;
/** 宸ュ崟鍒涘缓鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+// @Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderCreateTime;
/** 鑷畾涔夋椂闂� */
@@ -195,8 +193,18 @@
// private Date customTime;
/** 鐢熶骇鍩哄湴 */
- @Excel(name = "鐢熶骇鍩哄湴")
+// @Excel(name = "鐢熶骇鍩哄湴")
private String productionBase;
+
+ /** 宸ュ崟瀹℃牳鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// @Excel(name = "宸ュ崟瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date approveOn;
+
+ /** 宸ュ崟寮�宸ユ椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// @Excel(name = "宸ュ崟寮�宸ユ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date startWorkDate;
/** 鏈尮閰嶇殑鐢熶骇鏁伴噺*/
private BigDecimal unmatchedQuantity;
@@ -207,6 +215,9 @@
private String requireId;
private Integer version;
+
+ /** 浣庨樁鐮�*/
+ private String lowOrderCode;
/*
public String getOpStatus() {
return opStatus;
--
Gitblit v1.9.3