整理代码，记录任务执行时间

pang.jiabao

2025-05-13 e60658fec23ada118080f79b4ba8bc05b733138e

整理代码，记录任务执行时间

 src/main/java/com/zy/asrs/controller/TaskWrkController.java

@@ -216,6 +216,7 @@
        }
//        toWmsService.addReportLog(taskWrk);
        locMastService.updateById(locMast);
        taskWrk.setCompleteTime(new Date());
        taskWrk.setStatus(7);//手动完成任务
        taskWrk.setModiTime(new Date());
        taskWrkService.updateById(taskWrk);
@@ -265,7 +266,7 @@
        }
//        toWmsService.addReportLog(taskWrk);

        taskWrk.setCompleteTime(now);//完结时间
        taskWrk.setCancelTime(now);//完结时间
        taskWrkService.updateById(taskWrk);
        return R.ok();
    }

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -104,12 +104,6 @@

    @Value("${loc-move.enable}")
    private boolean enable;
    @Value("${loc-move.crn1}")
    private boolean crn1;
    @Value("${loc-move.crn2}")
    private boolean crn2;
    @Value("${loc-move.crn3}")
    private boolean crn3;


    public synchronized void generateStoreWrkFile() {
@@ -163,7 +157,6 @@
                    // 判断是否满足入库条件
                    if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
                            && !staProtocol.isEmptyMk() && workNo >= 9000 && staProtocol.isPakMk()) {
//                    if(true){
                        // 获取条码扫描仪信息
                        BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
                        if (barcodeThread == null) {
@@ -178,15 +171,6 @@
                        if (!Cools.isEmpty(taskWrk1)) {
                            log.info("托盘码：" + BoxNo + "任务档存在");
                            continue;
//                            if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
//                                StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
//                                        .eq("crn_no", taskWrk1.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
//                                if (Cools.isEmpty(staDesc)) {
//                                    return;
//                                } else {
//                                    continue;
//                                }
//                            }
                        }
                        if (back) {
                            storageEscalationParam.setWCSStatus(1);
@@ -210,23 +194,6 @@
                            staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
                            staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            //添加上报日志
//                            toWmsService.addReportLog(taskWrk);
//                            if (!Cools.isEmpty(taskWrk)) {
//                                StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
//                                        .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
//                                staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
//                                staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
//                                MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
//                                //添加上报日志
//                                toWmsService.addReportLog(taskWrk);
//                            } else {
//                                log.info("创建工作档失败==>{}", taskWrk.getTaskNo());
//                                staProtocol.setStaNo(inSta.getBackSta().shortValue());
//                                devpThread.setPakMk(staProtocol.getSiteId(), false);
//                                MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
//                            }

                        }

                    }
@@ -246,8 +213,6 @@
        for (CrnSlave crnSlave : slaveProperties.getCrn()) {
            // 遍历堆垛机出库站
            for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
//                List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", crnSlave.getId()).eq("crn_stn", crnStn.getStaNo()));
//                for (StaDesc staDesc : staDescs) {
                    try {
                        // 获取堆垛机出库站信息
                        DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
@@ -263,13 +228,6 @@
                            if (taskWrk == null) {
                                continue;
                            }
                            // 判断吊车是否实际已完成，且电脑状态在move中，以备电脑进行更新工作档
//                            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, taskWrk.getCrnNo());
//                            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
//                            log.info(crnProtocol.statusType+""+crnProtocol.getForkPosType());
//                            if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(taskWrk.getWrkNo().shortValue())
//                                    && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED
//                                    && crnProtocol.forkPosType == CrnForkPosType.HOME) {
                                log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
                                staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
                                staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
@@ -284,6 +242,7 @@
                                    log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk));
                                    taskWrk.setStatus(5);
                                    taskWrk.setWrkSts(14);
                                    taskWrk.setCompleteTime(new Date());
                                    taskWrkService.updateById(taskWrk);

                                } else {
@@ -396,11 +355,12 @@
//                int workNo = commonService.getWorkNo(WorkNoType.PAKIN.type);//获取入库工作号
//                taskWrk.setWrkNo(workNo);//工作号
                taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//派发状态
                taskWrk.setAssignTime(new Date());//派发时间
                taskWrk.setExecuteTime(new Date());
//                taskWrk.setAssignTime(new Date());//派发时间
                taskWrk.setWrkSts(3);//工作状态 3.吊车入库
                taskWrk.setCrnNo(staDesc.getCrnNo());//堆垛机号
                taskWrk.setModiTime(new Date());
                taskWrk.setModiUser(9988L);
//                taskWrk.setModiTime(new Date());
//                taskWrk.setModiUser(9988L);

                // 命令下发区 --------------------------------------------------------------------------
                CrnCommand crnCommand = new CrnCommand();
@@ -543,7 +503,7 @@
                                Date now = new Date();
                                taskWrk.setWrkSts(12);
                                taskWrk.setStatus(2);
                                taskWrk.setModiTime(now);
                                taskWrk.setExecuteTime(now);
                                if (taskWrkMapper.updateById(taskWrk) == 0) {
                                    log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中 失败！！，工作号={}", taskWrk.getWrkNo());
                                }
@@ -616,6 +576,7 @@
                    Date now = new Date();
                    taskWrk.setWrkSts(12);
                    taskWrk.setStatus(2);
                    taskWrk.setExecuteTime(now);
                    taskWrk.setModiTime(now);
                    if (taskWrkMapper.updateById(taskWrk) == 0) {
                        log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中 失败！！，工作号={}", taskWrk.getWrkNo());
@@ -696,6 +657,7 @@
                        locMast1.setModiUser(9999L);
                        locMastService.updateById(locMast1);
                    }
                    taskWrk.setCompleteTime(new Date());
                    taskWrkService.updateById(taskWrk);
                }


 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -78,14 +78,7 @@
        taskWrk.setWrkNo(workNo1);
        taskWrk.setStatus(TaskStatusType.RECEIVE.id);//任务状态：接收
        taskWrk.setCreateTime(now);
