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 + order by B.operation_no 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 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} + order by bu_no,operation_no