#

lsh

2023-12-20 cd280ead41b98ee60154038e36d9b83cc25e7d16

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

@@ -216,81 +216,80 @@
    }

    @PostMapping("/rpc/pakIn/auth/v1")
    @AppAuth(memo = "入库通知单接口调用")
    @AppAuth(memo = "PACK信息下发")
    public synchronized R combPack(@RequestHeader(required = false) String appkey,
                                   @RequestBody(required = false) CombParam param,
                                   HttpServletRequest request) {
        log.info("入库通知单接口调用"+appkey+param);
        auth(appkey, param, request);
        log.info("PACK信息下发接口调用"+appkey+param);
        auth("ea1f0459efc02a79f046f982767939ae", param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        //生成入库通知档
        //生成商品档案
        openService.combPACK(param);
//        Map<String, Boolean> map = new HashMap<>();
//        map.put("isComplete", true);
        return R.ok();
    }

    @PostMapping("/rpc/pakOut/auth/v1")
    @AppAuth(memo = "出库通知单接口调用")
    public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
                                     @RequestBody(required = false) CombParam param,
                                     HttpServletRequest request) {
//    @PostMapping("/rpc/pakOut/auth/v1")
//    @AppAuth(memo = "出库通知单接口调用")
//    public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
//                                     @RequestBody(required = false) CombParam param,
//                                     HttpServletRequest request) {
//
//        auth(appkey, param, request);
//        if (Cools.isEmpty(param)) {
//            return R.parse(BaseRes.PARAM);
//        }
//        //出库开始
//        openService.combPackOut(param);
//
//        Map<String, Boolean> map = new HashMap<>();
//        map.put("isComplete", true);
//        return R.ok(map);
//    }

        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        //出库开始
        openService.combPackOut(param);
//    @PostMapping("/rpv/infoReview/auth/v1")
//    @AppAuth(memo = "测试条码信息复核请求")
//    public synchronized R infoReview(@RequestHeader(required = false) String appkey,
//                                     @RequestBody(required = false) Review param,
//                                     HttpServletRequest request) {
//        appkey = "ea1f0459efc02a79f046f982767939ae";
//        auth(appkey, param, request);
//        if (Cools.isEmpty(param)) {
//            return R.parse(BaseRes.PARAM);
//        }
//        TestMast testMast = openService.infoReview(param);
//        if (testMast.getStatus() == 3) {
//            return R.ok();
//        } else if (testMast.getStatus() == 2) {
//            return R.error("等待员工操作...");
//        }
//        return R.error();
//    }

        Map<String, Boolean> map = new HashMap<>();
        map.put("isComplete", true);
        return R.ok(map);
    }

    @PostMapping("/rpv/infoReview/auth/v1")
    @AppAuth(memo = "测试条码信息复核请求")
    public synchronized R infoReview(@RequestHeader(required = false) String appkey,
                                     @RequestBody(required = false) Review param,
                                     HttpServletRequest request) {
        appkey = "ea1f0459efc02a79f046f982767939ae";
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        TestMast testMast = openService.infoReview(param);
        if (testMast.getStatus() == 3) {
            return R.ok();
        } else if (testMast.getStatus() == 2) {
            return R.error("等待员工操作");
        }
        return R.error();
    }

    @PostMapping("/rpv/testFinish/auth/v1")
    @AppAuth(memo = "测试完成")
    public synchronized R testFinish(@RequestHeader(required = false) String appkey,
                                     @RequestBody(required = false) Review param,
                                     HttpServletRequest request) {
        appkey = "ea1f0459efc02a79f046f982767939ae";
        auth(appkey, param, request);
        Map<String, Boolean> map = new HashMap<>();

        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (param.getTestResult().equals("OK")) {
            map.put("isComplete", openService.testFinish(param));
        } else if (param.getTestResult().equals("NG")) {
            openService.testNG(param);
            map.put("isComplete", false);
        } else {
            map.put("isComplete", false);
        }
        return R.ok(map);
    }
//    @PostMapping("/rpv/testFinish/auth/v1")
//    @AppAuth(memo = "测试完成")
//    public synchronized R testFinish(@RequestHeader(required = false) String appkey,
//                                     @RequestBody(required = false) Review param,
//                                     HttpServletRequest request) {
//        auth(appkey, param, request);
//        Map<String, Boolean> map = new HashMap<>();
//
//        if (Cools.isEmpty(param)) {
//            return R.parse(BaseRes.PARAM);
//        }
//        if (param.getTestResult().equals("OK")) {
//            map.put("isComplete", openService.testFinish(param));
//        } else if (param.getTestResult().equals("NG")) {
//            openService.testNG(param);
//            map.put("isComplete", false);
//        } else {
//            map.put("isComplete", false);
//        }
//        return R.ok(map);
//    }

    /*...........................赣州新增..............以上.............赣州新增...........................*/