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 6ac2c2f47..f25eba5a7 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 @@ -5,6 +5,7 @@ import java.util.Date; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.common.core.domain.BaseFileData; import com.op.system.api.domain.SysUser; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -268,6 +269,7 @@ public class EquOrder extends BaseEntity { private List upkeepPictures; private String picturePath; + private List picturePaths; //工具 private String itemTools; @@ -288,6 +290,14 @@ public class EquOrder extends BaseEntity { this.upkeepPictures = upkeepPictures; } + public List getPicturePaths() { + return picturePaths; + } + + public void setPicturePaths(List picturePaths) { + this.picturePaths = picturePaths; + } + public List getOrderStartArray() { return orderStartArray; } 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 f9bdb462e..39d334e7d 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 @@ -303,8 +303,11 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { hasTask = deviceTaskMapper.getNewTaskOrder(plan); } else if ("2".equals(plan.getCalculationRule())) { //单次生成保养计划 + //根据planLoopStart 单次生成 + if(plan.getPlanLoopStart().getTime() == DateUtils.getNowDate().getTime()){ + hasTask = null; + } } - if (hasTask == null || Integer.parseInt(plan.getPlanLoop()) <= hasTask.getDays() || checkHourTask(hasTask, plan)) { //生成保养计划 int m = this.createOrderPlan(plan); 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 0e2a464e5..3c41d79fb 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 @@ -20,6 +20,7 @@ import com.op.system.api.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.device.service.IEquOrderService; +import org.springframework.util.CollectionUtils; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -88,8 +89,16 @@ public class EquOrderServiceImpl implements IEquOrderService { List detailList = equOrderDetailMapper.selectEquOrderDetailByOrderCode(order.getOrderCode()); for (EquOrderDetail detail : detailList) { // 标准 - List standardList = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getId()); - detail.setStandardList(standardList); + List standardLists = equOrderStandardMapper.selectEquOrderStandardByParentCode(detail.getId()); + for (EquOrderStandard standardList : standardLists) { + //每个检查标准里面的照片 + String imageType = "3"; + List file = equOrderStandardMapper.getBaseFileBatch(standardList.getId(), imageType); + if (!CollectionUtils.isEmpty(file)) { + standardList.setPicturePaths(file); + } + } + detail.setStandardList(standardLists); } order.setDetailList(detailList); @@ -110,6 +119,12 @@ public class EquOrderServiceImpl implements IEquOrderService { order.setPersonList(personList); + //保养图片信息 + String imageType = "3"; + List file = equOrderStandardMapper.getBaseFileBatch(order.getOrderId(), imageType); + if (!CollectionUtils.isEmpty(file)) { + order.setPicturePaths(file); + } return order; } @@ -209,6 +224,8 @@ public class EquOrderServiceImpl implements IEquOrderService { } // 获取检查项信息列表 + //照片格式 + String imageType = "3"; List detailList = equOrder.getDetailList(); // 处理检查项信息 for (EquOrderDetail detail : detailList) { @@ -216,7 +233,8 @@ public class EquOrderServiceImpl implements IEquOrderService { List standardList = detail.getStandardList(); // 处理标准信息 for (EquOrderStandard standard : standardList) { - + //删除之前的图片，重新上传 + equOrderStandardMapper.deleteBaseFileBySourceId(standard.getId(), imageType); //上传附件 if (StringUtils.isNotEmpty(standard.getPicturePath())) { String[] ids = standard.getPicturePath().split(","); @@ -265,6 +283,7 @@ public class EquOrderServiceImpl implements IEquOrderService { equOrder.setUpdateBy(SecurityContextHolder.getUserName()); equOrder.setPlanPerson(SecurityContextHolder.getUserName());// 设置负责人 equOrder.setOrderEnd(DateUtils.getNowDate());// 设置结束时间 + equOrder.setOrderStart(DateUtils.getNowDate());// 设置检查时间开始，实际上不需要开始时间 if (equOrder.getTimeArray().size() > 0) { equOrder.setOrderStart(equOrder.getTimeArray().get(0));// 工单开始时间 equOrder.setOrderEnd(equOrder.getTimeArray().get(1));// 工单结束时间 @@ -355,6 +374,7 @@ public class EquOrderServiceImpl implements IEquOrderService { } // 保养图片 + equOrderStandardMapper.deleteBaseFileBySourceId(equOrder.getOrderId(), imageType); if (StringUtils.isNotEmpty(equOrder.getPicturePath())) { String[] ids = equOrder.getPicturePath().split(","); List files = new ArrayList<>(); @@ -367,6 +387,7 @@ public class EquOrderServiceImpl implements IEquOrderService { file.setSourceId(equOrder.getOrderId()); file.setCreateBy(SecurityUtils.getUsername()); file.setCreateTime(new Date()); + file.setImageType("3"); files.add(file); } equFileMapper.insertEquFileBatch(files); 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 96df2cc7e..a060de6e6 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 @@ -145,9 +145,11 @@ public class EquPlanServiceImpl implements IEquPlanService { equPlan.setPlanId(IdUtils.fastSimpleUUID());// 计划id equPlan.setPlanCode((DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + planSerialNum));// 计划编码 - if (equPlan.getPlanTimeArray().size() > 0) { - equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));// 计划循环周期开始时间 - equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));// 计划循环周期结束时间 + if (equPlan.getPlanTimeArray() != null){ + if (equPlan.getPlanTimeArray().size() > 0) { + equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));// 计划循环周期开始时间 + equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));// 计划循环周期结束时间 + } } equPlan.setFactoryCode(factory);// 工厂编码 equPlan.setCreateBy(SecurityContextHolder.getUserName()); @@ -174,9 +176,11 @@ public class EquPlanServiceImpl implements IEquPlanService { @DS("#header.poolName") public AjaxResult updateEquPlan(EquPlan equPlan) { // 设置循环范围时间 - if (equPlan.getPlanTimeArray().size() != 0) { - equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));// 循环开始时间 - equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));// 循环结束时间 + if (equPlan.getPlanTimeArray() != null){ + if (equPlan.getPlanTimeArray().size() > 0) { + equPlan.setPlanLoopStart(equPlan.getPlanTimeArray().get(0));// 计划循环周期开始时间 + equPlan.setPlanLoopEnd(equPlan.getPlanTimeArray().get(1));// 计划循环周期结束时间 + } } // 更新计划 equPlanMapper.updateEquPlan(equPlan); diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml index 8f2bc8f8a..d6017b190 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml @@ -169,14 +169,17 @@ - select eo.order_id, eo.plan_id, eo.plan_code, eo.plan_type, eo.order_code, eo.plan_workshop, eo.plan_prod_line, - eo.plan_loop, - eo.plan_loop_type, - eo.plan_loop_start, eo.plan_loop_end, eo.order_start, eo.order_end, eo.equipment_code, eo.order_status, - eo.order_cost, eo.plan_person, eo.order_cost_time, eo.order_sign_person, - eo.factory_code, eo.attr1, eo.attr2, eo.attr3, eo.del_flag, eo.create_by, eo.create_time, - eo.update_by, - eo.update_time,eo.upkeep,eo.calculation_rule,eo.shut_down,eo.order_inspect,eo.repair_code,eo.work_code,eo.outsource_code, - be.equipment_name, - ep.plan_name planName + select + eo.order_id, + eo.plan_id, + eo.plan_code, + eo.plan_type, + eo.order_code, + eo.plan_workshop, + eo.plan_prod_line, + eo.plan_loop, + eo.plan_loop_type, + eo.plan_loop_start, + eo.plan_loop_end, + eo.order_start, + eo.order_end, + eo.equipment_code, + eo.order_status, + eo.order_cost, + eo.plan_person, + eo.order_cost_time, + eo.order_sign_person, + eo.factory_code, + eo.attr1, + eo.attr2, + eo.attr3, + eo.del_flag, + eo.create_by, + eo.create_time, + eo.update_by, + eo.update_time, + eo.upkeep, + eo.calculation_rule, + eo.shut_down, + eo.order_inspect, + eo.repair_code, + eo.work_code, + eo.outsource_code, + be.equipment_name, + ep.plan_name planName from equ_order eo left join base_equipment be on be.equipment_code = eo.equipment_code left join equ_plan ep on ep.plan_code = eo.plan_code @@ -83,23 +111,17 @@ and eo.plan_prod_line = #{planProdLine} and eo.plan_loop = #{planLoop} and eo.plan_loop_type = #{planLoopType} - and eo.equipment_code like concat('%', - #{equipmentCode}, '%') - - and be.equipment_name like concat('%', - #{equipmentName}, '%') - + and eo.equipment_code like concat('%',#{equipmentCode}, '%') + and be.equipment_name like concat('%',#{equipmentName}, '%') and eo.plan_loop_start = #{planLoopStart} and eo.plan_loop_end = #{planLoopEnd} and CONVERT(date,eo.order_start) = #{orderStart} and eo.order_end = #{ord5erEnd} and eo.order_status = #{orderStatus} and eo.order_cost = #{orderCost} - and eo.plan_person like concat('%', #{planPerson}, '%') - + and eo.plan_person like concat('%', #{planPerson}, '%') and eo.order_cost_time = #{orderCostTime} - and eo.order_sign_person = #{orderSignPerson} - + and eo.order_sign_person = #{orderSignPerson} and eo.factory_code = #{factoryCode} and eo.attr1 = #{attr1} and eo.attr2 = #{attr2} @@ -124,6 +146,7 @@ and #{orderStartArrayEnd} >= CONVERT(date,eo.order_start) and CONVERT(date,eo.order_end) >= #{orderEndArrayStart} and #{orderEndArrayEnd} >= CONVERT(date,eo.order_end) + and ep.plan_name like concat('%', #{planName}, '%') and eo.del_flag = '0' and be.del_flag = '0' and ep.del_flag = '0' order by eo.create_time desc @@ -195,14 +218,14 @@ eo.outsource_code, be.equipment_name from equ_order eo - left join base_equipment be on eo.equipment_code = be.equipment_code + left join base_equipment be on eo.equipment_code = be.equipment_code where eo.plan_type = #{planType} - and eo.del_flag = '0' - and eo.order_status != '1' - and eo.order_code in (select order_code + and eo.del_flag = '0' + and eo.order_status != '1' + and eo.order_code in (select order_code from equ_order_person where del_flag = '0' - and user_name = #{userId} + and user_name = #{userId} GROUP BY order_code) order by eo.plan_loop_type, eo.plan_loop, eo.create_time desc, eo.equipment_code @@ -245,12 +268,12 @@ eo.outsource_code, be.equipment_name from equ_order eo - left join base_equipment be on eo.equipment_code = be.equipment_code + left join base_equipment be on eo.equipment_code = be.equipment_code where eo.del_flag = '0' - and eo.order_status = '1' - and eo.plan_type = #{planType} - and eo.plan_person = #{userId} - and eo.order_code in (select order_code + and eo.order_status = '1' + and eo.plan_type = #{planType} + and eo.plan_person = #{userId} + and eo.order_code in (select order_code from equ_order_person where del_flag = '0' and user_name = #{userId} GROUP BY order_code) @@ -404,18 +427,18 @@ select - eo.order_id, - eo.order_code, - eo.repair_code, - eo.work_code, - eo.plan_loop, - eo.plan_loop_type, - eod.id, - eod.item_name, - eod.item_method, - eod.item_type, - eod.item_type_name, - eod.item_tools + eo.order_id, + eo.order_code, + eo.repair_code, + eo.work_code, + eo.plan_loop, + eo.plan_loop_type, + eod.id, + eod.item_name, + eod.item_method, + eod.item_type, + eod.item_type_name, + eod.item_tools from equ_order eo left join equ_order_detail eod on eo.order_code = eod.order_code where eo.repair_code = #{repairCode} @@ -446,7 +469,7 @@ + insert into mes_report_work_consume diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 8c3eb224d..b9b62aa97 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -563,7 +563,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mrw.use_man useMan, mrw.create_time createTime, pow.workorder_code_sap workorderCodeSap, - mrw.remark + mrw.remark,mrw.report_code reportCode from mes_report_work mrw left join pro_order_workorder pow on mrw.workorder_code = pow.workorder_code where mrw.del_flag='0' and pow.del_flag = '0' @@ -766,6 +766,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) mt LEFT JOIN pro_order_workorder pow ON pow.workorder_id = mt.OrderCode WHERE pow.order_code IS NOT NULL + + and pow.shift_id = #{shiftId} + and pow.product_code like concat('%', #{productCode}, '%') @@ -936,6 +939,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where 1=1 and id = #{id} and workorder_code = #{workorderCode} + and machine_code = #{machineCode} update pro_order_workorder @@ -962,7 +966,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" upload_time = null, upload_status = '0', upload_msg = null - where workorder_code = #{workorderCode} or parent_order = #{workorderCode} + where (workorder_code = #{workorderCode} or parent_order = #{workorderCode}) + and machine_code = #{machineCode} update mes_report_work_consume @@ -973,6 +978,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update mes_report_work set remark = #{item.remark} where workorder_code = #{item.workorderCode} + and report_code = #{item.reportCode} diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java index 196cb84ff..edcf14c1a 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckProject.java @@ -85,6 +85,26 @@ public class QcCheckProject extends BaseEntity { private String materialCode; private String typeCode; private String groupId; + @Excel(name = "检测项分类",readConverterExp = "0=内容物,1=包装") + private String itemType; + @Excel(name = "合格判定比例") + private String judgeRate; + + public String getItemType() { + return itemType; + } + + public void setItemType(String itemType) { + this.itemType = itemType; + } + + public String getJudgeRate() { + return judgeRate; + } + + public void setJudgeRate(String judgeRate) { + this.judgeRate = judgeRate; + } public String getProjectType() { return projectType; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java index e21936046..5583b8fbf 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java @@ -138,6 +138,33 @@ public class QcCheckTaskDetail extends BaseEntity { private String defectCodes; private String defectNames; private String defectQualitys; + private String itemType; + private String judgeRate; + private String samplePlan; + + public String getSamplePlan() { + return samplePlan; + } + + public void setSamplePlan(String samplePlan) { + this.samplePlan = samplePlan; + } + + public String getItemType() { + return itemType; + } + + public void setItemType(String itemType) { + this.itemType = itemType; + } + + public String getJudgeRate() { + return judgeRate; + } + + public void setJudgeRate(String judgeRate) { + this.judgeRate = judgeRate; + } public String getDefectCodes() { return defectCodes; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java index 508ff2982..73adbf713 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java @@ -111,6 +111,24 @@ public class QcCheckTypeProject extends BaseEntity { private String checkMode; private String unit; private String weight; + private String itemType; + private String judgeRate; + + public String getItemType() { + return itemType; + } + + public void setItemType(String itemType) { + this.itemType = itemType; + } + + public String getJudgeRate() { + return judgeRate; + } + + public void setJudgeRate(String judgeRate) { + this.judgeRate = judgeRate; + } public String getWeight() { return weight; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckProjectMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckProjectMapper.java index e64febec0..25a37844d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckProjectMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckProjectMapper.java @@ -65,6 +65,7 @@ public interface QcCheckProjectMapper { public QcCheckProject selectSerialNumber(); public QcCheckProject selectCheckProjectByRuleName(@Param("ruleName") String ruleName, - @Param("projectType") String projectType); + @Param("projectType") String projectType, + @Param("sort") String sort); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskProduceMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskProduceMapper.java index 3878ffdc9..0fd8942b5 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskProduceMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskProduceMapper.java @@ -86,5 +86,4 @@ public interface QcCheckTaskProduceMapper { public List getOrderWorksW2(ProOrderWorkorderDTO qoWork); public QcCheckTaskProduce getLastXJTask(QcCheckTaskProduce productTask); - } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskWarehousingMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskWarehousingMapper.java index 81bc38708..f8630bb02 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskWarehousingMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskWarehousingMapper.java @@ -65,4 +65,6 @@ public interface QcCheckTaskWarehousingMapper { int getTodayMaxNum(QcCheckTaskWarehousing qcCheckTaskWarehousing); List getQcListLoc(QcCheckTaskWarehousing qcCheckTaskWarehousing); + + int updateWorkOrderStauts(QcCheckTaskWarehousing qcCheckTaskWarehousing); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckProjectServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckProjectServiceImpl.java index b1e5c5903..6ca2741a7 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckProjectServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckProjectServiceImpl.java @@ -154,7 +154,8 @@ public class QcCheckProjectServiceImpl implements IQcCheckProjectService { if (checkResult.isSuccess()) { for (QcCheckProject project : projectList) { try { - QcCheckProject pro = qcCheckProjectMapper.selectCheckProjectByRuleName(project.getRuleName(), project.getProjectType()); + QcCheckProject pro = qcCheckProjectMapper.selectCheckProjectByRuleName(project.getRuleName(), + project.getProjectType(),project.getSort().toString()); if (ObjectUtils.isEmpty(pro)) { BeanValidators.validateWithException(validator, project); project.setId(IdUtils.fastSimpleUUID()); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index a5a48c6af..a807a5fe9 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -537,7 +537,7 @@ public class QcCheckTaskIncomeServiceImpl implements List dtos = qcCheckUnqualifiedMapper.getProductWorkOrder(qcCheckTaskIncome); for(QcCheckTaskIncome dto:dtos){ String statusName = ""; - if("w5".equals(dto.getStatus())){ + if("w5".equals(dto.getStatus())){//设计有问题TODO statusName = "质检完成"; }else{ statusName = "质检未完成"; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java index 6c3e3aab3..1ed7bd5e9 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java @@ -253,7 +253,13 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin item.setFactoryCode(factoryCode); item.setStatus("Y"); } - return qcCheckTaskDetailMapper.addBatch(items); + int s = qcCheckTaskDetailMapper.addBatch(items); + +// /**pro_order_workorder**/ +// qcCheckTaskWarehousing.setStatus("w6"); +// qcCheckTaskWarehousingMapper.updateWorkOrderStauts(qcCheckTaskWarehousing); + logger.info("qc_check_task_detail:"+s+"成功"); + return 1; } /** @@ -370,20 +376,18 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin List w3works = qcCheckTaskProduceMapper.getOrderWorksW2(qoWork); for(QcCheckTaskProduce productTask:w3works){ QcCheckTaskWarehousing cpTask = new QcCheckTaskWarehousing(); - BeanUtils.copyProperties(productTask,cpTask); - productTask.setCheckType("checkTypeCP");//入库检验 productTask.setOrderNo(productTask.getWorkorderCode()); + BeanUtils.copyProperties(productTask,cpTask); -// //是否已经存在入库检验 -// QcCheckTaskProduce cpTask0 = qcCheckTaskProduceMapper.getLastXJTask(productTask); -// if(cpTask0 == null){ -// logger.info("++++++++++++入库检验任务生成:已经存在++++++++++++++"); -// }else{ -// int m = insertQcCheckTaskWarehousing(cpTask); -// logger.info("++++++++++++入库检验任务生成" + m + "++++++++++++++"); -// } - + //是否已经存在入库检验 + QcCheckTaskProduce cpTask0 = qcCheckTaskProduceMapper.getLastXJTask(productTask); + if(cpTask0 != null){ + logger.info("++++++++++++入库检验任务生成:已经存在++++++++++++++"); + }else{ + int m = insertQcCheckTaskWarehousing(cpTask); + logger.info("++++++++++++入库检验任务生成" + m + "++++++++++++++"); + } } logger.info("++++++++++++" + poolName + "++++入库检验巡检结束++++++++++"); } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckProjectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckProjectMapper.xml index de55ae006..6877a4b59 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckProjectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckProjectMapper.xml @@ -25,13 +25,16 @@ + + select id, order_num, rule_name, property_code, check_mode, check_tool, unit_code, check_standard, attr1, create_by, create_time, update_by, update_time, factory_code, del_flag,sample_plan, - judge,defect_level,project_type,sort - from qc_check_project + judge,defect_level,project_type,sort,item_type,judge_rate + + from qc_check_project - where rule_name = #{ruleName} and project_type = #{projectType} + where rule_name = #{ruleName} and project_type = #{projectType} and sort = #{sort} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml index f7f997ba7..4a797b31c 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml @@ -153,7 +153,9 @@ qctp.upper_diff upperDiff, qctp.down_diff downDiff, qctp.sample, - qctp.sample_num sampleNum, + qcp.sample_plan samplePlan, + qctp.item_type itemType, + qctp.judge_rate judgeRate, qpt.standard_no standardNo from qc_check_task_detail td left join qc_check_type_project qctp on td.type_project_id = qctp.id diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index 037a04011..975881d67 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -434,8 +434,8 @@ left join base_equipment be on be.equipment_code = pow.workorder_name and be.equipment_type_code = 'equ_type_bzx' where pow.del_flag = '0' and pow.status = #{status} and pow.parent_order = '0' - + and (pow.product_date = CONVERT(varchar(10),GETDATE(), 120) + or pow.product_date = CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120)) + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml index 83779e654..89d33e94d 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml @@ -213,6 +213,9 @@ where record_id = #{recordId} + + update pro_order_workorder set status = #{status} where workorder_code = #{orderNo} and del_flag = '0' + delete from qc_check_task where record_id = #{recordId} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml index f5d2e70e8..1403d928c 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml @@ -216,7 +216,8 @@ standard_value,upper_diff,down_diff,unit, sample,sort, create_by,create_time, - group_id,material_code,property_code + group_id,material_code,property_code, + item_type,judge_rate )values ( @@ -224,7 +225,8 @@ #{item.standardValue},#{item.upperDiff},#{item.downDiff},#{item.unit}, #{item.sample},#{item.sort}, #{item.createBy},#{item.createTime}, - #{item.groupId},#{item.materialCode},#{item.propertyCode} + #{item.groupId},#{item.materialCode},#{item.propertyCode}, + #{item.itemType},#{item.judgeRate} ) @@ -270,18 +272,20 @@