admin
2024-10-21 a24c72adf823c411ba2a37fd988c00bf24b065b7
优化
已修改2个文件
14 ■■■■ 文件已修改
jcdm-main/src/main/java/com/jcdm/main/bigScreen/controller/BigScreenController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/kb/stationTerminal/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/bigScreen/controller/BigScreenController.java
@@ -85,7 +85,7 @@
                "    inbound_time,\n" +
                "    outbound_time,\n" +
                "    DATEDIFF(SECOND, inbound_time, outbound_time) AS beatTime");
        queryWrapper.eq("sfc_code","2408270000011");
        queryWrapper.eq("sfc_code",getLatestCompletedWorkpiece());
        queryWrapper.orderByDesc("location_code");
        List<DaPassingStationCollection> list = daPassingStationCollectionService.list(queryWrapper);
        for (DaPassingStationCollection daPassingStationCollection : list) {
@@ -173,6 +173,16 @@
        return AjaxResult.success(resultList);
    }
    // 获得最新完成工件状态为5
    public String getLatestCompletedWorkpiece(){
        QueryWrapper<OmProductionOrdeInfo> wrapper = new QueryWrapper<>();
        wrapper.select("TOP 1 *");
        wrapper.eq("order_status","5");
        wrapper.orderByDesc("actual_end_time");
        OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(wrapper);
        return one.getProductNum();
    }
    public static int locationPassRate(int passRate,int total) {
        double percentage = (double) passRate / total * 100;
        long roundedNumber = Math.round(percentage);
jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -259,7 +259,7 @@
                 </div>
               </div>
               <div style="text-align: center;margin-left: -190px;margin-top: 31px">
               <div style="text-align: center;margin-left: -190px;margin-top: 37px">
                 <div style="margin-top: 4px">
                   <span>{{printMaterialCode}}</span><br>
                 </div>