Merge remote-tracking branch 'origin/master'

mes/src/main/java/com/ximai/mes/kanban/controller/KanbanAbnormalController.java

+package com.ximai.mes.kanban.controller;
+
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.ximai.common.core.domain.AjaxResult;
+import com.ximai.mes.kanban.dto.abnormal.AbnormalMonthStatDto;
+import com.ximai.mes.kanban.service.KanbanAbnormalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Api("看板异常数据接口")
+@RestController
+@RequestMapping("/kanban/abnormal")
+public class KanbanAbnormalController {
+
+    @Autowired
+    KanbanAbnormalService kanbanAbnormalService;
+
+    @ApiOperation("当月异常分布数据")
+    @PostMapping("/currentMonthStat")
+    public AjaxResult<AbnormalMonthStatDto> currentMonthStat() {
+        AbnormalMonthStatDto rst = new AbnormalMonthStatDto();
+        AbnormalMonthStatDto.AbnormalMonthStatDetail abnormal1 = new AbnormalMonthStatDto.AbnormalMonthStatDetail();
+        abnormal1.setTotalCt(10);
+        abnormal1.setExpireUnClose(2);
+        abnormal1.setUnCloseCt(6);
+        rst.setEquipAbnormal(abnormal1);
+        AbnormalMonthStatDto.AbnormalMonthStatDetail abnormal2 = new AbnormalMonthStatDto.AbnormalMonthStatDetail();
+        abnormal2.setTotalCt(6);
+        abnormal2.setExpireUnClose(1);
+        abnormal2.setUnCloseCt(4);
+        rst.setProductAbnormal(abnormal2);
+        rst.setEquipCt(52);
+        rst.setEquipErrorCt(3);
+        List<AbnormalMonthStatDto.AbnormalCauseStat> abnormalCauseStats = new ArrayList<>();
+        abnormalCauseStats.add(new AbnormalMonthStatDto.AbnormalCauseStat(){
+            {
+                setCause("停电");
+                setCt(2);
+            }
+        });
+        abnormalCauseStats.add(new AbnormalMonthStatDto.AbnormalCauseStat(){
+            {
+                setCause("设备损坏");
+                setCt(4);
+            }
+        });
+        abnormalCauseStats.add(new AbnormalMonthStatDto.AbnormalCauseStat(){
+            {
+                setCause("硬件故障");
+                setCt(0);
+            }
+        });
+        rst.setAbnormalCauseData(abnormalCauseStats);
+        rst.setEquipErrorArr(ListUtil.toList(new Integer[]{0,0,0,2,2,0,0}));
+
+        return AjaxResult.success(rst);
+    }
+
+
+}

mes/src/main/java/com/ximai/mes/kanban/controller/KanbanTaskController.java

