From 2331d50cf12f0b8c882e6850d3a6a11baf4985e6 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 24 九月 2024 14:30:48 +0800
Subject: [PATCH] 接口中添加产品类型字段

---
 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java
index e6c5281..d14dc6a 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java
@@ -38,6 +38,15 @@
     public Long proId;
 
     /**
+     * 浜у搧瀹炰綋缂栧彿
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    public Long orderId;
+
+    @TableField(exist = false)
+    public String orderName;
+
+    /**
      * 鎵规瀹炰綋缂栧彿
      */
     @JSONField(serializeUsing= ObjectWriterImplToString.class)
@@ -49,6 +58,9 @@
     @JSONField(serializeUsing= ObjectWriterImplToString.class)
     @NotNull(message = "鐢熶骇娴佺▼瀹炰綋缂栧彿涓嶈兘涓虹┖")
     public Long processId;
+
+    @TableField(exist = false)
+    public PrProductionProcess process;
 
     /**
      * 鍚嶇О
@@ -65,7 +77,17 @@
     /**
      * 鐘舵��:姝e父(1)銆佹殏鍋�(0)銆佺粨鏉�(-1)
      */
+    @NotNull(message = "鐘舵�佷笉鑳戒负绌�")
     public Integer status;
+
+    /**
+     * 鎶曞叆鐢熶骇鏁伴噺
+     */
+    public Integer inputNumber;
+    /**
+     * 浜у嚭鏁伴噺
+     */
+    public Integer outputNumber;
 
     /**
      * 鍒涘缓浜�
@@ -77,7 +99,11 @@
     @TableField(exist = false)
     public String proName;
     @TableField(exist = false)
+    public String proType;
+    @TableField(exist = false)
     public String batchNo;
+    @TableField(exist = false)
+    public String processName;
 
     /**
      * 鍒涘缓鏃堕棿
@@ -93,6 +119,7 @@
     /**
      * 缁撴潫鏃ユ湡
      */
+    @NotEmpty(message = "缁撴潫鏃ユ湡涓嶈兘涓虹┖")
     public String endDate;
 
     /**

--
Gitblit v1.8.0