diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index 418cab09..37d7f0a8 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -116,11 +116,11 @@ public class DevicePDAServiceImpl implements IDevicePDAService { order.setWorkCenterName(equOrderMapper.selectCenterNameByCenterCode(order.getPlanWorkshop())); - EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderCode()); + EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderId()); - List detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getCode()); + List detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getId()); for (EquOrderDetail detail : detailList) { - List standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getCode()); + List standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getId()); detail.setStandardList(standardList); } equ.setDetailList(detailList); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java index 77ceb614..8ee805c8 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java @@ -72,16 +72,16 @@ public class EquOrderServiceImpl implements IEquOrderService { order.setWorkCenterName(equOrderMapper.selectCenterNameByCenterCode(order.getPlanWorkshop())); - EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderCode()); + EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderId()); - List detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getCode()); + List detailList = equOrderDetailMapper.selectEquOrderDetailByParentCode(equ.getId()); for (EquOrderDetail detail : detailList) { - List standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getCode()); + List standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getId()); detail.setStandardList(standardList); } equ.setDetailList(detailList); - List spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByParentCode(equ.getCode()); + List spareList = equOrderEquSpareMapper.selectEquOrderEquSpareByParentCode(equ.getId()); if (spareList.size() > 0) { equ.setSpareList(spareList); } @@ -113,7 +113,7 @@ public class EquOrderServiceImpl implements IEquOrderService { public List selectEquOrderList(EquOrder equOrder) { List orderList = equOrderMapper.selectEquOrderList(equOrder); for (EquOrder order : orderList) { - EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderCode()); + EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderId()); order.setEquipmentCode(equ.getEquipmentCode()); order.setEquipmentName(equ.getEquipmentName()); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java index 815c8ce8..a42b3e81 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java @@ -349,10 +349,10 @@ public class EquPlanServiceImpl implements IEquPlanService { for (EquPlanEqu equipment : equipmentList) { // 获取检查项list - List detailList = equPlanDetailMapper.selectEquPlanDetailListByParentCode(equipment.getCode()); + List detailList = equPlanDetailMapper.selectEquPlanDetailListByParentCode(equipment.getId()); for (EquPlanDetail detail : detailList) { // 获取标准list - List standardList = equPlanStandardMapper.selectEquPlanStandardListByParentCode(detail.getCode()); + List standardList = equPlanStandardMapper.selectEquPlanStandardListByParentCode(detail.getId()); for (EquPlanStandard standard : standardList) { standard.setShowFlag(true); } @@ -365,7 +365,7 @@ public class EquPlanServiceImpl implements IEquPlanService { equipment.setEquPlanDetailList(detailList); EquPlanEquSpare spare = new EquPlanEquSpare(); - spare.setParentCode(equipment.getCode()); + spare.setParentCode(equipment.getId()); // 备件信息 List spareList = equPlanEquSpareMapper.selectEquPlanEquSpareList(spare); if (spareList.size() > 0) { diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java index 4c904715..06405fa3 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java @@ -111,8 +111,7 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService { EquPlanEqu equPlanEqu = equPlanEquList.get(0); BeanUtils.copyProperties(equPlanEqu,equ); equ.setId(IdUtils.fastSimpleUUID()); - equ.setCode("E"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD)+"001"); - equ.setParentCode(equOrder.getOrderCode()); + equ.setParentCode(equOrder.getOrderId()); equ.setOrderCode(equOrder.getOrderCode()); equ.setFactoryCode(factory); equ.setAttr1(""); @@ -122,13 +121,12 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService { // 生成工单-备件 List spareList = new ArrayList<>(); List equSpareList = equPlanEqu.getSpareList(); - int spareSerialNum = 0; for (EquPlanEquSpare spare : equSpareList) { EquOrderEquSpare spareTemp = new EquOrderEquSpare(); BeanUtils.copyProperties(spare,spareTemp); spareTemp.setId(IdUtils.fastSimpleUUID()); spareTemp.setOrderCode(equOrder.getOrderCode()); - spareTemp.setParentCode(equ.getCode()); + spareTemp.setParentCode(equ.getId()); spareTemp.setFactoryCode(factory); spareTemp.setCreateBy(SecurityContextHolder.getUserName()); spareTemp.setCreateTime(DateUtils.getNowDate()); @@ -143,16 +141,14 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService { // 生成工单-设备-保养项 List detailList = equPlanEqu.getEquPlanDetailList(); - int detailSerialNum = 0; for (EquPlanDetail detail : detailList) { EquOrderDetail equOrderDetail = new EquOrderDetail(); List orderStandardList = new ArrayList<>(); List standardList = detail.getEquPlanStandardList(); BeanUtils.copyProperties(detail,equOrderDetail); equOrderDetail.setId(IdUtils.fastSimpleUUID()); - equOrderDetail.setCode("C"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD)+String.format("%03d",++detailSerialNum)); equOrderDetail.setOrderCode(equOrder.getOrderCode()); - equOrderDetail.setParentCode(equ.getCode()); + equOrderDetail.setParentCode(equ.getId()); equOrderDetail.setFactroyCode(factory); equOrderDetail.setStandardList(orderStandardList); equOrderDetail.setCreateBy(SecurityContextHolder.getUserName()); @@ -166,7 +162,7 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService { EquOrderStandard orderStandard = new EquOrderStandard(); BeanUtils.copyProperties(standard,orderStandard); orderStandard.setId(IdUtils.fastSimpleUUID()); - orderStandard.setParentCode(equOrderDetail.getCode()); + orderStandard.setParentCode(equOrderDetail.getId()); orderStandard.setOrderCode(equOrder.getOrderCode()); orderStandard.setCreateBy(SecurityContextHolder.getUserName()); orderStandard.setCreateTime(DateUtils.getNowDate()); @@ -182,7 +178,6 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService { for (SysUser user : personList) { EquOrderPerson equOrderPerson = new EquOrderPerson(); equOrderPerson.setId(IdUtils.fastSimpleUUID()); - // TODO 要改变编码格式 equOrderPerson.setOrderCode(equOrder.getOrderCode()); equOrderPerson.setFactoryCode(factory); equOrderPerson.setUserId(user.getUserId()); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java index 92528f17..77c4783d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java @@ -247,7 +247,7 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService { equipment.setId(IdUtils.fastSimpleUUID()); equipment.setPlanCode(equPlan.getPlanCode()); equipment.setCode("E" + equPlan.getPlanCode() + String.format("%02d", ++equipmentCodeTemp)); - equipment.setParentCode(equPlan.getPlanCode()); + equipment.setParentCode(equPlan.getPlanId()); equipment.setFactoryCode(factory); equipment.setCreateBy(SecurityContextHolder.getUserName()); equipment.setCreateTime(DateUtils.getNowDate()); @@ -266,7 +266,7 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService { item.setId(IdUtils.fastSimpleUUID()); item.setPlanCode(equPlan.getPlanCode()); item.setCode("C" + equipment.getCode() + String.format("%02d", ++itemCodeTemp)); - item.setParentCode(equipment.getCode()); + item.setParentCode(equipment.getId()); item.setCreateBy(SecurityContextHolder.getUserName()); item.setCreateTime(DateUtils.getNowDate()); item.setUpdateBy(SecurityContextHolder.getUserName()); @@ -285,7 +285,7 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService { checkInsert = true; standard.setId(IdUtils.fastSimpleUUID()); - standard.setParentCode(item.getCode()); + standard.setParentCode(item.getId()); standard.setPlanCode(equPlan.getPlanCode()); standard.setCreateBy(SecurityContextHolder.getUserName()); standard.setCreateTime(DateUtils.getNowDate()); @@ -318,7 +318,7 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService { for (EquPlanEquSpare spare : spareList) { spare.setId(IdUtils.fastSimpleUUID()); spare.setPlanCode(equPlan.getPlanCode()); - spare.setParentCode(equipment.getCode()); + spare.setParentCode(equipment.getId()); spare.setFactoryCode(factory); spare.setCreateBy(SecurityContextHolder.getUserName()); spare.setCreateTime(DateUtils.getNowDate()); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java index be809e0a..f7fbc4d2 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/InspectionWorkServiceImpl.java @@ -62,12 +62,12 @@ public class InspectionWorkServiceImpl implements IInspectionWorkService { // 替换循环周期 order.setPlanLoopType(equOrderMapper.changeLoopType(order.getPlanLoopType())); - Equipment equipment = equipmentMapper.selectEquipmentByEquipmentCode(equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderCode()).getEquipmentCode()); + Equipment equipment = equipmentMapper.selectEquipmentByEquipmentCode(equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderId()).getEquipmentCode()); // 查询检查项、标准 List detailList = equOrderDetailMapper.selectEquOrderDetailByOrderCode(order.getOrderCode()); for (EquOrderDetail detail : detailList) { - List standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getCode()); + List standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getId()); for (EquOrderStandard standard : standardList) { if (standard.getStandardType().equals("quantify")){ standard.setStandardTypeName("定量"); diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml index b5b67c74..46ef8be5 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml @@ -26,7 +26,6 @@ - @@ -38,7 +37,7 @@ - select id, code, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, detail_reach, actual_value, detail_error, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,picture_path,error_flag,fault_type,repair_reach,repair_value,repair_picture from equ_order_standard + select id, code, parent_code, order_code, standard_type, standard_name, detail_up_limit, detail_down_limit, detail_unit, detail_reach, actual_value, detail_error, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time,error_flag,fault_type,repair_reach,repair_value,repair_picture from equ_order_standard