Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

lty

3 天以前 53ca017d46403700cabc775fc4dbd89f8ebdef78

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

@@ -774,7 +774,7 @@
        if (Cools.isEmpty(basArmMast)){
            throw new CoolException("未查询到相关机械臂拆码垛任务！！！"+ JSON.toJSONString(param));
        }
        basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
//        basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
        basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),2,3);
    }