From 4f1992787c2ec1371ef499c47461bd82a70d07c4 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 27 八月 2024 09:18:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 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 01258d3..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 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