首页未开工提醒

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

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<ProOrderWorkorder> getUnReadComment(@RequestBody ProOrderWorkorder proOrderWorkorder) {
+        return proOrderWorkorderService.getUnReadComment(proOrderWorkorder);
+    }
 }

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;
     }

op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java

@@ -205,5 +205,7 @@ public interface ProOrderWorkorderMapper {
     List<ProOrderWorkorder> getProductOrders(@Param("orderIds") String[] orderIds);
 
     int deleteWetMaterial(@Param("orderIds")String[] workorderIds);
+
+    List<ProOrderWorkorder> getUnReadComment(ProOrderWorkorder proOrderWorkorder);
 }
 

op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java

@@ -135,4 +135,6 @@ public interface IProOrderWorkorderService {
     List<String> getOrderNotW0(String[] workorderIds);
 
     int deleteWetMaterial(String[] workorderIds);
+
+    List<ProOrderWorkorder> getUnReadComment(ProOrderWorkorder proOrderWorkorder);
 }

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<ProOrderWorkorder> getUnReadComment(ProOrderWorkorder proOrderWorkorder) {
+        List<ProOrderWorkorder> 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<String, CascaderDTO> 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;
+    }
+
     /**
      * 校验工单是否可以修改
      * 如果工单已生成湿料计划则不允许修改

op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml

@@ -581,6 +581,27 @@
         and del_flag = '0'
         and status in('w2','w3')
     </select>
+    <select id="getUnReadComment" resultType="com.op.plan.domain.ProOrderWorkorder">
+        select
+            concat(pow.product_date,' ',bdd.dict_value) productDateStr,
+            pow.workorder_code workorderCode,
+            pow.workorder_code_sap workorderCodeSap,
+            pow.product_code productCode,
+            pow.product_name productName,
+            pow.prod_line_code prodLineCode,
+            pow.quantity_split quantitySplit,
+            pow.unit,
+            bst.Shift_Desc shiftId,
+            DATEDIFF(HOUR, CONVERT(DATETIME, concat(pow.product_date,' ',bdd.dict_value)), GETDATE()) difHours
+        from pro_order_workorder pow
+                 left join base_dict_data bdd on bdd.dict_type ='work_order_start' and bdd.dict_label = pow.shift_id
+                 left join base_shifts_t bst on bst.Shift_Id = pow.shift_id
+        where pow.status='w1' and DATEDIFF(HOUR, CONVERT(DATETIME, concat(pow.product_date,' ',bdd.dict_value)), GETDATE()) >= 1
+          and pow.del_flag = '0' and bst.del_flag = '0'
+          and (pow.product_date = CONVERT(varchar(10),GETDATE(), 120)
+            or pow.product_date = CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120))
+        order by pow.product_date desc
+    </select>
 
     <insert id="createPrepareDetails">
         insert into mes_prepare_detail