From 8061baad9d89457ca4fda09f71bf67183c949c27 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 16 Aug 2024 17:32:56 +0800 Subject: [PATCH] =?UTF-8?q?2024-08-16=20ifs=E6=8E=A5=E5=8F=A3=E6=9B=B4?= =?UTF-8?q?=E6=96=B02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PartInformationServiceImpl.java | 2 +- .../impl/RoutingManagementServiceImpl.java | 62 +++++++++---------- .../part/MasterPartInformationMapper.xml | 1 + .../mapper/part/RoutingManagementMapper.xml | 8 +-- 4 files changed, 37 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java index 2004a3ba..ae759631 100644 --- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java +++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java @@ -1982,7 +1982,7 @@ public class PartInformationServiceImpl extends ServiceImpl mapList1 = plmLocations.stream() .collect(Collectors.toMap(LocationInformationEntity::getKey, Function.identity())); - // 找出需要删除的对象（PLM有而IFS没有的） - Set keysToDelete = new HashSet<>(mapList1.keySet()); - keysToDelete.removeAll(mapListAll.keySet()); - List toDelete = keysToDelete.stream() - .map(mapList1::get) - .collect(Collectors.toList()); +// // 找出需要删除的对象（PLM有而IFS没有的） +// Set keysToDelete = new HashSet<>(mapList1.keySet()); +// keysToDelete.removeAll(mapListAll.keySet()); +// List toDelete = keysToDelete.stream() +// .map(mapList1::get) +// .collect(Collectors.toList()); // 找出需要新增的对象（IFS有而PLM没有的） Set keysToAdd = new HashSet<>(mapListAll.keySet()); @@ -1341,10 +1341,10 @@ public class RoutingManagementServiceImpl extends ServiceImpl mapListAll.get(key)) // 选择listAll中的版本进行更新 .collect(Collectors.toList()); - // 删除 - if (!toDelete.isEmpty()) { - routingManagementMapper.syncDeleteLocation(toDelete); - } +// // 删除 +// if (!toDelete.isEmpty()) { +// routingManagementMapper.syncDeleteLocation(toDelete); +// } // 新增 if (!toAdd.isEmpty()) { // 分批插入 @@ -1388,12 +1388,12 @@ public class RoutingManagementServiceImpl extends ServiceImpl mapList1 = plmLaborClasss.stream() .collect(Collectors.toMap(PersonnelLevel::getKey, Function.identity())); - // 找出需要删除的对象（PLM有而IFS没有的） - Set keysToDelete = new HashSet<>(mapList1.keySet()); - keysToDelete.removeAll(mapListAll.keySet()); - List toDelete = keysToDelete.stream() - .map(mapList1::get) - .collect(Collectors.toList()); +// // 找出需要删除的对象（PLM有而IFS没有的） +// Set keysToDelete = new HashSet<>(mapList1.keySet()); +// keysToDelete.removeAll(mapListAll.keySet()); +// List toDelete = keysToDelete.stream() +// .map(mapList1::get) +// .collect(Collectors.toList()); // 找出需要新增的对象（IFS有而PLM没有的） Set keysToAdd = new HashSet<>(mapListAll.keySet()); @@ -1410,10 +1410,10 @@ public class RoutingManagementServiceImpl extends ServiceImpl mapListAll.get(key)) // 选择listAll中的版本进行更新 .collect(Collectors.toList()); - // 删除 - if (!toDelete.isEmpty()) { - routingManagementMapper.syncDeleteLaborClass(toDelete); - } +// // 删除 +// if (!toDelete.isEmpty()) { +// routingManagementMapper.syncDeleteLaborClass(toDelete); +// } // 新增 if (!toAdd.isEmpty()) { // 分批插入 @@ -1457,12 +1457,12 @@ public class RoutingManagementServiceImpl extends ServiceImpl mapList1 = plmWorkCenters.stream() .collect(Collectors.toMap(WorkCenter::getKey, Function.identity())); - // 找出需要删除的对象（PLM有而IFS没有的） - Set keysToDelete = new HashSet<>(mapList1.keySet()); - keysToDelete.removeAll(mapListAll.keySet()); - List toDelete = keysToDelete.stream() - .map(mapList1::get) - .collect(Collectors.toList()); +// // 找出需要删除的对象（PLM有而IFS没有的） +// Set keysToDelete = new HashSet<>(mapList1.keySet()); +// keysToDelete.removeAll(mapListAll.keySet()); +// List toDelete = keysToDelete.stream() +// .map(mapList1::get) +// .collect(Collectors.toList()); // 找出需要新增的对象（IFS有而PLM没有的） Set keysToAdd = new HashSet<>(mapListAll.keySet()); @@ -1479,14 +1479,14 @@ public class RoutingManagementServiceImpl extends ServiceImpl mapListAll.get(key)) // 选择listAll中的版本进行更新 .collect(Collectors.toList()); - // 删除 - if (!toDelete.isEmpty()) { - routingManagementMapper.syncDeleteWorkCenter(toDelete); - } +// // 删除 +// if (!toDelete.isEmpty()) { +// routingManagementMapper.syncDeleteWorkCenter(toDelete); +// } // 新增 if (!toAdd.isEmpty()) { // 分批插入 - int batchSize = 200; // 假设每批200条记录 + int batchSize = 100; // 假设每批100条记录 for (int i = 0; i < toAdd.size(); i += batchSize) { int end = Math.min(i + batchSize, toAdd.size()); List subList = toAdd.subList(i, end); diff --git a/src/main/resources/mapper/part/MasterPartInformationMapper.xml b/src/main/resources/mapper/part/MasterPartInformationMapper.xml index 997c350f..3b8626c2 100644 --- a/src/main/resources/mapper/part/MasterPartInformationMapper.xml +++ b/src/main/resources/mapper/part/MasterPartInformationMapper.xml @@ -57,6 +57,7 @@ sub_lot_rule = #{subLotRule}, component_lot_rule = #{componentLotRule}, code_no = #{codeNo}, + um_id = #{umId}, update_date = getDate(), update_by = #{updateBy} WHERE part_no = #{partNo} diff --git a/src/main/resources/mapper/part/RoutingManagementMapper.xml b/src/main/resources/mapper/part/RoutingManagementMapper.xml index 2ba145f1..74a17033 100644 --- a/src/main/resources/mapper/part/RoutingManagementMapper.xml +++ b/src/main/resources/mapper/part/RoutingManagementMapper.xml @@ -1227,7 +1227,7 @@ um_id, active, remark, pro_line_no, can_create_new_roll_flag, need_setup_flag, ifs_row_version) VALUES - (#{item.site}, #{item.workCenterNo}, #{item.workCenterDesc}, #{item.workCenterTypeDB}, #{item.workCenterType}, #{item.averageCapacity}, #{item.efficiency}, #{item.utilization}, #{item.capacityTypeDB}, #{item.capacityType}, + (#{item.site}, #{item.workCenterNo}, #{item.workCenterDesc}, #{item.workCenterTypeDB}, #{item.workCenterType}, #{item.averageCapacity,jdbcType=DECIMAL}, #{item.efficiency,jdbcType=DECIMAL}, #{item.utilization,jdbcType=DECIMAL}, #{item.capacityTypeDB}, #{item.capacityType}, #{item.umId}, #{item.active}, #{item.remark}, #{item.proLineNo}, #{item.canCreateNewRollFlag}, #{item.needSetupFlag}, #{item.ifsRowVersion}) @@ -1239,9 +1239,9 @@ work_center_desc = #{item.workCenterDesc}, work_center_type_db = #{item.workCenterTypeDB}, work_center_type = #{item.workCenterType}, - average_capacity = #{item.averageCapacity}, - efficiency = #{item.efficiency}, - utilization = #{item.utilization}, + average_capacity = #{item.averageCapacity,jdbcType=DECIMAL}, + efficiency = #{item.efficiency,jdbcType=DECIMAL}, + utilization = #{item.utilization,jdbcType=DECIMAL}, capacity_type_db = #{item.capacityTypeDB}, capacity_type = #{item.capacityType}, um_id = #{item.umId},