#1。档案同步2，任务状态上报，3设备状态读取，4心跳，5wms手动完成取消任务

lty

15 小时以前 caa7a2327123cc070ae16ad802983c04e296ff11

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

@@ -41,6 +41,8 @@
    private OrderDetlPakinService orderDetlPakinService;
    @Autowired
    private OrderDetlPakoutService orderDetlPakoutService;
    @Autowired
    private OpenService openService;

    public ReturnT<String> start(WrkMast wrkMast) {
        // 4.入库完成
@@ -56,6 +58,8 @@
    private ReturnT<String> doIn(WrkMast wrkMast){
        Date now = new Date();
        LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
        Integer status = 0;
        Integer ioType = 0;
        try {
            if (null == locMast) {
//                exceptionHandle("工作档[workNo={0}]库位号错误[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -79,6 +83,8 @@
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            return FAIL.setMsg("空板入库 ===>> 修改库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                        }
                        status = 2;
                        ioType = 3;
                    }
                    break;
                // 全板入库
@@ -166,6 +172,8 @@
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            return FAIL.setMsg("全板入库 ===>> 修改库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                        }
                        status = 2;
                        ioType = 3;
                    }
                    break;
                // 拣料途中并板
@@ -271,6 +279,8 @@
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            return FAIL.setMsg("拣料入库 ===>> 修改库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                        }
                        status = 2;
                        ioType = 3;
                    }
                    break;
                // 并板入库
@@ -372,6 +382,8 @@
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            return FAIL.setMsg("盘点入库 ===>> 修改库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                        }
                        status = 2;
                        ioType = 3;
                    }
                    break;
                // 库位移转
@@ -411,6 +423,8 @@
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        return FAIL.setMsg("库位移转 ===>> 修改目标库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                    }
                    status = 2;
                    ioType = 2;
                    break;
                default:
                    break;
@@ -423,6 +437,8 @@
                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                return FAIL.setMsg("更新入库完成状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
            }
            openService.reportTaskStatus(String.valueOf(wrkMast.getWrkNo()),status,ioType,wrkMast.getBarcode());

        } catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();
@@ -435,6 +451,8 @@
    private ReturnT<String> doOut(WrkMast wrkMast){
        Date now = new Date();
        LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
        Integer status = 0;
        Integer ioType = 0;
        try {
            if (null == locMast && wrkMast.getIoType() !=12) {
//                exceptionHandle("工作档[workNo={0}]库位号错误[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -497,6 +515,8 @@
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            return FAIL.setMsg("全板出库 ===>> 修改源库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
                        }
                        status = 2;
                        ioType = 1;
                    }
                    break;
                // 并板途中捡料
@@ -545,6 +565,8 @@
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            return FAIL.setMsg("空板出库 ===>> 修改源库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
                        }
                        status = 2;
                        ioType = 1;
                    }
                    break;
                //3号堆垛机衔接
@@ -561,6 +583,8 @@
                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                return FAIL.setMsg("更新出库完成状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
            }
            openService.reportTaskStatus(String.valueOf(wrkMast.getWrkNo()),status,ioType,wrkMast.getBarcode());

        } catch (Exception e) {
            log.error("fail", e);
            e.printStackTrace();