2024.9.21 一、物料成本信息维护（第二版）

二、加工中心功能改造
三、标准工序（第三版）
四、商品组 - 标准工序（第三版）
五、商品组 - Process Time Matrix（第二版）

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);
         }
     }

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>

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>

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>