大屏看板 三台机床数据接口

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/collection/DeviceCollectionTaskJob.java

@@ -461,7 +461,7 @@ public class DeviceCollectionTaskJob {
 
     //成航发
     //PLC报警信息数据采集
-    //@Scheduled(cron = "*/10 * * * * ?")
+    @Scheduled(cron = "*/10 * * * * ?")
     public void plcWarinCJ()  {
         try{
             Object map = msgUtil.redis_get(CacheKey.PLC_COSTOM_ADDRESS);

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/dao/TTaskMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.zuihou.base.mapper.SuperMapper;
+import com.github.zuihou.business.centralToolMagazine.dto.ChfTwoDatas;
 import com.github.zuihou.business.operationManagementCenter.entity.Plan;
 import com.github.zuihou.business.operationManagementCenter.entity.TTask;
 import com.github.zuihou.business.operationManagementCenter.entity.TaskNode;
@@ -72,4 +73,6 @@ public interface TTaskMapper extends SuperMapper<TTask> {
      * @return
      */
     String getNodeDataToRfidUse(Long nodeId);
+
+    List<ChfTwoDatas> getProduct(@Param("planStatus") String planStatus);
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/TaskService.java

@@ -5,6 +5,7 @@ import com.github.zuihou.base.R;
 import com.github.zuihou.base.service.SuperService;
 import com.github.zuihou.business.aps.instance.domain.basicdata.CandidateProcess;
 import com.github.zuihou.business.aps.instance.domain.basicdata.Machine;
+import com.github.zuihou.business.centralToolMagazine.dto.ChfProduct;
 import com.github.zuihou.business.centralToolMagazine.entity.PlcCostomAddress;
 import com.github.zuihou.business.centralToolMagazine.entity.ToolCostomAddress;
 import com.github.zuihou.business.operationManagementCenter.entity.OrderProduct;
@@ -123,4 +124,6 @@ public interface TaskService extends SuperService<TTask> {
     List<Map<String,List<ToolCostomAddress>>> chfToolWarning() throws IOException;
 
     List<PlcCostomAddress> chfPlcWarning();
+
+    Map<String,ChfProduct> chfTwoDatas();
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -24,6 +24,8 @@ import com.github.zuihou.business.centralToolMagazine.dao.PlcCostomAddressHistor
 import com.github.zuihou.business.centralToolMagazine.dao.PlcCostomAddressMapper;
 import com.github.zuihou.business.centralToolMagazine.dao.ToolCostomAddressHistoryMapper;
 import com.github.zuihou.business.centralToolMagazine.dao.ToolCostomAddressMapper;
+import com.github.zuihou.business.centralToolMagazine.dto.ChfProduct;
+import com.github.zuihou.business.centralToolMagazine.dto.ChfTwoDatas;
 import com.github.zuihou.business.centralToolMagazine.entity.PlcCostomAddress;
 import com.github.zuihou.business.centralToolMagazine.entity.PlcCostomAddressHistory;
 import com.github.zuihou.business.centralToolMagazine.entity.ToolCostomAddress;
@@ -1774,6 +1776,36 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         return returnList;
     }
 
+    @Override
+    public Map<String,ChfProduct> chfTwoDatas() {
+
+        Map<String,ChfProduct> map=new HashMap<>();
+        map.put("GMU800AVI-1",null);
+        map.put("GMU800AVI-2",null);
+        map.put("GMU800AVI-3",null);
+
+        //已排产 已生产
+        List<ChfTwoDatas> product = baseMapper.getProduct(null);
+
+        //已排产 待生产
+        List<ChfTwoDatas> pendProduct = baseMapper.getProduct("1");
+
+        Set<Map.Entry<String, ChfProduct>> entries = map.entrySet();
+        entries.stream().forEach(vo->{
+            ChfProduct chfProduct=new ChfProduct();
+            List<ChfTwoDatas> collect = product.stream().filter(it -> it.getName().equals(vo.getKey())).collect(Collectors.toList());
+            if(collect.size() > 0){
+                chfProduct.setChfTwoDatas(collect.get(0));
+            }
+            List<ChfTwoDatas> pendingCollect = pendProduct.stream().filter(it -> it.getName().equals(vo.getKey())).collect(Collectors.toList());
+            chfProduct.setChfTwoDatasList(pendingCollect);
+
+            map.put(vo.getKey(),chfProduct);
+        });
+
+        return map;
+    }
+
     @Override
     public TTask getNNextTask(TTask task, int n) {
         TTask nTask = baseMapper.selectOne(new LbqWrapper<TTask>().eq(TTask::getCompleteBatchNo, task.getCompleteBatchNo()).eq(TTask::getProcedureSort, task.getProcedureSort() + n ));

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/TTaskMapper.xml

@@ -452,4 +452,55 @@
         WHERE ittn.id = ${nodeId};
     </select>
 
+    <select id="getProduct" resultType="com.github.zuihou.business.centralToolMagazine.dto.ChfTwoDatas">
+        select oo.order_name as orderName,
+               oo.product_num as productNum,
+               ifnull(oo.produce_num,0)  as produceNum,
+               oo.delivery_time as deliveryTime,
+               tp.online_status as onlineStatus,
+                CASE
+
+                WHEN timestampdiff( MINUTE, now(), a.repair_end_time ) > 0 THEN
+                CONCAT(
+                TRUNCATE ( timestampdiff( MINUTE, now(), a.repair_end_time ) / 1440, 0 ),
+                '天',
+                TRUNCATE ( MOD ( timestampdiff( MINUTE, now(), a.repair_end_time ), 1440 ) / 60, 0 ),
+                '小时',
+                MOD ( MOD ( timestampdiff( MINUTE, now(), a.repair_end_time ), 1440 ), 60 ),
+                '分钟'
+                ) ELSE '已到维保时间'
+                END AS downTime,
+               tp.name
+        <if test="planStatus==null">
+        ,ROUND((TIMESTAMPDIFF(MINUTE, ttn.start_time, NOW()) / bbp.rated_workHours), 3) AS point
+        </if>
+        from imcs_o_order oo
+               INNER JOIN imcs_p_plan pp on oo.id=pp.order_id
+        INNER JOIN imcs_o_order_product oop on oo.id=oop.order_id
+        INNER JOIN imcs_t_task tt on pp.id=tt.plan_id
+               INNER JOIN imcs_tenant_productionresource tp on tt.resource_id=tp.id
+                INNER join imcs_tenant_repair a on a.productionresource_id=tp.id
+        <if test="planStatus==null">
+        left join imcs_t_task_node ttn on ttn.order_id=pp.order_id and ttn.node_name='启动程序' and ttn.exe_status='2'
+        left join imcs_b_bom_procedure bbp on bbp.bom_id=oop.bom_id and bbp.no='OP10'
+        </if>
+        <if test="planStatus!=null">
+        inner join imcs_t_task_node ttn on ttn.order_id=pp.order_id and ttn.node_name='启动程序' and ttn.exe_status!='3'
+        </if>
+        where
+            pp.scheduling_status='1'
+          and pp.produce_status='2'
+          and pp.plan_status='2'
+          and tp.mode_specification='GMU800AVI'
+
+        and
+        <if test="planStatus!=null">
+            NOT
+        </if>
+            EXISTS(
+        select * from imcs_t_task_node where order_id=pp.order_id and node_name='启动程序' and exe_status='2'
+        )
+
+    </select>
+
 </mapper>

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/TaskController.java

@@ -286,4 +286,14 @@ public class TaskController extends SuperController<TaskService, Long, TTask, TT
 
         return R.success(baseService.chfPlcWarning());
     }
+
+
+    @PostMapping("/chfTwoDatas")
+    public R chfTwoDatas() {
+
+        return R.success(baseService.chfTwoDatas());
+    }
+
+
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/centralToolMagazine/dto/ChfProduct.java

@@ -0,0 +1,11 @@
+package com.github.zuihou.business.centralToolMagazine.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ChfProduct {
+    private ChfTwoDatas chfTwoDatas;
+    private List<ChfTwoDatas> chfTwoDatasList;
+}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/centralToolMagazine/dto/ChfTwoDatas.java

@@ -0,0 +1,24 @@
+package com.github.zuihou.business.centralToolMagazine.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class ChfTwoDatas {
+    private String name;
+    private String orderName;
+    private Integer productNum;
+    private Integer produceNum;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date deliveryTime;
+
+    private BigDecimal point;
+
+    private String onlineStatus;
+
+    private String downTime;
+}