#流程修改

LSH

2023-09-08 89344984d80ff1652abbd1de0ef12977b652e2a4

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

@@ -1,15 +1,12 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.IpTools;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,47 +32,29 @@

    @Autowired
    private OpenService openService;
    @Autowired
    private ApiLogService apiLogService;



    /****************************************************************************/
    /********************************* 打包上线 **********************************/
    /****************************************************************************/


    @PostMapping("/order/pakin/new/package/v1")
    public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
                                            @RequestParam(required = false) String barcode,
                                            HttpServletRequest request) {
        auth(appkey, barcode);
        if (Cools.isEmpty(barcode)) {
    /*@PostMapping("/order/matSync/default/v1")
    @AppAuth(memo = "商品信息同步接口")
    public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) MatSyncParam param,
                                      HttpServletRequest request){
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        openService.packageUp(barcode);
        // 保存接口日志
        apiLogService.save(
                "打包上线接口",
                request.getRequestURI(),
                appkey,
                IpTools.gainRealIp(request),
                barcode,
                JSON.toJSONString(R.ok()),
                Boolean.TRUE
        );
        openService.syncMat(param);
        return R.ok();
    }


    }*/

    /**
     * 添加入库单
     */
    @PostMapping("/order/pakin/new/default/v1")
    /*@PostMapping("/order/pakin/default/v1")
    @AppAuth(memo = "添加订单入库")
    public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
                                           @RequestBody OpenOrderPakinParam param) {
        auth(appkey, param);
                                           @RequestBody OpenOrderPakinParam param,
                                           HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
@@ -90,27 +69,36 @@
        }
        openService.pakinOrderCreate(param);
        return R.ok();
    }
    }*/

    /**
     * 入库单回写
     */
    @PostMapping("/order/pakin/complete/default/v1")
    /*@PostMapping("/order/pakin/complete/default/v1")
    public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
                                        @RequestBody(required = false) OpenOrderCompleteParam param) {
        auth(appkey, param);
                                             @RequestBody(required = false) OpenOrderCompleteParam param,
                                             HttpServletRequest request) {
        auth(appkey, param, request);
        return R.ok().add(openService.pakinOrderComplete(param));
    }
    }*/

    /**
     * 添加出库单
     */
    @PostMapping("/order/pakout/new/default/v1")
    /*@PostMapping("/order/pakout/default/v1")
    @AppAuth(memo = "添加订单出库")
    public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
                                           @RequestBody OpenOrderPakoutParam param) {
        auth(appkey, param);
                                            @RequestBody OpenOrderPakoutParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getLgort())) {
            return R.error("单据编号[lgort]不能为空");
        }
        if (!param.getLgort().equals("5006")) {
            return R.ok();
        }
        if (Cools.isEmpty(param.getOrderNo())) {
            return R.error("单据编号[orderNo]不能为空");
@@ -123,31 +111,33 @@
        }
        openService.pakoutOrderCreate(param);
        return R.ok();
    }
    }*/

    /**
     * 出库单回写
     */
    @PostMapping("/order/pakout/complete/default/v1")
    /*@PostMapping("/order/pakout/complete/default/v1")
    public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
                                        @RequestBody(required = false) OpenOrderCompleteParam param) {
        auth(appkey, param);
                                              @RequestBody(required = false) OpenOrderCompleteParam param,
                                              HttpServletRequest request) {
        auth(appkey, param, request);
        return R.ok().add(openService.pakoutOrderComplete(param));
    }
    }*/


    /**
     * 库存统计
     */
    @RequestMapping("/stock/default/v1")
    public R queryStock(@RequestHeader(required = false) String appkey) {
        auth(appkey, null);
    /*@RequestMapping("/stock/default/v1")
    public R queryStock(@RequestHeader(required = false) String appkey,
                        HttpServletRequest request) {
        auth(appkey, null, request);
        return R.ok().add(openService.queryStock());
    }
    }*/


    private void auth(String appkey, Object obj) {
        log.info("{}接口被访问！appkey:{},请求数据：{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
    private void auth(String appkey, Object obj, HttpServletRequest request) {
        log.info("{}接口被访问；appkey:{}；请求数据：{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
        request.setAttribute("cache", obj);
        if (!auth) {
            return;
        }
@@ -159,7 +149,7 @@
        }
    }

    public static void main(String[] args) {
    /*public static void main(String[] args) {
        // 1
        System.out.println("======================================");
        OpenOrderPakinParam param = new OpenOrderPakinParam();
@@ -196,6 +186,119 @@
        OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
        param1.setOrderNo("963001846497017856");
        System.out.println(JSON.toJSONString(param1));
    }*/



    /*...........................徐工汉云..............以下.............上饶江铜...........................*/
    /*............................Created by Monkey D. Luffy on 2023.07.19.............................*/

    /**
     * 贴标机申请获取货物信息
     */
    @PostMapping("/labeller/mat/auth/v1")
    @AppAuth(memo = "贴标机申请获取货物信息")
    public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
                                      @RequestBody LabellerMatParam param,
                                      HttpServletRequest request) {
        auth(appkey, param, request);
        return R.ok(openService.labellerMat(param));
    }

    /**
     * 贴标机贴标完成
     */
    @PostMapping("/labeller/complete/auth/v1")
    @AppAuth(memo = "贴标机贴标完成")
    public synchronized R labellerComplete(@RequestHeader(required = false) String appkey,
                                           @RequestBody LabellerCompleteParam param,
                                           HttpServletRequest request) {
        auth(appkey, param, request);
        openService.labellerComplete(param);
        return R.ok();
    }

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


    /**
     * 桁架上位软件：单次拆垛完成通知
     */
    @PostMapping("/single/unstacking/complete/auth/v1")
    @AppAuth(memo = "桁架上位软件：单次拆垛完成通知")
    public synchronized R singleUnstackingComplete(@RequestHeader(required = false) String appkey,
                                            @RequestBody SingleUnstackingCompleteParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        openService.singleUnstackingComplete(param);
        return R.ok(param);
    }

    /**
     * 桁架上位软件：单托拆垛完成通知
     */
    @PostMapping("/single/mount/unstacking/complete/auth/v1")
    @AppAuth(memo = "桁架上位软件：单托拆垛完成通知")
    public synchronized R singleMountUnstackingComplete(@RequestHeader(required = false) String appkey,
                                            @RequestBody SingleMountUnstackingCompleteParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        openService.singleMountUnstackingComplete(param);
        return R.ok(param);
    }


    /**
     * 中控：码垛完成下发入库信息  测试1
     */
    @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
     */
    @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);
    }


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

}