From c377d90fe2a01c2118f6c69c3c177f75be7c318b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 29 十一月 2024 15:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java
index 0d667e2..b0b4078 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java
@@ -28,6 +28,14 @@
private String project;
/**
+ * 娴佺▼鍗″彿
+ */
+ private String processId;
+ /**
+ * 璁㈠崟搴忓彿
+ */
+ private String orderNumber;
+ /**
* 浜у搧鍚嶇О
*/
private String productName;
@@ -35,30 +43,40 @@
/**
* 瀹�
*/
- private String width;
+ private double width;
/**
* 楂�
*/
- private String height;
+ private double height;
/**
* 闈㈢Н
*/
- private Double area;
-
-
+ private double area;
/**
- * 鍖呰鏂瑰紡
+ * 鏁伴噺
*/
private Integer quantity;
/**
- * 鐘舵��
+ * 琛ョ墖鏁伴噺
*/
- private String processingNote;
+ private Integer numberPatches;
/**
- * 閫佽揣鏃堕棿
+ * 宸插叆鏁伴噺
*/
- private String deliveryDate;
+ private Integer receivedQuantity;
+ /**
+ * 鐢熶骇鐘舵��
+ */
+ private Integer terminationStatus;
+ /**
+ * 鍖呰鏂瑰紡
+ */
+ private String packType;
+ /**
+ * 宸ョ▼鍙�
+ */
+ private String projectNo;
--
Gitblit v1.8.0