#

lsh

2024-07-18 c7feb49880a74b18149efec5fb515fdab3b8ccd5

#

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

@@ -315,5 +315,28 @@
        return this.status+1;
    }

    /**
     * ioType任务类型
     * 0: 未知  1: 开进料门  2: 关进料门  3: 开出料门  4: 关出料门  5: 入硫化罐  6: 入冷却槽
     * 7: 穿梭车进冷却槽  B=>C  8: 穿梭车离开冷却槽 C=>B  9: 出冷却槽 10：A=>B 11:B=>A
     */
    public Integer getStatusComplete(Integer ioType){
        switch (ioType){
            case 1:
                return 2;
            case 3:
                return 8;
            case 2:
                return 5;
            case 5:
                return 4;
            case 6:
                return 10;
            case 9:
                return 16;
        }
        return this.status+1;
    }


}

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

@@ -4903,10 +4903,12 @@
                    List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectWrkMastExecuteByWrk(wrkMastExecuteSou);
                    for (WrkMastExecute wrkMastExecute : wrkMastExecuteList){
                        log.error("Jar任务完成===>行={}",4564);
                        BasJarMast jarMastByWrkNo = basJarMastService.getJarMastByWrkNo(wrkMastExecute.getWrkNo());
                        jarMastByWrkNo.setStatus(jarMastByWrkNo.getStatusComplete());
                        if (!basJarMastService.updateById(jarMastByWrkNo)){
                            log.error("硫化区域分段任务完成异常,BasJarMast={},异常信息={}",JSON.toJSONString(jarMastByWrkNo),"更新basJarMast失败");
                        if (wrkMastExecute.getIoType()<7 || wrkMastExecute.getIoType()==9){
                            BasJarMast jarMastByWrkNo = basJarMastService.getJarMastByWrkNo(wrkMastExecute.getWrkNo());
                            jarMastByWrkNo.setStatus(jarMastByWrkNo.getStatusComplete(wrkMastExecute.getIoType()));
                            if (!basJarMastService.updateById(jarMastByWrkNo)){
                                log.error("硫化区域分段任务完成异常,BasJarMast={},异常信息={}",JSON.toJSONString(jarMastByWrkNo),"更新basJarMast失败");
                            }
                        }
                        wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsComplete());
                        wrkMastExecute.setWrkType(2);