2023-12-05

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;
     /**
      * 单位用量
      **/

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;
 
 

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%）
      **/

src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java

@@ -244,7 +244,7 @@ public class RoutingManagementServiceImpl extends ServiceImpl<RoutingManagementM
         // 校验查重
         List<RoutingComponentEntity> checkList = routingManagementMapper.checkRoutingComponentOnlyOne(data);
         if (!checkList.isEmpty()) {
-            throw new RuntimeException("子物料已存在，请检查！");
+            throw new RuntimeException("该工序已存在，请检查！");
         }
         // 新增routing子明细物料
         routingManagementMapper.saveRoutingComponent(data);

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;
     /**
      * 加工中心名称
      **/

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
         <where>
             site = #{site} and active = 'Y'
@@ -158,7 +158,8 @@
     <!-- bom明细表编辑 -->
     <update id="updateBomDetail" parameterType="BomAllFieldEntity">
         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}

src/main/resources/mapper/part/RoutingManagementMapper.xml

@@ -68,9 +68,9 @@
     <!-- 新增Routing子明细表内容 -->
     <insert id="saveRoutingComponent" parameterType="RoutingComponentEntity">
         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})
     </insert>
 
     <!-- 查routing明细 -->
@@ -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 @@
     <!-- routing明细表编辑 -->
     <update id="updateRoutingDetail" parameterType="RoutingAllFieldEntity">
         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}
     </select>
 
     <!-- 修改routing子明细 -->