From 3293b83595b56bb30ec40f09a671b4499d91c735 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Sun, 28 Apr 2024 17:27:47 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=A2=84=E6=8A=A5=E5=B7=A5+=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E8=B0=83=E6=8B=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/MesReportWorkConsumeMapper.java | 2 ++ .../service/impl/IWCInterfaceServiceImpl.java | 9 ++++--- .../mapper/mes/MesReportWorkConsumeMapper.xml | 24 +++++++++++++++---- .../mapper/mes/MesReportWorkMapper.xml | 7 ++++-- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java index 7ccb2c3f..ab8fa790 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java @@ -81,4 +81,6 @@ public interface MesReportWorkConsumeMapper { List getBomList(MesReportWorkConsume mesReportWorkConsume); MesReportWorkConsume getNewConsumeInfo(String workorderCode); + + List getSumConsumeList(MesReportWorkConsume consumeqo); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index b5d72ead..4893bcfc 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -369,6 +369,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { //人工 = sum（每批的工时数*每批用人数） Sac2 //子工单报工 logger.info("==========================一层工单报工开始"); + sHzWorks.setMachineCode(mesReportWork.getMachineCode()); sapRson = this.reportHzToSap(sHzWorks); logger.info("==========================一层工单报工结束:"+JSONObject.toJSONString(sapRson)); }else if(workOrders.size()==2){ @@ -385,6 +386,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { BigDecimal reportRate = mesReportWorkMapper.getReportRate(workOrders.get(0).getProductCode()); //子工单报工 logger.info("==========================子工单报工开始"); + sHzWorks.setMachineCode(mesReportWork.getMachineCode()); sapRson = this.reportHzToSap(sHzWorks); logger.info("==========================子工单报工结束:"+JSONObject.toJSONString(sapRson)); if(sapRson.getCode()== 200){ @@ -408,7 +410,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { }else{ pHzWork.setQuantityFeedback(sHzWorks.getQuantityFeedback()); } - + pHzWork.setMachineCode(mesReportWork.getMachineCode()); //pHzWork.setSac2("4");//母单报工固定值(上位机插入数据时候默认4) R sapR = this.reportHzToSap(pHzWork); logger.info("==========================母工单报工结束"+JSONObject.toJSONString(sapR)); @@ -435,7 +437,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } //三层以上工单报工 logger.info("==========================三层(第"+n+"层)以上工单("+sHzWorks.getWorkorderCodeSap()+")报工开始"); - + sHzWorks.setMachineCode(mesReportWork.getMachineCode()); sapRson = this.reportHzToSap(sHzWorks); logger.info("==========================三层(第"+n+"层)以上工单("+sHzWorks.getWorkorderCodeSap()+")报工结束:" + JSONObject.toJSONString(sapRson)); @@ -476,7 +478,8 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { MesReportWorkConsume consumeqo = new MesReportWorkConsume(); consumeqo.setWorkorderCode(workOrder.getWorkorderCode()); consumeqo.setRecoil("X"); - List consumes = mesReportWorkConsumeMapper.selectMesReportWorkConsumeList(consumeqo); + consumeqo.setMachineCode(workOrder.getMachineCode()); + List consumes = mesReportWorkConsumeMapper.getSumConsumeList(consumeqo); if (!CollectionUtils.isEmpty(consumes)) { for (MesReportWorkConsume consume : consumes) { SapRFW.lt_hw lthw = new SapRFW.lt_hw();//MES生产订单报工货物移动修改 diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml index 54a5239e..717bb33a 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml @@ -103,7 +103,7 @@ where del_flag = '0' + 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 8c3eb224..aac387f7 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' @@ -936,6 +936,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 +963,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 +975,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} From 5578ef5c3c18c354e2b2df80940fced424cc6e26 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 29 Apr 2024 17:57:09 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E3=80=81=E6=A3=80=E6=B5=8B=E9=A1=B9=E9=85=8D=E7=BD=AE=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=A4=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/quality/domain/QcCheckProject.java | 20 +++++++++++ .../op/quality/domain/QcCheckTypeProject.java | 18 ++++++++++ .../quality/mapper/QcCheckProjectMapper.java | 3 +- .../mapper/QcCheckTaskProduceMapper.java | 1 - .../mapper/QcCheckTaskWarehousingMapper.java | 2 ++ .../impl/QcCheckProjectServiceImpl.java | 3 +- .../impl/QcCheckTaskIncomeServiceImpl.java | 2 +- .../QcCheckTaskWarehousingServiceImpl.java | 28 +++++++++------- .../mapper/quality/QcCheckProjectMapper.xml | 15 +++++++-- .../quality/QcCheckTaskProduceMapper.xml | 7 ++-- .../quality/QcCheckTaskWarehousingMapper.xml | 3 ++ .../quality/QcCheckTypeProjectMapper.xml | 33 +++++++++++-------- 12 files changed, 99 insertions(+), 36 deletions(-) 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 196cb84f..edcf14c1 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/QcCheckTypeProject.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java index 508ff298..73adbf71 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 e64febec..25a37844 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 3878ffdc..0fd8942b 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 81bc3870..f8630bb0 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 b1e5c590..6ca2741a 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 a5a48c6a..a807a5fe 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 6c3e3aab..1ed7bd5e 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 de55ae00..6877a4b5 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/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index 037a0401..975881d6 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 83779e65..89d33e94 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 f5d2e70e..1403d928 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 @@ - select count(*) from base_equipment be where be.del_flag = '0' and be.status = '1' + select count(1) + from base_equipment be + where be.del_flag = '0' + and be.status = '1' - 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 @@