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

lty

3 天以前 53ca017d46403700cabc775fc4dbd89f8ebdef78

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

@@ -402,6 +402,7 @@
            return R.error("单据编号[order_id]以 "+sign_arm_sku+" 与 "+sign_arm_order+" 作为拆分标记拆分失败！！！");
        }
        if (param.getArm_no()>4){
            openService.taskArmOrderResult(param);
            return R.ok();
        }