From eabfa9449d740b2fd93480ccda59682c5e7dbcfa Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 7 Mar 2024 15:41:32 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E5=A2=9E=E5=8A=A0sap?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MesReportWorkController.java | 2 +- .../java/com/op/mes/domain/MesReportWork.java | 27 +++++++------------ .../service/impl/IWCInterfaceServiceImpl.java | 6 ++--- .../mapper/mes/MesReportWorkMapper.xml | 9 ++++--- 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java index 37521890e..ad034b78a 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -52,7 +52,7 @@ import com.op.common.core.utils.poi.ExcelUtilDailyReport; * @date 2023-08-24 */ @RestController -@RequestMapping("./reportWork") +@RequestMapping("/reportWork") public class MesReportWorkController extends BaseController { @Autowired private IMesReportWorkService mesReportWorkService; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java index cab779e95..f87cb2e99 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java @@ -86,8 +86,6 @@ public class MesReportWork extends BaseEntity { @Excel(name = "物料消耗单位") private String materialNameUnit; - - /** 报工单编号 */ // @Excel(name = "报工单编号") private String reportCode; @@ -96,18 +94,12 @@ public class MesReportWork extends BaseEntity { //@Excel(name = "报工类型，报工类型：SELF上位机报工、UNI系统报工") private String reportType; - /** 规格型号 */ //@Excel(name = "规格型号") private String spec; - - - - private BigDecimal quantitySplit; - /** 合格数量 */ //@Excel(name = "合格数量") private BigDecimal quantityQualified; @@ -120,13 +112,9 @@ public class MesReportWork extends BaseEntity { //@Excel(name = "报工人员") private String userName; - - /** 报工途径：PAD、MOBILE、PC */ //@Excel(name = "报工途径：PAD、MOBILE、PC") private String feedbackChannel; - - private String feedbackTimeStr; /** 录入人员 */ @@ -137,16 +125,10 @@ public class MesReportWork extends BaseEntity { //@Excel(name = "状态") private String status; - - - - /** 线体编码 */ //@Excel(name = "线体编码") private String machineCode; - - /** 班组编码 */ //@Excel(name = "班组编码") private String teamCode; @@ -226,6 +208,15 @@ public class MesReportWork extends BaseEntity { private String voucher; //版本 private String version; + private String sapCode; + + public String getSapCode() { + return sapCode; + } + + public void setSapCode(String sapCode) { + this.sapCode = sapCode; + } public String getVoucher() { return voucher; 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 34e09174f..f74650426 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 @@ -344,7 +344,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { /**(两层报工)子工单先报工，然后母工单报工**/ mesReportWork.setUploadStatus("1");//除了1报工成功的，都需要报工 mesReportWork.setProdType("prod"); - mesReportWork.setWorkorderCode(workOrders.get(1).getWorkorderCode()); + mesReportWork.setWorkorderCode(workOrders.get(0).getWorkorderCode()); MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork); if(sHzWorks==null){ return R.fail("未查询到子报工单"); @@ -355,7 +355,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { logger.info("==========================子工单报工结束:"+JSONObject.toJSONString(sapRson)); if(sapRson.getCode()== 200){ //一定是子单报工成功返回后，再母单报工 - mesReportWork.setWorkorderCode(workOrders.get(0).getWorkorderCode()); + mesReportWork.setWorkorderCode(workOrders.get(1).getWorkorderCode()); MesReportWork pHzWork = mesReportWorkMapper.getReportWorkHz(mesReportWork); if(pHzWork==null){ return R.fail("未查询到母报工单"); @@ -449,8 +449,8 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { return R.fail("mes_report_work_consume没有数据"); } sapRFW.setLt_hwList(lt_hwList); + sapRFW.setAnzma(workOrder.getSapCode());//产线编号 logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工请求：" + JSONObject.toJSONString(sapRFW)); - R r = remoteSapService.sapRFWOrder(sapRFW); logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工结果：" + r.getCode() + "," + r.getData() + "," + r.getMsg()); //上传成功，更改mes_report_work状态 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 85808be7e..fd8f7a955 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 @@ -572,7 +572,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mrw.product_code productCode, mrw.product_name productName, mrw.sac1, - mrw.sac2 + mrw.sac2, + equ.sap_code sapCode from ( select workorder_code, @@ -588,7 +589,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by workorder_code,product_code,product_name,use_man ) mrw left join pro_order_workorder ow on mrw.workorder_code = ow.workorder_code - + left join base_equipment equ on equ.equipment_code = ow.workorder_name select be.equipment_code AS 'equipmentCode', be.equipment_name AS 'equipmentName',be.equipment_status AS - 'equipmentStatus', (SELECT ROUND( + 'equipmentStatus',be.department AS + 'department',(SELECT ROUND( SUM(CAST(fault_time AS FLOAT)) / SUM(CAST(actual_operation_time AS FLOAT)), 2) From 8bb60b521265561bf4cbfb15534ad1805a3f1c77 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 7 Mar 2024 21:43:14 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=AE=9A=E7=82=B9=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op-job/src/main/java/com/op/job/task/RyTask.java | 2 +- .../java/com/op/quality/controller/QuaController.java | 6 ++++++ .../service/impl/QcCheckTaskProduceServiceImpl.java | 10 +++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java b/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java index f59d6ea5b..2868bf0e4 100644 --- a/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java +++ b/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java @@ -155,7 +155,7 @@ public class RyTask { } /************质量管理系统定时任务开始*****************/ - //过程巡检，每15分钟执行一次 + //过程巡检，改为整点08：00-20：00运行 public void createProduceXJTask(){ logger.info("++质量管理系统+过程巡检+开始++createProduceXJTask+++++"); remoteQualityService.createProduceXJTask(); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index fefd949cf..38a2a79fb 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -189,6 +189,12 @@ public class QuaController extends BaseController { if(CollectionUtils.isEmpty(qcCheckTaskIncome.getQcCheckTaskDetails())){ return error("[List]不能为空"); } + if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateBy())){ + return error("[updateBy]不能为空"); + } + if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateByName())){ + return error("[updateByName]不能为空"); + } return toAjax(qcCheckTaskIncomeService.commitCheckResults(qcCheckTaskIncome)); } /** diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java index cb3635798..dbc19808e 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java @@ -383,14 +383,14 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService for(QcCheckTaskProduce productTask:works){ productTask.setCheckType("checkTypeSCXJ");//过程检验-巡检 productTask.setOrderNo(productTask.getWorkorderCode()); - Date nowTime = DateUtils.getNowDate(); - Date startTime = productTask.getCreateTime(); +// Date nowTime = DateUtils.getNowDate(); +// Date startTime = productTask.getCreateTime(); - long mins = DateUtil.between(startTime, nowTime, DateUnit.MINUTE); - if(mins>=60){ +// long mins = DateUtil.between(startTime, nowTime, DateUnit.MINUTE); +// if(mins>=60){ int m = insertQcCheckTaskProduce(productTask); logger.info("++++++++++++过程检验巡检任务生成" + m + "++++++++++++++"); - } +// } } logger.info("++++++++++++" + poolName + "++++过程检验巡检结束++++++++++"); } From 841b3029c20fecd2dded1786647c5adfd627969d Mon Sep 17 00:00:00 2001 From: A0010407 Date: Fri, 8 Mar 2024 12:01:19 +0800 Subject: [PATCH 04/12] =?UTF-8?q?2024-3-8=20=E8=AE=BE=E5=A4=87=E6=A8=A1?= =?UTF-8?q?=E5=9D=97-=E8=AE=BE=E5=A4=87=E7=9C=8B=E6=9D=BF=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/device/domain/vo/IEquipmentVO.java | 8 ++++---- .../impl/DeviceInterfaceServiceImpl.java | 18 +++++++++--------- .../mapper/device/DeviceInterfaceMapper.xml | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/vo/IEquipmentVO.java b/op-modules/op-device/src/main/java/com/op/device/domain/vo/IEquipmentVO.java index a079d7ac3..0b2edfd88 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/vo/IEquipmentVO.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/vo/IEquipmentVO.java @@ -12,8 +12,8 @@ public class IEquipmentVO { private Double failureRate; // 设备有效利用率 private Double utilizationRatio; - // 设备维修质量 - private Double rapairQuantity; + // 设备维修质量 拼错了！！！！！ + private String rapairQuantity; // 设备状态 private String equipmentStatus; @@ -25,11 +25,11 @@ public class IEquipmentVO { this.equipmentStatus = equipmentStatus; } - public Double getRapairQuantity() { + public String getRapairQuantity() { return rapairQuantity; } - public void setRapairQuantity(Double rapairQuantity) { + public void setRapairQuantity(String rapairQuantity) { this.rapairQuantity = rapairQuantity; } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java index 0a560a28c..9045db323 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java @@ -95,26 +95,26 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { runTime += diffTime; } // 计算维修质量（故障时间（小时）/故障次数） - double rapairQuantity = runTime / 3600000 / workOrderList.size(); - equipmentVO.setRapairQuantity(Double.valueOf(rapairQuantity)); + Double rapairQuantity = runTime / 3600000 / workOrderList.size(); + String douStr = String.format("%.2f", rapairQuantity); + equipmentVO.setRapairQuantity(douStr); } else { // 没有该记录则默认为0 - equipmentVO.setRapairQuantity(0D); + equipmentVO.setRapairQuantity("0.00"); } } // 按照raparQuantity字段进行排序，并使用subList获取前10个结果 List top10 = equipmentVOList.stream() - .sorted(Comparator.comparingDouble(IEquipmentVO::getRapairQuantity)) // 排序 - .limit(10) // 限制结果数量为10 - .collect(Collectors.toList()); // 将结果收集到List中 - + .sorted(Comparator.comparing(IEquipmentVO::getRapairQuantity).reversed())// 由正序改为 反转排序 倒序 +// .limit(10) // 限制结果数量为10 改为不限制结果数量 + .collect(Collectors.toList()); //将结果收集到List中 return success(top10); } /** - * 设备稳定性-MTBF top10 + * 设备稳定性-MTBF * 公式：实际运转时间/停机次数 */ @Override @@ -132,7 +132,7 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { /** * 完好设备占比 - * 公式：维修/故障设备 + * 公式：（所有设备-故障设备）/所有设备 */ @Override @DS("#header.poolName") 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 bdd8cff70..9cd330cc4 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 @@ -96,7 +96,7 @@ )/COUNT(equipment_code) as decimal(18,2))as mtbf from equ_operation eo - and day(eo.create_time) = day(getdate()) + and convert(char(10),eo.create_time,120) = convert(char(10),getdate(),120) and month(eo.create_time) = month(getdate()) and year(eo.create_time) = year(getdate()) From 93d33895e7a67568cb5b998e7963eca7c8ea6258 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 8 Mar 2024 22:12:24 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E5=85=AC=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9+=E8=AE=A2=E5=8D=95=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9+=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E5=A4=9A=E5=87=BA=E4=B8=80=E6=9D=A1=E7=9A=84bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/mes/service/impl/IWCInterfaceServiceImpl.java | 8 ++++---- .../src/main/resources/mapper/mes/MesReportWorkMapper.xml | 2 +- .../java/com/op/open/service/impl/OpenServiceImpl.java | 5 ++++- .../resources/mapper/quality/QcCheckTaskProduceMapper.xml | 3 ++- .../java/com/op/sap/service/impl/SapOrderServiceImpl.java | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) 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 f74650426..349343ef1 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 @@ -295,14 +295,14 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { * * 其它 = 人工 * * 二层---------------------------------------- * * 子单进行报工的时候公式调整如下（数值单位不用管）： - * * 机器=sum(工时数/用人数) + * * 机器=sum(工时数) * * 人工 = 用人数*机器 * * 折旧 = 机器 * * 其它 = 人工 * *

* * 母单进行报工的时候公式调整如下： - * * 机器=子单机器 - * * 人工 = 管理系统维护的用人数*机器 + * * 机器=sum(工时数) + * * 人工 = 4*sum(工时数) * * 折旧 = 机器 * * 其它 = 人工 * * 三层及其以上---------------------------------------- @@ -368,7 +368,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { //母工单报工 logger.info("==========================母工单报工开始"); pHzWork.setQuantityFeedback(sHzWorks.getQuantityFeedback()); - pHzWork.setSac1(sHzWorks.getSac1()); + pHzWork.setSac2("4");//母单报工固定值 R sapR = this.reportHzToSap(pHzWork,2); logger.info("==========================母工单报工结束"+JSONObject.toJSONString(sapR)); return sapR; 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 fd8f7a955..a4a215856 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 @@ -578,7 +578,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select workorder_code, sum(quantity_feedback) quantity_feedback, - sum(round( work_time/use_man,2)) sac1, + sum(work_time) sac1, use_man sac2, product_code, product_name diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index 00aae8e00..85ad36a0e 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -391,7 +391,10 @@ public class OpenServiceImpl implements OpenService { } /**qc_check_task**/ - + if("checkTypeSCXJ".equals(qcCheckTaskProduce.getCheckType())){ + //巡检要求8-20点准点产生巡检任务。要求8点之前开始生产，那么第一条上位机触发的就当成模板 + qcCheckTaskProduce.setDelFlag("1"); + } qcCheckTaskProduce.setRecordId(beLongId); qcCheckTaskProduce.setFactoryCode(factoryCode); qcCheckTaskProduce.setCreateTime(nowDate); 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 926f70b41..ff5c67708 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 @@ -179,7 +179,8 @@ qct.confirm_man_name confirmManName from qc_check_task qct left join pro_order_workorder pow on qct.order_no = pow.workorder_code - where check_type = 'checkTypeSCXJ' and qct.del_flag = '0' and pow.del_flag = '0' + where qct.check_type = 'checkTypeSCXJ' + and pow.del_flag = '0' and CONVERT(varchar(10),income_time, 120) = CONVERT(varchar(10),GETDATE(), 120) and pow.status = 'w2' and pow.parent_order = '0' group by qct.factory_code, diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java index 7be1d435f..0c4d03a11 100644 --- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java +++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java @@ -228,7 +228,7 @@ public class SapOrderServiceImpl implements SapOrderService { // JCoDestination dest = SAPConnUtils.connect(); log.info("订单关闭入参------"+sapCloseOrderQuery.toString()); JCoRepository repository = dest.getRepository(); - JCoFunction func = repository.getFunction("ZPPR_MES_PRODORD_CLOSE"); + JCoFunction func = repository.getFunction("ZMES_AUFNR_CLOSE"); if (func == null) { throw new RuntimeException("Function does not exist in SAP"); } From adbf632d7475b32ee505c133a5d0e73b9b4202c8 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 8 Mar 2024 23:37:19 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BC=9A=E5=A4=9A=E4=B8=80=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/open/service/impl/OpenServiceImpl.java | 4 ---- .../resources/mapper/quality/QcCheckTaskProduceMapper.xml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index 85ad36a0e..146764e95 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -391,10 +391,6 @@ public class OpenServiceImpl implements OpenService { } /**qc_check_task**/ - if("checkTypeSCXJ".equals(qcCheckTaskProduce.getCheckType())){ - //巡检要求8-20点准点产生巡检任务。要求8点之前开始生产，那么第一条上位机触发的就当成模板 - qcCheckTaskProduce.setDelFlag("1"); - } qcCheckTaskProduce.setRecordId(beLongId); qcCheckTaskProduce.setFactoryCode(factoryCode); qcCheckTaskProduce.setCreateTime(nowDate); 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 ff5c67708..28de20adf 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 @@ -179,7 +179,7 @@ qct.confirm_man_name confirmManName from qc_check_task qct left join pro_order_workorder pow on qct.order_no = pow.workorder_code - where qct.check_type = 'checkTypeSCXJ' + where qct.check_type = 'checkTypeSCXJ' and qct.del_flag = '0' and pow.del_flag = '0' and CONVERT(varchar(10),income_time, 120) = CONVERT(varchar(10),GETDATE(), 120) and pow.status = 'w2' and pow.parent_order = '0' From c3125ca18bd6d6d997ae3c56143b5d658d71ebeb Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Sat, 9 Mar 2024 11:01:15 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=8A=A0=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/plan/ProOrderWorkorderMapper.xml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index ac5ed3a14..6d48cb75f 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -189,9 +189,18 @@ + + + + and belong_goal_id = #{belongGoalId} + + + and supplier_code = #{supplierCode} + + + and supplier_name like concat('%', #{supplierName}, '%') + + + and attr1 = #{attr1} + + + and attr2 = #{attr2} + + + and attr3 = #{attr3} + + + and attr4 = #{attr4} + + + and factory_code = #{factoryCode} + + + + + + + + insert into qc_goal_distribute + + id, + + belong_goal_id, + + supplier_code, + + supplier_name, + + attr1, + + attr2, + + attr3, + + attr4, + + create_by, + + create_time, + + update_by, + + update_time, + + factory_code, + + del_flag, + + + + #{id}, + + #{belongGoalId}, + + #{supplierCode}, + + #{supplierName}, + + #{attr1}, + + #{attr2}, + + #{attr3}, + + #{attr4}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + #{factoryCode}, + + #{delFlag}, + + + + + + update qc_goal_distribute + + belong_goal_id = + #{belongGoalId}, + + supplier_code = + #{supplierCode}, + + supplier_name = + #{supplierName}, + + attr1 = + #{attr1}, + + attr2 = + #{attr2}, + + attr3 = + #{attr3}, + + attr4 = + #{attr4}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + factory_code = + #{factoryCode}, + + del_flag = + #{delFlag}, + + + where id = #{id} + + + + delete from qc_goal_distribute where id = #{id} + + + + delete from qc_goal_distribute where id in + + #{id} + + + + + delete from qc_goal_distribute where belong_goal_id = #{belongGoalId} + + + + + + + + diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcGoalMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcGoalMapper.xml new file mode 100644 index 000000000..ea8481884 --- /dev/null +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcGoalMapper.xml @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, goal_ym, goal_type, noOk_rate, noOk_quality_rate, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code, del_flag, check_type, type_code, scope, parent_goal from qc_goal + + + + + + + + + + insert into qc_goal + + id, + + goal_ym, + + goal_type, + + noOk_rate, + + noOk_quality_rate, + + create_by, + + create_time, + + update_by, + + update_time, + + factory_code, + + del_flag, + + check_type, + + type_code, + + scope, + + parent_goal, + + + + #{id}, + + #{goalYm}, + + #{goalType}, + + #{nookRate}, + + #{nookQualityRate}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + #{factoryCode}, + + #{delFlag}, + + #{checkType}, + + #{typeCode}, + + #{scope}, + + #{parentGoal}, + + + + + + insert into qc_goal(id,goal_ym,goal_type,noOk_rate,noOk_quality_rate,create_by,create_time, + update_by,update_time,factory_code,check_type,type_code,scope,parent_goal)values + + (#{item.id}, + #{item.goalYm}, + #{item.goalType}, + #{item.nookRate}, + #{item.nookQualityRate}, + #{item.createBy}, + #{item.createTime}, + #{item.updateBy}, + #{item.updateTime}, + #{item.factoryCode}, + #{item.checkType}, + #{item.typeCode}, + #{item.scope}, + #{item.parentGoal}) + + + + + + update qc_goal + + goal_ym = + #{goalYm}, + + goal_type = + #{goalType}, + + noOk_rate = + #{nookRate}, + + noOk_quality_rate = + #{nookQualityRate}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + factory_code = + #{factoryCode}, + + del_flag = + #{delFlag}, + + check_type = + #{checkType}, + + type_code = + #{typeCode}, + + scope = + #{scope}, + + parent_goal = + #{parentGoal}, + + + where id = #{id} + + + + + delete from qc_goal where id = #{id} + + + + delete from qc_goal where id in + + #{id} + + + From 27a1e2bba2ee6b6142b6edeebb7d14774d2bee1a Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 11 Mar 2024 17:48:06 +0800 Subject: [PATCH 10/12] =?UTF-8?q?2024-3-11=20=E8=AE=BE=E5=A4=87=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9+=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=E5=BF=AB=E9=80=9F=E5=B7=A5=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/mapper/DeviceInterfaceMapper.java | 1 + .../impl/DeviceInterfaceServiceImpl.java | 9 ++++---- .../impl/EquRepairWorkOrderServiceImpl.java | 9 +++++++- .../mapper/device/DeviceInterfaceMapper.xml | 22 +++++++++++++++++++ 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java index 05406ff0d..68ef5667d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java @@ -26,6 +26,7 @@ public interface DeviceInterfaceMapper { * @return */ List selectEquipmentList(EquOperation equOperation); + List selectEquipmentVOList(EquOperation equOperation); /** * 获取维修工单中设备信息 diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java index 9045db323..238a36b6f 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java @@ -53,7 +53,7 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { /** * 获取设备信息 * 故障停机率:（设备停机时间总和/一定时间内运行总时间（年）） - * 设备有效利用率：（实际产量/理论产量） + * 设备有效利用率：（实际产量/理论产量）改为：一定天数内该设备的总开机时间/（天数*24小时） * * @return */ @@ -61,10 +61,10 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { @DS("#header.poolName") public AjaxResult getEquipmentInfo(EquOperation equOperation) { if (equOperation.getTimeDimension() == null) { - equOperation.setTimeDimension("dd"); + equOperation.setTimeDimension("yyyy"); } // 获取所有设备信息 - List equipmentVOList = deviceInterfaceMapper.selectEquipmentList(equOperation); + List equipmentVOList = deviceInterfaceMapper.selectEquipmentVOList(equOperation); return success(equipmentVOList); } @@ -107,7 +107,7 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { // 按照raparQuantity字段进行排序，并使用subList获取前10个结果 List top10 = equipmentVOList.stream() .sorted(Comparator.comparing(IEquipmentVO::getRapairQuantity).reversed())// 由正序改为 反转排序 倒序 -// .limit(10) // 限制结果数量为10 改为不限制结果数量 + .limit(10) // 限制结果数量为10 改为不限制结果数量 .collect(Collectors.toList()); //将结果收集到List中 return success(top10); } @@ -138,7 +138,6 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { @DS("#header.poolName") public AjaxResult getEquipmentIntactRate(EquOperation equOperation) { //查询所有设备（设备停用的除外） - // CAST(SUM(CASE WHEN equipment_status = '1' or equipment_status = '3' THEN 1 Else 0 END)*100.00/COUNT(*) as decimal(18,2)) AS intactRate EquOperation equipmentIntactRate = deviceInterfaceMapper.getEquipmentIntactRate(equOperation); Double totalEquipment = new Double(equipmentIntactRate.getTotalEquipment()); Double operationEquipment = new Double(equipmentIntactRate.getOperationEquipment()); 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 77360fa08..3698d7ec3 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 @@ -150,7 +150,14 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String key = "#header.poolName"; equRepairWorkOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", "")); - return equRepairWorkOrderMapper.insertEquRepairWorkOrder(equRepairWorkOrder); + int result = equRepairWorkOrderMapper.insertEquRepairWorkOrder(equRepairWorkOrder); + + //2.修改设备状态 + EquEquipment equEquipment = new EquEquipment(); + equEquipment.setEquipmentCode(equipmentCode); + equEquipment.setEquipmentStatus("0");//0故障 + equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment); + return result; } /** 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 9cd330cc4..05bcf3876 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 @@ -42,6 +42,28 @@ and be.equipment_category = '0' + + 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 a4a215856..33b8d2602 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 @@ -529,24 +529,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"