From f7bfe55f2371ff943038d77c2dafb1c445888b41 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 26 Apr 2024 17:36:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9C=AA=E5=BC=80=E5=B7=A5?= =?UTF-8?q?=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/mes/MesReportWorkMapper.xml | 2 +- .../ProOrderWorkorderController.java | 6 +++++ .../com/op/plan/domain/ProOrderWorkorder.java | 19 ++++++++++++++ .../plan/mapper/ProOrderWorkorderMapper.java | 2 ++ .../service/IProOrderWorkorderService.java | 2 ++ .../impl/ProOrderWorkorderServiceImpl.java | 25 +++++++++++++++++++ .../mapper/plan/ProOrderWorkorderMapper.xml | 21 ++++++++++++++++ 7 files changed, 76 insertions(+), 1 deletion(-) 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 77110d0ee..226ffd670 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 @@ -684,7 +684,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join pro_order_workorder pow on mrw.workorder_code = pow.workorder_code left join base_equipment equ on equ.equipment_code = mrw.machine_code left join pro_order po on po.order_code = pow.order_code - where mrw.parent_order = '0' + where mrw.parent_order = '0' and pow.del_flag = '0' and mrw.workorder_code = #{workorderCode} and mrw.del_flag = '0' and po.del_flag = '0' order by mrw.batch diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java index 333d7f928..62a39335c 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java @@ -261,4 +261,10 @@ public class ProOrderWorkorderController extends BaseController { } return toAjax(proOrderWorkorderService.downProOrderWorkorderByWorkorderIds(workorderIds)); } + + /**未开始的工单提醒**/ + @PostMapping("/getUnReadComment") + public List getUnReadComment(@RequestBody ProOrderWorkorder proOrderWorkorder) { + return proOrderWorkorderService.getUnReadComment(proOrderWorkorder); + } } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java index 7bac0bcea..23134b663 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrderWorkorder.java @@ -115,6 +115,25 @@ public class ProOrderWorkorder extends TreeEntity { private String prodLineName; private String belongWorkOrder; + private String productDateStr; + private Double difHours; + + public String getProductDateStr() { + return productDateStr; + } + + public void setProductDateStr(String productDateStr) { + this.productDateStr = productDateStr; + } + + public Double getDifHours() { + return difHours; + } + + public void setDifHours(Double difHours) { + this.difHours = difHours; + } + public String getBelongWorkOrder() { return belongWorkOrder; } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java index ea6059453..4b687cab3 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java @@ -205,5 +205,7 @@ public interface ProOrderWorkorderMapper { List getProductOrders(@Param("orderIds") String[] orderIds); int deleteWetMaterial(@Param("orderIds")String[] workorderIds); + + List getUnReadComment(ProOrderWorkorder proOrderWorkorder); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java index 5cb09d428..1d83c0177 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java @@ -135,4 +135,6 @@ public interface IProOrderWorkorderService { List getOrderNotW0(String[] workorderIds); int deleteWetMaterial(String[] workorderIds); + + List getUnReadComment(ProOrderWorkorder proOrderWorkorder); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 21d1f7451..bf3f87500 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -1108,6 +1108,31 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { return proOrderWorkorderMapper.deleteWetMaterial(workorderIds); } + @Override + @DS("#header.poolName") + public List getUnReadComment(ProOrderWorkorder proOrderWorkorder) { + List dtos = proOrderWorkorderMapper.getUnReadComment(proOrderWorkorder); + for(ProOrderWorkorder workorder:dtos){ + String prodLineName = ""; + String equipCods = "'"; + JSONArray codeArray = JSONArray.parseArray(workorder.getProdLineCode()); + for (int c = 0; c < codeArray.size(); c++) { + equipCods += codeArray.getJSONArray(c).getString(1) + "','"; + } + + Map equipMap = proOrderMapper.getEquipInfoByCodes(equipCods.substring(1));//设备字典 + for (int c = 0; c < codeArray.size(); c++) { + String equipCode = codeArray.getJSONArray(c).getString(1); + CascaderDTO eInfo = equipMap.get(equipCode); + if (eInfo != null) { + prodLineName += eInfo.getLabel() + ","; + } + } + workorder.setProdLineName(prodLineName); + } + return dtos; + } + /** * 校验工单是否可以修改 * 如果工单已生成湿料计划则不允许修改 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 05df467a3..ce24afe4e 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 @@ -581,6 +581,27 @@ and del_flag = '0' and status in('w2','w3') + insert into mes_prepare_detail