From a1f5bb571fdfc6d41e80d1a2316f75e0cae28ff7 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Sat, 21 Sep 2024 14:41:00 +0800
Subject: [PATCH] =?UTF-8?q?2024.9.21=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?=EF=BC=88=E7=AC=AC=E4=BA=8C=E7=89=88=EF=BC=89=20=E4=BA=8C?=
 =?UTF-8?q?=E3=80=81=E5=8A=A0=E5=B7=A5=E4=B8=AD=E5=BF=83=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=94=B9=E9=80=A0=20=E4=B8=89=E3=80=81=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=EF=BC=88=E7=AC=AC=E4=B8=89=E7=89=88=EF=BC=89?=
 =?UTF-8?q?=20=E5=9B=9B=E3=80=81=E5=95=86=E5=93=81=E7=BB=84=20-=20?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B7=A5=E5=BA=8F=EF=BC=88=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E7=89=88=EF=BC=89=20=E4=BA=94=E3=80=81=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=BB=84=20-=20Process=20Time=20Matrix=EF=BC=88=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E7=89=88=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../part/service/impl/PtmConditionProcessServiceImpl.java    | 3 +++
 .../resources/mapper/part/PartGroupStdOperationsMapper.xml   | 5 +++--
 src/main/resources/mapper/part/PtmConditionProcessMapper.xml | 5 +++--
 .../resources/mapper/part/StandardRoutingOperationMapper.xml | 1 +
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/part/service/impl/PtmConditionProcessServiceImpl.java b/src/main/java/com/xujie/sys/modules/part/service/impl/PtmConditionProcessServiceImpl.java
index ebc7ba3f..2a85f0a0 100644
--- a/src/main/java/com/xujie/sys/modules/part/service/impl/PtmConditionProcessServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/part/service/impl/PtmConditionProcessServiceImpl.java
@@ -11,6 +11,7 @@ import com.xujie.sys.modules.part.mapper.PtmConditionProcessMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -52,6 +53,8 @@ public class PtmConditionProcessServiceImpl extends ServiceImpl<PtmConditionProc
     @Override
     public void updatePtmConditionProcessValue(PtmConditionProcessData data) {
         for (PtmConditionProcessData processData : data.getPtmProcessAddList()) {
+            processData.setUpdateBy(data.getUpdateBy());
+            processData.setUpdateDate(new Date());
             ptmConditionProcessMapper.updateById(processData);
         }
     }
diff --git a/src/main/resources/mapper/part/PartGroupStdOperationsMapper.xml b/src/main/resources/mapper/part/PartGroupStdOperationsMapper.xml
index 62cc64ae..69463fb0 100644
--- a/src/main/resources/mapper/part/PartGroupStdOperationsMapper.xml
+++ b/src/main/resources/mapper/part/PartGroupStdOperationsMapper.xml
@@ -17,8 +17,8 @@
                dbo.get_labor_class_desc(A.site, A.bu_no, B.labor_class_no) as labor_class_desc,
                A.create_date,
                A.create_by,
-               A.update_date,
-               A.update_by,
+               B.update_date,
+               B.update_by,
                B.setup_labor_class_no,
                A.operation_id,
                dbo.get_labor_class_desc(A.site, A.bu_no, B.setup_labor_class_no) as setup_labor_class_desc
@@ -37,5 +37,6 @@
                          and B.operation_name like #{query.operationName}
                   </if>
            </where>
+        order by B.operation_no
     </select>
 </mapper>
diff --git a/src/main/resources/mapper/part/PtmConditionProcessMapper.xml b/src/main/resources/mapper/part/PtmConditionProcessMapper.xml
index 372c5225..fda8506f 100644
--- a/src/main/resources/mapper/part/PtmConditionProcessMapper.xml
+++ b/src/main/resources/mapper/part/PtmConditionProcessMapper.xml
@@ -26,8 +26,8 @@
                dbo.get_labor_class_desc(b.site, b.bu_no, c.labor_class_no) as labor_class_desc,
                b.create_date,
                b.create_by,
-               b.update_date,
-               b.update_by,
+               a.update_date,
+               a.update_by,
                c.setup_labor_class_no,
                b.operation_id,
                dbo.get_labor_class_desc(b.site, b.bu_no, c.setup_labor_class_no) as setup_labor_class_desc
@@ -35,5 +35,6 @@
                  left join part_group_std_operations as b on a.part_group_std_operations_id = b.id
                  left join standard_routing_operation c on b.operation_id = c.id
         where a.condition_id = #{conditionId} and a.bu_no = #{buNo} and a.site = #{site}
+        order by b.operation_no
     </select>
 </mapper>
diff --git a/src/main/resources/mapper/part/StandardRoutingOperationMapper.xml b/src/main/resources/mapper/part/StandardRoutingOperationMapper.xml
index bcdfc33d..c5a194af 100644
--- a/src/main/resources/mapper/part/StandardRoutingOperationMapper.xml
+++ b/src/main/resources/mapper/part/StandardRoutingOperationMapper.xml
@@ -42,5 +42,6 @@
                 and operation_name like #{query.operationName}
             </if>
         </where>
+        order by bu_no,operation_no
     </select>
 </mapper>