#

lsh

2024-06-06 da92f60f961b0c6ee5c509de1ca603edaaa85d06

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

@@ -197,7 +197,7 @@
     * 贴标机申请获取货物信息
     */
    @PostMapping("/labeller/mat/auth/v1")
    @AppAuth(memo = "贴标机申请获取货物信息")
    @AppAuth(memo = "贴标机申请获取货物信息") //old需要修改
    public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
                                      @RequestBody LabellerMatParam param,
                                      HttpServletRequest request) {
@@ -209,7 +209,7 @@
     * 贴标机贴标完成
     */
    @PostMapping("/labeller/complete/auth/v1")
    @AppAuth(memo = "贴标机贴标完成")
    @AppAuth(memo = "贴标机贴标完成") //old需要修改
    public synchronized R labellerComplete(@RequestHeader(required = false) String appkey,
                                           @RequestBody LabellerCompleteParam param,
                                           HttpServletRequest request) {
@@ -219,25 +219,36 @@
    }

    /**
     * 中控：码垛完成下发入库信息
     * 中控(2楼)：码垛完成下发入库信息
     */
    @PostMapping("/palletizing/complete/auth/v1")
    @AppAuth(memo = "码垛完成下发入库信息")
    public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey,
                                           @RequestBody PalletizingCompleteParam param,
    @AppAuth(memo = "中控(2楼)：码垛完成下发入库信息")
    public synchronized R PalletizingCompleteTwoFloorParam(@RequestHeader(required = false) String appkey,
                                           @RequestBody PalletizingCompleteTwoFloorParam param,
                                           HttpServletRequest request) {
//        appkey = "ea1f0459efc02a79f046f982767939ae";

        auth(appkey, param, request);
        openService.palletizingComplete(param);
        openService.PalletizingCompleteTwoFloorParam(param);
        return R.ok(param);
    }

    /**
     * 松盛(1楼)：码垛完成下发入库信息
     */
    @PostMapping("/palletizing/complete/auth/v2")
    @AppAuth(memo = "松盛(1楼)：码垛完成下发确认信号")
    public synchronized R palletizingCompleteS(@RequestHeader(required = false) String appkey,
                                              @RequestBody PalletizingCompleteParam param,
                                              HttpServletRequest request) {
        auth(appkey, param, request);
        openService.palletizingCompleteS(param);
        return R.ok();
    }

    /**
     * 中控：出库完成月台相关
     */
    @PostMapping("/balcony/complete/auth/v1")
    @AppAuth(memo = "中控：出库完成月台相关")
    @AppAuth(memo = "中控：出库完成月台相关") //old需要修改
    public synchronized R balconyComplete(@RequestHeader(required = false) String appkey,
                                              @RequestBody LabellerMatParam param,
                                              HttpServletRequest request) {
@@ -255,8 +266,6 @@
    public synchronized R singleUnstackingComplete(@RequestHeader(required = false) String appkey,
                                            @RequestBody SingleUnstackingCompleteParam param,
                                            HttpServletRequest request) {
//        appkey = "ea1f0459efc02a79f046f982767939ae";

        auth(appkey, param, request);
        openService.singleUnstackingComplete(param);
        return R.ok(param);
@@ -270,54 +279,53 @@
    public synchronized R singleMountUnstackingComplete(@RequestHeader(required = false) String appkey,
                                            @RequestBody SingleMountUnstackingCompleteParam param,
                                            HttpServletRequest request) {
//        appkey = "ea1f0459efc02a79f046f982767939ae";

        auth(appkey, param, request);
        openService.singleMountUnstackingComplete(param);
        return R.ok(param);
    }


    /**
     *  测试1  入库前输送线写入托盘码，216站测试用
     */
    @PostMapping("/cs1/auth/v1")
    @AppAuth(memo = "")
    public synchronized R cs1(@RequestHeader(required = false) String appkey,
                                              @RequestBody PalletizingCompleteParam param,
                                              HttpServletRequest request) {
        auth(appkey, param, request);
        openService.cs1(param.getBarcode());
        return R.ok(param);
    }

    /**
     *  测试2  清除托盘码，216站测试用 Copy
     */
    @PostMapping("/cs2/auth/v1")
    @AppAuth(memo = "")
    public synchronized R cs2(@RequestHeader(required = false) String appkey,
                                                @RequestBody PalletizingCompleteParam param,
                                                HttpServletRequest request) {
        auth(appkey, param, request);
        openService.cs2();
        return R.ok(param);
    }

    /**
     * 测试3
     */
    @PostMapping("/cs3/auth/v1")
//    @AppAuth(memo = "")
    public synchronized R cs3(@RequestHeader(required = false) String appkey,
                                                @RequestBody PalletizingCompleteParam param,
                                                HttpServletRequest request) {
        auth(appkey, param, request);
        openService.cs3();
        return R.ok(param);
    }


    /*...........................上饶江铜..............以上.............徐工汉云...........................*/
    /*...........................亳州煜星..............以上.............亳州煜星...........................*/

//    /**
//     * 亳州煜星任务下发
//     */
//    @PostMapping("/small/containers/auth/v1")
//    @AppAuth(memo = "贴标机贴标完成") //old需要修改
//    public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
//                                          @RequestBody LabellerCompleteParam param,
//                                          HttpServletRequest request) {
//        auth(appkey, param, request);
//        openService.labellerComplete(param);
//        return R.ok();
//    }
//
//    /**
//     * 亳州煜星任务下发
//     */
//    @PostMapping("/small/containers/auth/v1")
//    @AppAuth(memo = "贴标机贴标完成") //old需要修改
//    public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
//                                          @RequestBody LabellerCompleteParam param,
//                                          HttpServletRequest request) {
//        auth(appkey, param, request);
//        openService.labellerComplete(param);
//        return R.ok();
//    }
//
//    /**
//     * 亳州煜星任务下发
//     */
//    @PostMapping("/small/containers/auth/v1")
//    @AppAuth(memo = "贴标机贴标完成") //old需要修改
//    public synchronized R smallContainers(@RequestHeader(required = false) String appkey,
//                                          @RequestBody LabellerCompleteParam param,
//                                          HttpServletRequest request) {
//        auth(appkey, param, request);
//        openService.labellerComplete(param);
//        return R.ok();
//    }

    /*...........................亳州煜星..............以上.............亳州煜星...........................*/

}