//        try {
//            if (param.getIoType() > 1) {
//                if (Utils.locNoRowBoolean(locMast.getRow1())) {
//                    param.setTaskPriority(11);
//                }
//            }
//        } catch (Exception e) {
//        }
        taskWrk.setAssignTime(now);
        taskWrk.setIoType(param.getIoType());//任务类型
        taskWrk.setIoPri(param.getTaskPriority());//优先级
        taskWrk.setBarcode(param.getBarcode());//条码

 src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java

@@ -171,6 +171,7 @@
        taskWrk.setWrkNo(workNo1);
        taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//任务状态：派发
        taskWrk.setCreateTime(now);
        taskWrk.setAssignTime(now);
        taskWrk.setIoType(1);//任务类型
        taskWrk.setIoPri(13);//优先级
        taskWrk.setBarcode(barcode);//条码

 src/main/webapp/views/taskWrkLog/taskWrkLog.html

@@ -24,7 +24,7 @@
                            <el-input v-model="tableSearchParam.wrk_no" placeholder="工作号"></el-input>
                        </el-form-item>
                        <el-form-item label="">
                            <el-input v-model="tableSearchParam.barcode" placeholder="箱号"></el-input>
                            <el-input v-model="tableSearchParam.barcode" placeholder="条码"></el-input>
                        </el-form-item>
                        <el-form-item label="">
                            <el-input v-model="tableSearchParam.start_point" placeholder="起始位"></el-input>
@@ -55,7 +55,7 @@
                        </el-table-column>
                        <el-table-column property="wrkNo" label="工作号">
                        </el-table-column>
                        <el-table-column property="createTime$" label="任务时间">
                        <el-table-column property="createTime$" label="创建时间">
                        </el-table-column>
                        <el-table-column property="durationTime" label="持续时长">
                        </el-table-column>