From cbec6e3f120344f6f2d69808aaabb447bb52a693 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 22 八月 2024 09:45:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java | 40 +++++++++++-----------------------------
1 files changed, 11 insertions(+), 29 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 b0b4078..01258d3 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,14 +28,6 @@
private String project;
/**
- * 娴佺▼鍗″彿
- */
- private String processId;
- /**
- * 璁㈠崟搴忓彿
- */
- private String orderNumber;
- /**
* 浜у搧鍚嶇О
*/
private String productName;
@@ -43,40 +35,30 @@
/**
* 瀹�
*/
- private double width;
+ private String width;
/**
* 楂�
*/
- private double height;
+ private String height;
/**
* 闈㈢Н
*/
private double area;
- /**
- * 鏁伴噺
- */
- private Integer quantity;
- /**
- * 琛ョ墖鏁伴噺
- */
- private Integer numberPatches;
- /**
- * 宸插叆鏁伴噺
- */
- private Integer receivedQuantity;
- /**
- * 鐢熶骇鐘舵��
- */
- private Integer terminationStatus;
+
+
/**
* 鍖呰鏂瑰紡
*/
- private String packType;
+ private Integer quantity;
/**
- * 宸ョ▼鍙�
+ * 鐘舵��
*/
- private String projectNo;
+ private String processingNote;
+ /**
+ * 閫佽揣鏃堕棿
+ */
+ private String deliveryDate;
--
Gitblit v1.8.0