From 00ca34fd8800eed21d1a7aa0f12be046056d8891 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 5 Dec 2023 10:42:05 +0800 Subject: [PATCH] 2023-12-05 --- .../modules/part/entity/BomAllFieldEntity.java | 14 +++++++++----- .../modules/part/entity/RoutingAllFieldEntity.java | 8 ++++---- .../part/entity/RoutingComponentEntity.java | 4 ++++ .../service/impl/RoutingManagementServiceImpl.java | 2 +- .../spring/modules/part/vo/RoutingComponentVo.java | 4 ---- .../resources/mapper/part/BomManagementMapper.xml | 5 +++-- .../mapper/part/RoutingManagementMapper.xml | 11 ++++++----- 7 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/spring/modules/part/entity/BomAllFieldEntity.java b/src/main/java/com/spring/modules/part/entity/BomAllFieldEntity.java index dda56faa..4b3df9f5 100644 --- a/src/main/java/com/spring/modules/part/entity/BomAllFieldEntity.java +++ b/src/main/java/com/spring/modules/part/entity/BomAllFieldEntity.java @@ -25,6 +25,10 @@ public class BomAllFieldEntity extends QueryPage { * 物料编码 **/ private String partNo; + /** + * 物料名称 + **/ + private String partDesc; /** * bom版本号 **/ @@ -40,14 +44,14 @@ public class BomAllFieldEntity extends QueryPage { /** * 开始时间 **/ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date effPhaseInDate; /** * 结束时间 **/ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date effPhaseOutDate; /** * 工程版本号 @@ -106,7 +110,7 @@ public class BomAllFieldEntity extends QueryPage { /** * 材料计量单位(名词) **/ - private String umName; + private String printUnitName; /** * 单位用量 **/ diff --git a/src/main/java/com/spring/modules/part/entity/RoutingAllFieldEntity.java b/src/main/java/com/spring/modules/part/entity/RoutingAllFieldEntity.java index 22b7a381..f9ac203b 100644 --- a/src/main/java/com/spring/modules/part/entity/RoutingAllFieldEntity.java +++ b/src/main/java/com/spring/modules/part/entity/RoutingAllFieldEntity.java @@ -39,14 +39,14 @@ public class RoutingAllFieldEntity extends QueryPage { /** * 开始时间 **/ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date phaseInDate; /** * 结束时间 **/ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date phaseOutDate; diff --git a/src/main/java/com/spring/modules/part/entity/RoutingComponentEntity.java b/src/main/java/com/spring/modules/part/entity/RoutingComponentEntity.java index aa9b323f..4fa0ca0b 100644 --- a/src/main/java/com/spring/modules/part/entity/RoutingComponentEntity.java +++ b/src/main/java/com/spring/modules/part/entity/RoutingComponentEntity.java @@ -44,6 +44,10 @@ public class RoutingComponentEntity extends QueryPage implements Serializable { * 工序编码 **/ private String operationNo; + /** + * 工序名称 + **/ + private String operationName; /** * 机器效率（默认100%） **/ diff --git a/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java index 82159a12..0f5d8a5c 100644 --- a/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java @@ -244,7 +244,7 @@ public class RoutingManagementServiceImpl extends ServiceImpl checkList = routingManagementMapper.checkRoutingComponentOnlyOne(data); if (!checkList.isEmpty()) { - throw new RuntimeException("子物料已存在，请检查！"); + throw new RuntimeException("该工序已存在，请检查！"); } // 新增routing子明细物料 routingManagementMapper.saveRoutingComponent(data); diff --git a/src/main/java/com/spring/modules/part/vo/RoutingComponentVo.java b/src/main/java/com/spring/modules/part/vo/RoutingComponentVo.java index 8f3ad751..b33a753a 100644 --- a/src/main/java/com/spring/modules/part/vo/RoutingComponentVo.java +++ b/src/main/java/com/spring/modules/part/vo/RoutingComponentVo.java @@ -8,10 +8,6 @@ import lombok.Data; public class RoutingComponentVo extends RoutingComponentEntity { - /** - * 工序名称 - **/ - private String operationName; /** * 加工中心名称 **/ diff --git a/src/main/resources/mapper/part/BomManagementMapper.xml b/src/main/resources/mapper/part/BomManagementMapper.xml index 15937cea..3d3416d7 100644 --- a/src/main/resources/mapper/part/BomManagementMapper.xml +++ b/src/main/resources/mapper/part/BomManagementMapper.xml @@ -39,7 +39,7 @@ part_no, part_desc, um_id as printUnit, - dbo.get_um_name(site, um_id) as umName + dbo.get_um_name(site, um_id) as printUnitName FROM part site = #{site} and active = 'Y' @@ -158,7 +158,8 @@ update plm_bom_detail - set min_lot_qty = #{minLotQty}, + set alternative_description = #{alternativeDescription}, + min_lot_qty = #{minLotQty}, note_text = #{detailNoteText}, update_date = getDate(), update_by = #{updateBy} diff --git a/src/main/resources/mapper/part/RoutingManagementMapper.xml b/src/main/resources/mapper/part/RoutingManagementMapper.xml index dd712704..80da7468 100644 --- a/src/main/resources/mapper/part/RoutingManagementMapper.xml +++ b/src/main/resources/mapper/part/RoutingManagementMapper.xml @@ -68,9 +68,9 @@ INSERT INTO plm_routing_component - (site, part_no, routing_revision, routing_type, alternative_no, operation_id, operation_no, efficiency_factor, mach_run_factor, mach_setup_time, run_time_code, labor_run_factor, labor_setup_time, crew_size, setup_crew_size, outside_op_item, machine_no, work_center_no, labor_class_no, setup_labor_class_no, overlap, note_text, create_date, create_by) + (site, part_no, routing_revision, routing_type, alternative_no, operation_name, operation_no, efficiency_factor, mach_run_factor, mach_setup_time, run_time_code, labor_run_factor, labor_setup_time, crew_size, setup_crew_size, outside_op_item, machine_no, work_center_no, labor_class_no, setup_labor_class_no, overlap, note_text, create_date, create_by) VALUES - (#{site}, #{partNo}, #{routingRevision}, #{routingType}, #{alternativeNo}, #{operationId}, #{operationNo}, #{efficiencyFactor}, #{machRunFactor}, #{machSetupTime}, #{runTimeCode}, #{laborRunFactor}, #{laborSetupTime}, #{crewSize}, #{setupCrewSize}, #{outsideOpItem}, #{machineNo}, #{workCenterNo}, #{laborClassNo}, #{setupLaborClassNo}, #{overlap}, #{noteText}, getDate(), #{createBy}) + (#{site}, #{partNo}, #{routingRevision}, #{routingType}, #{alternativeNo}, #{operationName}, #{operationNo}, #{efficiencyFactor}, #{machRunFactor}, #{machSetupTime}, #{runTimeCode}, #{laborRunFactor}, #{laborSetupTime}, #{crewSize}, #{setupCrewSize}, #{outsideOpItem}, #{machineNo}, #{workCenterNo}, #{laborClassNo}, #{setupLaborClassNo}, #{overlap}, #{noteText}, getDate(), #{createBy}) @@ -129,7 +129,7 @@ alternative_no, operation_id, operation_no, - dbo.get_operation_name(site, operation_id) as operationName, + operation_name, efficiency_factor, mach_run_factor, mach_setup_time, @@ -164,7 +164,8 @@ update plm_routing_detail - set rout_template_id = #{routTemplateId}, + set alternative_description = #{alternativeDescription}, + rout_template_id = #{routTemplateId}, plan_date = #{planDate}, fixed_lead_time_day = #{fixedLeadTimeDay}, fixed_lead_time_hour = #{fixedLeadTimeHour}, @@ -265,7 +266,7 @@ operation_id, operation_no FROM plm_routing_component - where site = #{site} and part_no = #{partNo} and routing_type = #{routingType} and routing_revision = #{routingRevision} and alternative_no = #{alternativeNo} and operation_id = #{operationId} and operation_no = #{operationNo} + where site = #{site} and part_no = #{partNo} and routing_type = #{routingType} and routing_revision = #{routingRevision} and alternative_no = #{alternativeNo} and operation_name = #{operationName} and operation_no = #{operationNo}