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 0f7e3fd6..e12b0e54 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 @@ -1608,9 +1608,9 @@ public class RoutingManagementServiceImpl extends ServiceImpl mapListAll = ifsWorkCenterCosts.stream() - .collect(Collectors.toMap(WorkCenterCost::getKey, Function.identity())); + .collect(Collectors.toMap(WorkCenterCost::getIfsRowId, Function.identity())); Map mapList1 = plmWorkCenterCosts.stream() - .collect(Collectors.toMap(WorkCenterCost::getKey, Function.identity())); + .collect(Collectors.toMap(WorkCenterCost::getIfsRowId, Function.identity())); // 找出需要新增的对象(IFS有而PLM没有的) Set keysToAdd = new HashSet<>(mapListAll.keySet()); diff --git a/src/main/resources/mapper/part/RoutingManagementMapper.xml b/src/main/resources/mapper/part/RoutingManagementMapper.xml index d9eed72d..ea7825b7 100644 --- a/src/main/resources/mapper/part/RoutingManagementMapper.xml +++ b/src/main/resources/mapper/part/RoutingManagementMapper.xml @@ -1496,125 +1496,118 @@ UPDATE work_center_cost SET - item_no = CASE work_center_no + item_no = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.itemNo,jdbcType=FLOAT} + WHEN #{item.ifsRowId} THEN #{item.itemNo,jdbcType=FLOAT} ELSE item_no END, - unit_cost = CASE work_center_no + unit_cost = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.unitCost,jdbcType=FLOAT} + WHEN #{item.ifsRowId} THEN #{item.unitCost,jdbcType=FLOAT} ELSE unit_cost END, - overhead1_cost = CASE work_center_no + overhead1_cost = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.overhead1Cost,jdbcType=FLOAT} + WHEN #{item.ifsRowId} THEN #{item.overhead1Cost,jdbcType=FLOAT} ELSE overhead1_cost END, - overhead2_cost = CASE work_center_no + overhead2_cost = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.overhead2Cost,jdbcType=FLOAT} + WHEN #{item.ifsRowId} THEN #{item.overhead2Cost,jdbcType=FLOAT} ELSE overhead2_cost END, - um_id = CASE work_center_no + um_id = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.umId} + WHEN #{item.ifsRowId} THEN #{item.umId} ELSE um_id END, - begin_date = CASE work_center_no + begin_date = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.beginDate} + WHEN #{item.ifsRowId} THEN #{item.beginDate} ELSE begin_date END, - end_date = CASE work_center_no + end_date = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.endDate} + WHEN #{item.ifsRowId} THEN #{item.endDate} ELSE end_date END, - remark = CASE work_center_no + remark = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.remark} + WHEN #{item.ifsRowId} THEN #{item.remark} ELSE remark END, - current_work_center_cost = CASE work_center_no + current_work_center_cost = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.currentWorkCenterCost} + WHEN #{item.ifsRowId} THEN #{item.currentWorkCenterCost} ELSE current_work_center_cost END, - ifs_row_id = CASE work_center_no - - WHEN #{item.workCenterNo} THEN #{item.ifsRowId} - - ELSE ifs_row_id - END, - ifs_row_version = CASE work_center_no + ifs_row_version = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.ifsRowVersion} + WHEN #{item.ifsRowId} THEN #{item.ifsRowVersion} ELSE ifs_row_version END, - cost_set = CASE work_center_no + cost_set = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.costSet} + WHEN #{item.ifsRowId} THEN #{item.costSet} ELSE cost_set END, - cost_set_desc = CASE work_center_no + cost_set_desc = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.costSetDesc} + WHEN #{item.ifsRowId} THEN #{item.costSetDesc} ELSE cost_set_desc END, - wc_rate = CASE work_center_no + wc_rate = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.wcRate} + WHEN #{item.ifsRowId} THEN #{item.wcRate} ELSE wc_rate END, - wc_cost_code = CASE work_center_no + wc_cost_code = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.wcCostCode} + WHEN #{item.ifsRowId} THEN #{item.wcCostCode} ELSE wc_cost_code END, - overhead1_fac = CASE work_center_no + overhead1_fac = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.overhead1Fac} + WHEN #{item.ifsRowId} THEN #{item.overhead1Fac} ELSE overhead1_fac END, - overhead2_fac = CASE work_center_no + overhead2_fac = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.overhead2Fac} + WHEN #{item.ifsRowId} THEN #{item.overhead2Fac} ELSE overhead2_fac END, - overhead1_appl = CASE work_center_no + overhead1_appl = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.overhead1Appl} + WHEN #{item.ifsRowId} THEN #{item.overhead1Appl} ELSE overhead1_appl END, - overhead2_appl = CASE work_center_no + overhead2_appl = CASE ifs_row_id - WHEN #{item.workCenterNo} THEN #{item.overhead2Appl} + WHEN #{item.ifsRowId} THEN #{item.overhead2Appl} ELSE overhead2_appl END - WHERE work_center_no IN + WHERE ifs_row_id IN - #{item.workCenterNo} + #{item.ifsRowId} - AND site = #{list[0].site}