From 986de1ea52ea40a848a8e8ffe478122850bb03a2 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 13 八月 2024 09:36:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrAssemblyPlan.java |   12 ++++++++++++
 1 files changed, 12 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 5b0ec9a..ab3bcf3 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
@@ -50,6 +50,9 @@
     @NotNull(message = "鐢熶骇娴佺▼瀹炰綋缂栧彿涓嶈兘涓虹┖")
     public Long processId;
 
+    @TableField(exist = false)
+    public PrProductionProcess process;
+
     /**
      * 鍚嶇О
      */
@@ -69,6 +72,15 @@
     public Integer status;
 
     /**
+     * 鎶曞叆鐢熶骇鏁伴噺
+     */
+    public Integer inputNumber;
+    /**
+     * 浜у嚭鏁伴噺
+     */
+    public Integer outputNumber;
+
+    /**
      * 鍒涘缓浜�
      */
     @JSONField(serializeUsing= ObjectWriterImplToString.class)

--
Gitblit v1.8.0