+package com.ximai.mes.kanban.controller;
+
+import com.ximai.common.core.domain.AjaxResult;
+import com.ximai.mes.kanban.dto.task.TaskStatDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+@Api("看板生产任务数据接口")
+@RestController
+@RequestMapping("/kanban/task")
+public class KanbanTaskController {
+
+    @ApiOperation("工序当月统计")
+    @PostMapping("/currentMonthStat")
+    public AjaxResult<TaskStatDto> currentMonthStat() {
+        TaskStatDto rst = new TaskStatDto();
+        List<TaskStatDto.ProcessOutput> outputList = new ArrayList<>();
+        outputList.add(new TaskStatDto.ProcessOutput(){
+            {
+                setProcessName("压铆");
+                setPlanQuantity(new BigDecimal("3200"));
+                setFinishQuantity(new BigDecimal("900"));
+                setQualifiedQuantity(new BigDecimal("890"));
+            }
+        });
+        outputList.add(new TaskStatDto.ProcessOutput(){
+            {
+                setProcessName("点焊");
+                setPlanQuantity(new BigDecimal("3200"));
+                setFinishQuantity(new BigDecimal("900"));
+                setQualifiedQuantity(new BigDecimal("900"));
+            }
+        });
+        outputList.add(new TaskStatDto.ProcessOutput(){
+            {
+                setProcessName("焊接");
+                setPlanQuantity(new BigDecimal("2200"));
+                setFinishQuantity(new BigDecimal("100"));
+                setQualifiedQuantity(new BigDecimal("100"));
+            }
+        });
+        outputList.add(new TaskStatDto.ProcessOutput(){
+            {
+                setProcessName("装配");
+                setPlanQuantity(new BigDecimal("5200"));
+                setFinishQuantity(new BigDecimal("1000"));
+                setQualifiedQuantity(new BigDecimal("1000"));
+            }
+        });
+        outputList.add(new TaskStatDto.ProcessOutput(){
+            {
+                setProcessName("气压检测");
+                setPlanQuantity(new BigDecimal("3000"));
+                setFinishQuantity(new BigDecimal("1200"));
+                setQualifiedQuantity(new BigDecimal("1200"));
+            }
+        });
+        rst.setOutputList(outputList);
+        List<TaskStatDto.ProcessQualifiedRate> qualifiedRateList = new ArrayList<>();
+        qualifiedRateList.add(new TaskStatDto.ProcessQualifiedRate(){
+            {
+                setProcessName("压铆");
+                setQualifiedRate(new BigDecimal("90"));
+            }
+        });
+        qualifiedRateList.add(new TaskStatDto.ProcessQualifiedRate(){
+            {
+                setProcessName("点焊");
+                setQualifiedRate(new BigDecimal("89"));
+            }
+        });
+        qualifiedRateList.add(new TaskStatDto.ProcessQualifiedRate(){
+            {
+                setProcessName("焊接");
+                setQualifiedRate(new BigDecimal("100"));
+            }
+        });
+        qualifiedRateList.add(new TaskStatDto.ProcessQualifiedRate(){
+            {
+                setProcessName("装配");
+                setQualifiedRate(new BigDecimal("99"));
+            }
+        });
+        rst.setQualifiedRateList(qualifiedRateList);
+
+        TaskStatDto.ProcessMonthlyIndexDto processMonthlyIndexDto = new TaskStatDto.ProcessMonthlyIndexDto();
+        processMonthlyIndexDto.setMonthPlanQuantity(new BigDecimal("4000"));
+        processMonthlyIndexDto.setActualFinishQuantity(new BigDecimal("2323"));
+        processMonthlyIndexDto.setExpireFinishQuantity(new BigDecimal("40"));
+        processMonthlyIndexDto.setHisPendingQuantity(new BigDecimal("5"));
+
+        processMonthlyIndexDto.setStartOnTimeRatio(new BigDecimal("70"));
+        processMonthlyIndexDto.setEndOnTimeRatio(new BigDecimal("80"));
+        processMonthlyIndexDto.setQualifiedRatio(new BigDecimal("95"));
+        processMonthlyIndexDto.setMonthPlanConcludeRatio(new BigDecimal("35"));
+        rst.setProcessMonthlyIndexDto(processMonthlyIndexDto);
+        return AjaxResult.success(rst);
+    }
+
+}

mes/src/main/java/com/ximai/mes/kanban/dto/abnormal/AbnormalMonthStatDto.java

+package com.ximai.mes.kanban.dto.abnormal;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class AbnormalMonthStatDto {
+
+    @ApiModelProperty("生产异常")
+    AbnormalMonthStatDetail productAbnormal;
+
+    @ApiModelProperty("设备异常")
+    AbnormalMonthStatDetail equipAbnormal;
+
+    @ApiModelProperty("设备正常数")
+    Integer equipCt;
+
+    @ApiModelProperty("当前设备故障数")
+    Integer equipErrorCt;
+
+    @ApiModelProperty("设备七天故障数")
+    List<Integer> equipErrorArr=new ArrayList<>();
+
+    @ApiModelProperty("异常原因不合格分布")
+    List<AbnormalCauseStat> abnormalCauseData;
+
+    @Data
+    public static class AbnormalMonthStatDetail{
+        @ApiModelProperty("异常总数")
+        Integer totalCt;
+        @ApiModelProperty("未关闭数")
+        Integer unCloseCt;
+        @ApiModelProperty("超期未关闭数")
+        Integer expireUnClose;
+    }
+
+    @Data
+    public static class AbnormalCauseStat{
+
+        @ApiModelProperty("异常原因")
+        String cause;
+
+        @ApiModelProperty("异常原因")
+        Integer ct;
+
+    }
+
+}

