#和得服务器

1

16 小时以前 8d75c94e04af3d56c0de713e3120d14dfef73083

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

@@ -304,6 +304,9 @@
        if (Cools.isEmpty(param.getId())) {
            return R.error("单据编号[order_id]不能为空");
        }
        if (Integer.parseInt(param.getId())<2){
            return R.ok().add("来料口空间复位成功");
        }
        if (Cools.isEmpty(param.getType())) {
            return R.error("客人型号[pick_num]不能为空");
        }
@@ -364,4 +367,33 @@
        return R.ok();
    }



    /**
     * 是否存在后续托盘
     */
    @PostMapping("/arm/task/order_sign")
    public synchronized R TaskArmWorkOrderSign(@RequestHeader(required = false) String appkey,
                                                 @RequestBody OrderArmEndParam param,
                                                 HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getArm_no())) {
            return R.error("机械臂编号[Arm_no]不能为空");
        }
        if (Cools.isEmpty(param.getOrder_id())) {
            return R.error("单据编号[order_id]不能为空");
        }
        try{
            param.OrderIdTwo(sign_arm_order,sign_arm_sku);
        } catch (Exception e){
            return R.error("单据编号[order_id]以 "+sign_arm_sku+" 与 "+sign_arm_order+" 作为拆分标记拆分失败！！！");
        }

        boolean taskArmWorkOrderSign = openService.TaskArmWorkOrderSign(param);
        return R.ok().add(taskArmWorkOrderSign);
    }

}