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

zhang

8 天以前 5833f3f3aa5313fa1170cd9ab0c5857f964ba96c

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

@@ -206,7 +206,7 @@
    public synchronized R getOutLocInfoByBarcode(@RequestHeader(required = false) String appkey,
                                            @RequestBody OutLocInfoParam param,
                                            HttpServletRequest request) {
//        auth(appkey, param, request);
        auth(appkey, param, request);
        if (Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode())) {
            return R.parse("托盘码不能为空");
        }
@@ -476,6 +476,19 @@
        return R.ok(param);
    }

    /**
     * 计划组货单
     */
    @PostMapping("/groupOrderConfirm/auth/v1")
    @AppAuth(memo = "计划单据下发")
    public synchronized R groupOrderConfirm(@RequestHeader(required = false) String appkey,
                                                        @RequestBody GroupOrderConfirmParam param,
                                                        HttpServletRequest request) {
//        auth(appkey, param, request);
        openService.groupOrderConfirm(param);
        return R.ok(param);
    }

    /*...........................上饶江铜..............以上.............徐工汉云...........................*/

}