mes/src/main/java/com/ximai/mes/kanban/dto/task/TaskStatDto.java

+package com.ximai.mes.kanban.dto.task;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class TaskStatDto {
+
+    @ApiModelProperty("工序产量")
+    List<ProcessOutput> outputList;
+
+    @ApiModelProperty("工序不合格率")
+    List<ProcessQualifiedRate> qualifiedRateList;
+
+    @ApiModelProperty("工序月统计指标")
+    ProcessMonthlyIndexDto processMonthlyIndexDto;
+
+    @Data
+    public static class ProcessOutput{
+
+        @ApiModelProperty("工序名称")
+        private String processName;
+
+        @ApiModelProperty("计划量")
+        private BigDecimal planQuantity=BigDecimal.ZERO;
+
+        @ApiModelProperty("完成量")
+        private BigDecimal finishQuantity=BigDecimal.ZERO;
+
+        @ApiModelProperty("合格量")
+        private BigDecimal qualifiedQuantity=BigDecimal.ZERO;
+
+    }
+
+    @Data
+    public static class ProcessQualifiedRate{
+
+        @ApiModelProperty("工序名称")
+        private String processName;
+
+        @ApiModelProperty("合格率")
+        private BigDecimal qualifiedRate=BigDecimal.ZERO;
+    }
+
+    @Data
+    public static class ProcessMonthlyIndexDto {
+
+        @ApiModelProperty("上线准时率")
+        private BigDecimal startOnTimeRatio=BigDecimal.ZERO;
+
+        @ApiModelProperty("下线准时率")
+        private BigDecimal endOnTimeRatio=BigDecimal.ZERO;
+
+        @ApiModelProperty("产品合格率")
+        private BigDecimal qualifiedRatio=BigDecimal.ZERO;
+
+        @ApiModelProperty("历史月待完工")
+        private BigDecimal hisPendingQuantity=BigDecimal.ZERO;
+
+        @ApiModelProperty("月计划量")
+        private BigDecimal monthPlanQuantity=BigDecimal.ZERO;
+
+        @ApiModelProperty("实际完工")
+        private BigDecimal actualFinishQuantity=BigDecimal.ZERO;
+
+        @ApiModelProperty("超期完工")
+        private BigDecimal expireFinishQuantity=BigDecimal.ZERO;
+
+        @ApiModelProperty("月计划达成率")
+        private BigDecimal monthPlanConcludeRatio=BigDecimal.ZERO;
+
+    }
+}

mes/src/main/java/com/ximai/mes/kanban/service/KanbanAbnormalService.java

+package com.ximai.mes.kanban.service;
+
+import com.ximai.mes.kanban.dto.abnormal.AbnormalMonthStatDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Service
+public class KanbanAbnormalService {
+
+    @ApiOperation("当月异常分布数据")
+    @PostMapping("/currentMonthStat")
+    public AbnormalMonthStatDto currentMonthStat() {
+        return null;
+    }
+
+
+}

mes/src/main/java/com/ximai/mes/kanban/service/KanbanTaskService.java

+package com.ximai.mes.kanban.service;
+
+import com.ximai.mes.kanban.dto.task.TaskStatDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Service
+public class KanbanTaskService {
+
+    @ApiOperation("工序当月统计")
+    @PostMapping("/currentMonthStat")
+    public List<TaskStatDto> currentMonthStat() {
+        return null;
+    }
+
+}