diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java index 2caac166..cfdba65d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java @@ -137,6 +137,12 @@ public class DevicePDAController { return devicePDAService.updateMaintenanceRecords(equRepairWorkOrder); } + //传故障类型 +// @GetMapping(value = "/queryEquFaultTypeTree") +// public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) { +// return devicePDAService.queryEquFaultTypeTree(equRepairWorkOrder); +// } + /** * 开始保养任务 * @param pdadto diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java index 1aff0c83..0afa5673 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java @@ -74,6 +74,14 @@ public class EquFaultType extends BaseEntity { // 创建日期结束 private String createTimeEnd; + //故障大类 + // 字典名 + private String dictLabel; + + // 字典值 + private String dictValue; + + public List getCreateTimeArray() { return createTimeArray; } @@ -193,6 +201,22 @@ public class EquFaultType extends BaseEntity { return delFlag; } + public void setDictValue(String dictValue) { + this.dictValue = dictValue; + } + + public String getDictValue() { + return dictValue; + } + + public void setDictLabel(String dictLabel) { + this.dictLabel = dictLabel; + } + + public String getDictLabel() { + return dictLabel; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java index 820e0a08..a12354a0 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOrder.java @@ -165,6 +165,15 @@ public class EquOrder extends BaseEntity { /** 维护类型名称 */ private String itemTypeName; + /** 主键 */ + private String id; + public void setId(String id) { + this.id = id; + } + public String getId() { + return id; + } + //标准列表 public List getStandardList() { return standardList; diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOutsourceWork.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOutsourceWork.java index a4903fcb..6db1d97a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOutsourceWork.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOutsourceWork.java @@ -61,6 +61,10 @@ public class EquOutsourceWork extends BaseEntity { @Excel(name = "委外用时") private String workCostTime; + /** 委外状态 */ + @Excel(name = "委外状态") + private String workStatus; + /** 备用字段1 */ @Excel(name = "备用字段1") private String attr1; @@ -185,6 +189,13 @@ public class EquOutsourceWork extends BaseEntity { return workCostTime; } + public void setWorkStatus(String workStatus) { + this.workStatus = workStatus; + } + public String getWorkStatus() { + return workStatus; + } + public void setAttr1(String attr1) { this.attr1 = attr1; } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java index 4d3f743c..0ad69d53 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java @@ -122,18 +122,18 @@ public class EquRepairWorkOrder extends BaseEntity { /** 维修开始时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "维修开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private String workStartTime; + private Date workStartTime; /** 维修结束时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "维修结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private String workEndTime; + private Date workEndTime; //维修停机真正开始时间 - private String actualDownStartTime; + private Date actualDownStartTime; //维修停机真正结束时间 - private String actualDownEndTime; + private Date actualDownEndTime; // 设备 /** 设备名称 */ @@ -186,7 +186,7 @@ public class EquRepairWorkOrder extends BaseEntity { /** 报修人 */ private String orderRepairmanCode; - /** 联系方式 */ + /** 报修人联系方式 */ private String orderConnection; //班组 @@ -545,17 +545,17 @@ public class EquRepairWorkOrder extends BaseEntity { } //维修工单 新增字段 维修开始结束时间 - public void setWorkStartTime(String workStartTime) { + public void setWorkStartTime(Date workStartTime) { this.workStartTime = workStartTime; } - public String getWorkStartTime() { + public Date getWorkStartTime() { return workStartTime; } - public void setWorkEndTime(String workEndTime) { + public void setWorkEndTime(Date workEndTime) { this.workEndTime = workEndTime; } - public String getWorkEndTime() { + public Date getWorkEndTime() { return workEndTime; } @@ -604,16 +604,16 @@ public class EquRepairWorkOrder extends BaseEntity { } //计划停机开始时间、结束时间 - public String getActualDownStartTime() { + public Date getActualDownStartTime() { return actualDownStartTime; } - public void setActualDownStartTime(String actualDownStartTime) { + public void setActualDownStartTime(Date actualDownStartTime) { this.actualDownStartTime = actualDownStartTime; } - public String getActualDownEndTime() { + public Date getActualDownEndTime() { return actualDownEndTime; } - public void setActualDownEndTime(String actualDownEndTime) { + public void setActualDownEndTime(Date actualDownEndTime) { this.actualDownEndTime = actualDownEndTime; } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java index 8f33ec25..914b2e93 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java @@ -3,6 +3,7 @@ package com.op.device.mapper; import java.util.List; import com.op.device.domain.EquFaultType; +import com.op.device.domain.EquRepairWorkOrder; /** * 故障类型维护Mapper接口 @@ -64,4 +65,7 @@ public interface EquFaultTypeMapper { * @return */ int selectSerialNumber(); + + //故障报修第一级 + List selectFirstLevelList(EquRepairWorkOrder equRepairWorkOrder); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java index 9ab79a03..7e42afbf 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java @@ -121,13 +121,6 @@ public interface EquOrderMapper { */ List selectTodayTask(PDADTO pdadto); - /** - * PC获取点检、巡检检查项 - * @param - * @return - */ - List selectEquOrderDetailsList(EquOrder equOrder); - /** * 通过设备编码查询设备名称 * @param equipmentCode @@ -148,4 +141,18 @@ public interface EquOrderMapper { * @return */ void updateEquOrderRepairCode(EquOrder equOrder); + + /** + * 手持、PC获取维修点检、巡检检查项 + * @param + * @return + */ + List selectCheckListByWorkCode(EquOrder equOrder); + + /** + * 手持、PC获取报修点检、巡检检查项 + * @param + * @return + */ + List selectCheckListByRepairCode(EquOrder equOrder); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java index e4548a25..f559fe14 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java @@ -91,6 +91,9 @@ public interface IDevicePDAService { */ public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder); + //获取设备故障类型 +// public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder); + //待处理 AjaxResult getMaintenancePendRecords(EquRepairWorkOrder equRepairWorkOrder); 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 46eca7d8..98e3c887 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 @@ -23,10 +23,7 @@ import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; import static com.op.common.core.web.domain.AjaxResult.error; import static com.op.common.core.web.domain.AjaxResult.success; @@ -63,6 +60,9 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @Autowired private EquFileMapper equFileMapper; + @Autowired + private EquFaultTypeMapper equFaultTypeMapper; + /** * 获取今日巡检任务工单list-状态不为已完成 @@ -272,7 +272,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equTeamUser.setUserName(SecurityUtils.getUsername()); EquTeamUser equTeamUserList = equRepairOrderMapper.getRepairPhoneNumber(equTeamUser); equRepairOrder.setOrderConnection(equTeamUserList.getPhonenumber()); - + equRepairOrder.setOrderRepairmanName(equTeamUserList.getNickName()); // 报修来源 if (equOrder.getPlanType().equals("inspection")){ equRepairOrder.setOrderSource("巡检"); @@ -421,7 +421,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { } /** - * 获取待维修记录（除了待维修） + * 获取维修记录（除了待维修） * * @param equRepairWorkOrder * @return @@ -481,7 +481,11 @@ public class DevicePDAServiceImpl implements IDevicePDAService { public AjaxResult updateDowntime(EquRepairWorkOrder equRepairWorkOrder) { try { //不停机 那么实际停机开始时间和实际停机结束时间都没有 - //如果停机 那么实际停机时间就是传入的时间 停机时间必须选择校验 + //如果停机 那么实际停机时间就是传入的时间 + equRepairWorkOrder.setWorkStartTime(DateUtils.getNowDate()); + if(equRepairWorkOrder.getWorkDownMachine().equals("1")){ + equRepairWorkOrder.setActualDownStartTime(DateUtils.getNowDate()); + } equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername()); equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate()); //维修中 @@ -525,11 +529,12 @@ public class DevicePDAServiceImpl implements IDevicePDAService { EquOrder equOrder = new EquOrder(); equOrder.setWorkCode(list.getWorkCode()); //检查项 - List checkLists = equOrderMapper.selectEquOrderDetailsList(equOrder); + List checkLists = equOrderMapper.selectCheckListByWorkCode(equOrder); //每个检查项对应的检测标准 for(EquOrder equOrder1 :checkLists){ EquOrderStandard equOrderStandard = new EquOrderStandard(); equOrderStandard.setOrderCode(equOrder1.getOrderCode()); + equOrderStandard.setParentCode(equOrder1.getId()); List standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard); for(EquOrderStandard standardList :standardLists){ //每个检查标准里面的照片 @@ -569,6 +574,16 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @DS("#header.poolName") public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) { try { + //判断是否停机 + EquRepairWorkOrder list = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(equRepairWorkOrder.getWorkId()); + if(list.getWorkDownMachine().equals("1")){ + //维修结束时间、维修真正停机时间 + equRepairWorkOrder.setActualDownEndTime(DateUtils.getNowDate()); + equRepairWorkOrder.setWorkEndTime(DateUtils.getNowDate()); + //维修完成 + equRepairWorkOrder.setWorkStatus("1"); + } + //更新每一项点检/巡检检查项信息 List checkLists = equRepairWorkOrder.getDetailList(); for(EquOrder checkList:checkLists){ @@ -601,6 +616,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { } equOrderMapper.updateEquOrder(checkList); } + //新建申领单 缺少code List equSpareApplies = equRepairWorkOrder.getApplyList(); for(EquSpareApply equSpareApply:equSpareApplies){ @@ -610,7 +626,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equSpareApply.setApplyTime(DateUtils.getNowDate()); equSpareApplyMapper.insertEquSpareApply(equSpareApply); } - //维修人员名字？？？？前端能够提供吗？？？ + //图片 //先删除每个维修工单对应图片 equRepairWorkOrderMapper.deleteBaseFileBySourceId(equRepairWorkOrder.getWorkId()); @@ -635,9 +651,33 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername()); equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate()); equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder); + //需要更新设备状态????这里没做 return success("提交成功，维修完成！"); } catch (Exception e) { return error(); } } + + /** + * 查询故障树 + * + * @param equRepairWorkOrder + * @return + */ +// @Override +// @DS("#header.poolName") +// public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) { +// // 查询一级数据 +// List firstLevel = equFaultTypeMapper.selectFirstLevelList(equRepairWorkOrder); +// // 一级list +// List firstTree = new ArrayList<>(); +// // 判空 +// if (!CollectionUtils.isEmpty(firstLevel)) { +// for(EquFaultType equFaultType : firstLevel){ +// +// } +// } +// +// return treeAll; +// } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java index cad366f0..9e6f8c95 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java @@ -2,6 +2,7 @@ package com.op.device.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; +import com.op.common.core.context.SecurityContextHolder; import com.op.common.core.domain.R; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.uuid.IdUtils; @@ -73,6 +74,10 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { @Autowired private EquOutsourceWorkMapper equOutsourceWorkMapper; + @Autowired + private EquSpareApplyMapper equSpareApplyMapper; + @Autowired + private SparePartsLedgerMapper sparePartsLedgerMapper; /** * 根据点检计划生成点检任务 * **/ @@ -245,6 +250,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { private int createOrderPlan(EquPlan plan){ Date nowtime = DateUtils.getNowDate(); String createBy = "job"; + String factory = plan.getFactoryCode(); int sce = 0; /**equ_plan->equ_order********************************************************************/ EquOrder order = new EquOrder(); @@ -264,20 +270,39 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { /**equ_order**/ sce = equOrderMapper.insertEquOrder(order); System.out.println(plan.getPlanCode()+"========equ_order:"+sce); - /**equ_plan_equ_spare->equ_order_equ_spare*************************************************************/ + /**equ_plan_equ_spare->equ_spare_apply*************************************************************/ EquPlanEquSpare equPlanEquSpare = new EquPlanEquSpare(); equPlanEquSpare.setParentCode(plan.getPlanEquId()); List spares = equPlanEquSpareMapper.selectEquPlanEquSpareList(equPlanEquSpare); - for(EquPlanEquSpare spare:spares){ - spare.setId(IdUtils.fastSimpleUUID()); - spare.setCreateTime(nowtime); - spare.setCreateBy(createBy); - spare.setDelFlag("0"); - spare.setCode(orderCode); + + // 获取流水单号 + int applySerialNum = equSpareApplyMapper.selectSerialNumber(); + for (EquPlanEquSpare spare : spares) { + EquSpareApply apply = new EquSpareApply(); + apply.setApplyId(IdUtils.fastSimpleUUID()); + apply.setApplyCode("A"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD)+String.format("%03d",applySerialNum)); + applySerialNum++; + apply.setSpareCode(spare.getMaterialCode()); + apply.setSpareName(spare.getMaterialDesc()); + apply.setSpareModel(spare.getSpareType()); + apply.setSpareQuantity(spare.getApplyNum()); + apply.setFactoryCode(factory); + apply.setApplyPeople("job"); + apply.setParentCode(orderCode); + apply.setCreateBy("job"); + apply.setCreateTime(nowtime); + apply.setSpareUseEquipment(plan.getEquipmentCode()); + apply.setApplyTime(nowtime); + // 插入备件信息 + equSpareApplyMapper.insertEquSpareApply(apply); + + // TODO 减少备件仓库中备件数量 + sparePartsLedgerMapper.updateSpareNumReduce(apply); } + if(!CollectionUtils.isEmpty(spares)){ sce = equOrderEquSpareMapper.insertEquOrderEquSpares(spares); - System.out.println(plan.getPlanCode()+"========equ_order_equ_spare:"+sce); + System.out.println(plan.getPlanCode()+"========equ_spare_apply:"+sce); } /**equ_plan_detail->equ_order_detail*******************************************************/ 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 efd46e05..4291e868 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 @@ -288,6 +288,7 @@ public class EquOrderServiceImpl implements IEquOrderService { equTeamUser.setUserName(SecurityUtils.getUsername()); EquTeamUser equTeamUserList = equRepairOrderMapper.getRepairPhoneNumber(equTeamUser); equRepairOrder.setOrderConnection(equTeamUserList.getPhonenumber()); + equRepairOrder.setOrderRepairmanName(equTeamUserList.getNickName()); // 报修来源 if (equOrder.getPlanType().equals("inspection")) { diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java index 4cb8f174..de1ffbac 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java @@ -72,11 +72,12 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { //报修单号 equOrder.setRepairCode(list.getOrderCode()); //检查项 - List checkLists = equOrderMapper.selectEquOrderDetailsList(equOrder); + List checkLists = equOrderMapper.selectCheckListByRepairCode(equOrder); //每个检查项对应的检测标准 for(EquOrder equOrder1 :checkLists){ EquOrderStandard equOrderStandard = new EquOrderStandard(); equOrderStandard.setOrderCode(equOrder1.getOrderCode()); + equOrderStandard.setParentCode(equOrder1.getId()); List standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard); for(EquOrderStandard standardList :standardLists){ //每个检查标准里面的照片 diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java index 272525d5..4e9302b7 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java @@ -68,11 +68,12 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService EquOrder equOrder = new EquOrder(); equOrder.setWorkCode(list.getWorkCode()); //检查项 - List checkLists = equOrderMapper.selectEquOrderDetailsList(equOrder); + List checkLists = equOrderMapper.selectCheckListByWorkCode(equOrder); //每个检查项对应的检测标准 for(EquOrder equOrder1 :checkLists){ EquOrderStandard equOrderStandard = new EquOrderStandard(); equOrderStandard.setOrderCode(equOrder1.getOrderCode()); + equOrderStandard.setParentCode(equOrder1.getId()); List standardLists = equOrderStandardMapper.selectPdaEquOrderList(equOrderStandard); for(EquOrderStandard standardList :standardLists){ //每个检查标准里面的照片 diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml index 4945af13..413383c4 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml @@ -19,6 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -125,4 +130,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{faultId} + + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index c4c5d7c1..6a668b7e 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -40,6 +40,7 @@ + @@ -286,23 +287,39 @@ - select eo.order_id, eo.order_code, eo.repair_code, eo.work_code, + eod.id, eod.item_name, eod.item_method, eod.item_type, eod.item_type_name from equ_order eo left join equ_order_detail eod on eo.order_code = eod.order_code - - and eo.work_code = #{workCode} - and eo.repair_code = #{repairCode} - and eo.del_flag = '0' - + where eo.work_code = #{workCode} + and eo.del_flag = '0' + + + + 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 5eff47db..466095ba 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 @@ -223,23 +223,19 @@ diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml index e23f2181..19c22bd1 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOutsourceWorkMapper.xml @@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -35,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select work_id, work_code,order_code, repair_code, work_person, work_outsourcing_unit, work_connection, work_reason, work_type, equipment_code, work_cost, work_cost_time, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code from equ_outsource_work + select work_id, work_code,order_code, repair_code, work_person, work_outsourcing_unit, work_connection, work_reason, work_type, equipment_code, work_cost, work_cost_time,work_status, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code from equ_outsource_work + - + insert into qc_check_unqualified id, diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml index d1622890..f51290eb 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml @@ -56,5 +56,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by qct.supplier_code,qct.supplier_name +