From 4a2a16389f4439b67e5f921535d649b2b407bb75 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Thu, 26 Sep 2024 11:24:22 +0800
Subject: [PATCH] =?UTF-8?q?2024.9.26=20=E4=B8=80=E3=80=81=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=88=90=E6=9C=AC=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=20=E4=BA=8C=E3=80=81=E5=8A=A0=E5=B7=A5=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=94=B9=E9=80=A0=20=E4=B8=89=E3=80=81?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B7=A5=E5=BA=8F=20=E5=9B=9B=E3=80=81?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E7=BB=84=20-=20=E6=A0=87=E5=87=86=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F=20=E4=BA=94=E3=80=81=E5=95=86=E5=93=81=E7=BB=84=20-?=
 =?UTF-8?q?=20Process=20Time=20Matrix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

功能修正
---
 .../sys/modules/part/data/PartGroupStdOperationsData.java   | 6 ++++++
 .../sys/modules/part/data/StandardRoutingOperationData.java | 4 ++--
 .../resources/mapper/part/PartGroupStdOperationsMapper.xml  | 2 ++
 .../resources/mapper/part/PtmConditionProcessMapper.xml     | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/part/data/PartGroupStdOperationsData.java b/src/main/java/com/xujie/sys/modules/part/data/PartGroupStdOperationsData.java
index 8706efce..851f2a5e 100644
--- a/src/main/java/com/xujie/sys/modules/part/data/PartGroupStdOperationsData.java
+++ b/src/main/java/com/xujie/sys/modules/part/data/PartGroupStdOperationsData.java
@@ -93,6 +93,12 @@ public class PartGroupStdOperationsData implements Serializable {
     @TableField(exist = false)
     private BigDecimal machCycleTime;
 
+    @TableField(exist = false)
+    private Double setupCrewSize;
+
+    @TableField(exist = false)
+    private Double crewSize;
+
     @TableField(exist = false)
     private Integer partGroupStdOperationsId;
 
diff --git a/src/main/java/com/xujie/sys/modules/part/data/StandardRoutingOperationData.java b/src/main/java/com/xujie/sys/modules/part/data/StandardRoutingOperationData.java
index 999ff7b1..48da7ad5 100644
--- a/src/main/java/com/xujie/sys/modules/part/data/StandardRoutingOperationData.java
+++ b/src/main/java/com/xujie/sys/modules/part/data/StandardRoutingOperationData.java
@@ -59,9 +59,9 @@ public class StandardRoutingOperationData extends QueryPage implements Serializa
 
     private String setupLaborClassNo;
 
-    private Integer setupCrewSize;
+    private Double setupCrewSize;
 
-    private Integer crewSize;
+    private Double crewSize;
 
     @TableField(exist = false)
     private String setupLaborClassDesc;
diff --git a/src/main/resources/mapper/part/PartGroupStdOperationsMapper.xml b/src/main/resources/mapper/part/PartGroupStdOperationsMapper.xml
index 69463fb0..3b78e452 100644
--- a/src/main/resources/mapper/part/PartGroupStdOperationsMapper.xml
+++ b/src/main/resources/mapper/part/PartGroupStdOperationsMapper.xml
@@ -20,6 +20,8 @@
                B.update_date,
                B.update_by,
                B.setup_labor_class_no,
+               B.setup_crew_size,
+               B.crew_size,
                A.operation_id,
                dbo.get_labor_class_desc(A.site, A.bu_no, B.setup_labor_class_no) as setup_labor_class_desc
         from part_group_std_operations A
diff --git a/src/main/resources/mapper/part/PtmConditionProcessMapper.xml b/src/main/resources/mapper/part/PtmConditionProcessMapper.xml
index fda8506f..91033d32 100644
--- a/src/main/resources/mapper/part/PtmConditionProcessMapper.xml
+++ b/src/main/resources/mapper/part/PtmConditionProcessMapper.xml
@@ -29,6 +29,8 @@
                a.update_date,
                a.update_by,
                c.setup_labor_class_no,
+               c.crew_size,
+               c.setup_crew_size,
                b.operation_id,
                dbo.get_labor_class_desc(b.site, b.bu_no, c.setup_labor_class_no) as setup_labor_class_desc
         from ptm_condition_process as a