#

lsh

4 天以前 eb894e3c1dde980cb6cbaf559782bedb801db2ca

 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,25 +209,51 @@
     * 贴标机贴标完成
     */
    @PostMapping("/labeller/complete/auth/v1")
    @AppAuth(memo = "贴标机贴标完成")
    @AppAuth(memo = "贴标机贴标完成") //old需要修改
    public synchronized R labellerComplete(@RequestHeader(required = false) String appkey,
                                           @RequestBody LabellerCompleteParam param,
                                           HttpServletRequest request) {
        auth(appkey, param, request);
        openService.labellerComplete(param);
        return R.ok();
    }

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

    /**
     * 中控：码垛完成下发入库信息
     * 松盛(1楼)：码垛完成下发入库信息
     */
    @PostMapping("/palletizing/complete/auth/v1")
    @AppAuth(memo = "中控：码垛完成下发入库信息")
    public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey,
                                           @RequestBody PalletizingCompleteParam param,
                                           HttpServletRequest request) {
    @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.palletizingComplete(param);
        openService.palletizingCompleteS(param);
        return R.ok();
    }

    /**
     * 中控：出库完成月台相关
     */
    @PostMapping("/balcony/complete/auth/v1")
    @AppAuth(memo = "中控：出库完成月台相关") //old需要修改
    public synchronized R balconyComplete(@RequestHeader(required = false) String appkey,
                                              @RequestBody LabellerMatParam param,
                                              HttpServletRequest request) {
        auth(appkey, param, request);
        openService.balconyComplete(param);
        return R.ok(param);
    }

@@ -241,7 +267,11 @@
                                            @RequestBody SingleUnstackingCompleteParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        openService.singleUnstackingComplete(param);
        try{
            openService.singleUnstackingComplete(param);
        } catch (Exception e){
            return R.error(e.getMessage()).add(e.getMessage());
        }
        return R.ok(param);
    }

@@ -254,12 +284,13 @@
                                            @RequestBody SingleMountUnstackingCompleteParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        openService.singleMountUnstackingComplete(param);
        try{
            openService.singleMountUnstackingComplete(param);
        } catch (Exception e){
            return R.error(e.getMessage()).add(e.getMessage());
        }
        return R.ok(param);
    }




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