#

lsh

2024-01-27 64b311970e71b2b9822c87f1ff12382176088ea0

#

 src/main/java/com/zy/asrs/entity/WrkMast.java

@@ -499,6 +499,26 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
    }

    public String getSheetNo$(){
        if (null == this.sheetNo){ return "未知"; }
        switch (this.sheetNo){
            case "0":
                return "默认";
            case "1":
                return "机械臂抓取中";
            case "2":
                return "抓取完成";
            case "3":
                return "任务完成";
            case "4":
                return "机械臂抓取中";
            case "5":
                return "码垛完成";
            default:
                return this.sheetNo;
        }
    }



}

 src/main/java/com/zy/asrs/entity/WrkMastLog.java

@@ -505,5 +505,25 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
    }

    public String getSheetNo$(){
        if (null == this.sheetNo){ return "未知"; }
        switch (this.sheetNo){
            case "0":
                return "默认";
            case "1":
                return "机械臂抓取中";
            case "2":
                return "抓取完成";
            case "3":
                return "任务完成";
            case "4":
                return "机械臂抓取中";
            case "5":
                return "码垛完成";
            default:
                return this.sheetNo;
        }
    }


}

 src/main/java/com/zy/asrs/task/WorkMastScheduler.java

@@ -1,7 +1,10 @@
package com.zy.asrs.task;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkMastHandler;
@@ -26,6 +29,8 @@
    private WrkMastService wrkMastService;
    @Autowired
    private WorkMastHandler workMastHandler;
    @Autowired
    private BasDevpService basDevpService;

    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){
@@ -53,6 +58,15 @@

    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute202(){
        BasDevp basDevp = basDevpService.selectById(144);
        if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y")){
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                    .eq("wrk_no", basDevp.getWrkNo()).eq("io_type", 202).eq("wrk_sts", 52L));
            if (!Cools.isEmpty(wrkMast)){
                wrkMast.setWrkSts(56L);
                wrkMastService.updateById(wrkMast);
            }
        }
        List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData202();
        if (wrkMasts.isEmpty()) {
            return;

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -106,14 +106,19 @@
            if (!wrkMastService.deleteById(wrkMast)) {
                exceptionHandle("删除工作主档[workNo={0}]失败", wrkMast.getWrkNo());
            }
            if ((wrkMast.getIoType()<200 || wrkMast.getWrkSts().equals(57L)) && !Cools.isEmpty(wrkDetls)){
            List<WrkDetl> wrkDetls2 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
            if ((wrkMast.getIoType()<200 || wrkMast.getWrkSts().equals(57L)) && !Cools.isEmpty(wrkDetls2)){
                // 保存工作明细档历史档
                if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
                    exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());
//                    exceptionHandle("保存工作明细历史档[workNo={0}]失败", wrkMast.getWrkNo());
                    log.error("保存工作明细历史档[workNo={"+wrkMast.getWrkNo()+"}]失败");

                }
                // 删除工作明细档
                if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
                    exceptionHandle("删除工作明细档[workNo={0}]失败", wrkMast.getWrkNo());
//                    exceptionHandle("删除工作明细档[workNo={0}]失败", wrkMast.getWrkNo());
                    log.error("删除工作明细档[workNo={"+wrkMast.getWrkNo()+"}]失败");

                }
            }
        } catch (Exception e) {

 src/main/resources/mapper/WrkMastMapper.xml

@@ -67,7 +67,7 @@
    </select>

    <select id="selectToBeCompleteData202" resultMap="BaseResultMap">
        select * from asr_wrk_mast where wrk_sts = 52 and io_type = 202 and (wrk_no not in (select wrk_no from asr_bas_devp)) order by upd_mk,error_time,io_time,wrk_no
        select * from asr_wrk_mast where wrk_sts = 56 and io_type = 202 and (wrk_no not in (select wrk_no from asr_bas_devp)) order by upd_mk,error_time,io_time,wrk_no
    </select>

    <select id="selectToBeHistoryData" resultMap="BaseResultMap">

 src/main/webapp/static/js/common.js

@@ -231,7 +231,7 @@
    ,{field: 'brand', align: 'center',title: '木箱类型', hide: true, sort:true}
    ,{field: 'brand$', align: 'center',title: '木箱类型', hide: false, sort:true}
    ,{field: 'anfme', align: 'center',title: '数量', hide: false, sort:true}
    ,{field: 'zpallet', align: 'center',title: '托盘条码', hide: true}
    ,{field: 'zpallet', align: 'center',title: '托盘条码', hide: false}

    ,{field: 'specs', align: 'center',title: '接头', hide: false}
    ,{field: 'color', align: 'center',title: '颜色', hide: true}

 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -31,6 +31,7 @@
            ,{field: 'sourceLocNo$', align: 'center',title: '源库位'}
            ,{field: 'locNo$', align: 'center',title: '目标库位'}
            ,{field: 'barcode', align: 'center',title: '条码'}
            ,{field: 'sheetNo$', align: 'center',title: '机械臂', hide: false}
            ,{field: 'preHave', align: 'center',title: '先入品', hide: true}
            ,{field: 'takeNone', align: 'center',title: '空操作', hide: true}
            // ,{field: 'picking', align: 'center',title: '拣料', templet:function(row){

 src/main/webapp/static/js/wrkMastLog/wrkMastLog.js

@@ -55,6 +55,8 @@
            // ,{field: 'crnStrTime$', align: 'center',title: '堆垛机启动时间'}
            // ,{field: 'crnEndTime$', align: 'center',title: '堆垛机停止时间'}
            // ,{field: 'plcStrTime$', align: 'center',title: '拣料时间'}
            ,{field: 'sheetNo$', align: 'center',title: '机械臂', hide: false}

            ,{field: 'modiUser$', align: 'center',title: '修改人员', hide:true}
            ,{field: 'modiTime$', align: 'center',title: '修改时间', hide:true}
            // ,{field: 'appeUser$', align: 'center',title: '创建者',event: 'appeUser', style: 'cursor:pointer'}

 src/main/webapp/views/report/locDetl.html

@@ -24,9 +24,9 @@
</div>
<table class="layui-hide" id="locDetlByMap" lay-filter="locDetlByMap"></table>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-xs loc-detl" lay-event="locDetlRullUp">查看卷信息</a>
</script>
<!--<script type="text/html" id="operate">-->
<!--    <a class="layui-btn layui-btn-xs loc-detl" lay-event="locDetlRullUp">查看卷信息</a>-->
<!--</script>-->
</body>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
@@ -41,7 +41,7 @@
            {field: 'locNo$', align: 'center',title: '库位号'}
        ];
        cols.push.apply(cols, detlCols);
        cols.push.apply(cols, [{ fixed: 'right', title:'操作', align: 'center', toolbar: '#operate'}]);
        // cols.push.apply(cols, [{ fixed: 'right', title:'操作', align: 'center', toolbar: '#operate'}]);

        return cols;
    }