*

lsh

15 小时以前 8d702fa2c62b3617f71c5e91293e338d1ccd1549

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

@@ -13,6 +13,7 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -197,7 +198,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 +210,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,15 +220,41 @@
    }

    /**
     * 中控：码垛完成下发入库信息
     * 中控(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) {
        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 = "中控：出库完成月台相关") //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 +268,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,51 +285,68 @@
                                            @RequestBody SingleMountUnstackingCompleteParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        openService.singleMountUnstackingComplete(param);
        return R.ok(param);
    }


    /**
     * 中控：码垛完成下发入库信息
     */
    @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());
        try{
            openService.singleMountUnstackingComplete(param);
        } catch (Exception e){
            return R.error(e.getMessage()).add(e.getMessage());
        }
        return R.ok(param);
    }

    /**
     * 中控：码垛完成下发入库信息
     * FQC质检
     */
    @PostMapping("/cs2/auth/v1")
    @AppAuth(memo = "中控：码垛完成下发入库信息,生成测试工作档")
    public synchronized R cs2(@RequestHeader(required = false) String appkey,
                                                @RequestBody PalletizingCompleteParam param,
                                                HttpServletRequest request) {
    @PostMapping("/quality/inspection/auth/v1")
    @AppAuth(memo = "FQC质检")
    public synchronized R qualityInspection(@RequestHeader(required = false) String appkey,
                                           @RequestBody QualityInspectionParam param,
                                           HttpServletRequest request) {
        auth(appkey, param, request);
        openService.cs2();
        return R.ok(param);
        openService.qualityInspection(param);
        return R.ok();
    }



    /**
     * 中控：码垛完成下发入库信息
     * 添加出库单、正常退库至二楼包装
     */
    @PostMapping("/cs3/auth/v1")
    @AppAuth(memo = "中控：码垛完成下发入库信息,生成测试工作档")
    public synchronized R cs3(@RequestHeader(required = false) String appkey,
                                                @RequestBody PalletizingCompleteParam param,
                                                HttpServletRequest request) {
    @PostMapping("/order/normalTransferToTheSecond-floorPackagingArea/v1")
    @AppAuth(memo = "拆包装检出库")
    public synchronized R packagingAreaOrderCreate(@RequestHeader(required = false) String appkey,
                                            @RequestBody @Valid OrderCargoBookingNoteParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        openService.cs3();
        return R.ok(param);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        return openService.packagingAreaOrderCreate(param);
    }



    /**
     * 计划组货单
     */
    @PostMapping("/order/cargo/booking/note/v1")
    @AppAuth(memo = "计划组货单")
    public synchronized R cargoBookingNote(@RequestHeader(required = false) String appkey,
                                                   @RequestBody @Valid OrderCargoBookingNoteParam param,
                                                   HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getGroupGoodsNo())){
            return new R(401,"组货单号为空！");
        }
        if (Cools.isEmpty(param.getCstmrName())){
            return new R(401,"客户名称为空！");
        }

        return openService.cargoBookingNote(param);
    }

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

}