#和得服务器

1

昨天 8d75c94e04af3d56c0de713e3120d14dfef73083

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

@@ -629,12 +629,28 @@
    public void taskArmCycleResult(TaskArmCycleResultParam param) {
        BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
                .eq("arm_no", param.getArm_no())
                .eq("sta_no", Integer.parseInt(param.getStaNo()))
                .eq("sorting_line", Integer.parseInt(param.getStaNo()))
                .eq("status", 1)
        );
        if (Cools.isEmpty(basArm)){
            throw new CoolException("机械臂配置异常，查询不到机械臂数据！！！"+ JSON.toJSONString(param));
        }

        BasArmMast basArmMastListError = basArmMastService.selectOne(
                new EntityWrapper<BasArmMast>()
                        .eq("sorting_line", basArm.getSortingLineSou())
                        .eq("arm_no", param.getArm_no())
                        .eq("status", 9)
        );
        if (!Cools.isEmpty(basArmMastListError)){
            if (Integer.parseInt(param.getPick_num()) ==1){
                basArmMastListError.setStatus(2);
                basArmMastService.updateById(basArmMastListError);
            }
            return;
        }


        BasArmMast basArmMast = basArmMastService.selectOne(
                new EntityWrapper<BasArmMast>()
                        .eq("sorting_line", basArm.getSortingLineSou())
@@ -644,9 +660,13 @@
        if (Cools.isEmpty(basArmMast)){
            throw new CoolException("未查询到相关机械臂拆码垛任务！！！"+ JSON.toJSONString(param));
        }

        basArmMast.setStatus(2);
        basArmMastService.updateById(basArmMast);
        if (Integer.parseInt(param.getPick_num()) !=1){
            basArmMast.setStatus(9);
            basArmMastService.updateById(basArmMast);
        } else {
            basArmMast.setStatus(2);
            basArmMastService.updateById(basArmMast);
        }
    }

    @Override
@@ -677,7 +697,7 @@
    public void taskArmWorkOrderStatus(OrderArmEndParam param) {
        BasArm basArm = basArmService.selectOne(new EntityWrapper<BasArm>()
                .eq("arm_no", param.getArm_no())
                .eq("sta_no", Integer.parseInt(param.getStaNo()))
                .eq("sorting_line", Integer.parseInt(param.getStaNo()))
                .eq("status", 1)
        );
        if (Cools.isEmpty(basArm)){