#

lsh

2023-12-20 cd280ead41b98ee60154038e36d9b83cc25e7d16

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

@@ -1,11 +1,11 @@
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.entity.TestMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -13,9 +13,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import java.util.*;

/**
 * Created by vincent on 2022/4/8
@@ -33,33 +32,44 @@
    @Autowired
    private OpenService openService;


    @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.syncMat(param);
        return R.ok();
    }

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


    @PostMapping("/order/pakin/new/package/v1")
    public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
                                            @RequestParam(required = false) String barcode) {
        auth(appkey, barcode);
        if (Cools.isEmpty(barcode)) {
            return R.parse(BaseRes.PARAM);
        }
        openService.packageUp(barcode);
        return R.ok();
    }


//    @PostMapping("/order/pakin/new/package/v1")
//    @AppAuth(memo = "打包上线接口")
//    public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
//                                            @RequestBody(required = false) PackParam param,
//                                            HttpServletRequest request) {
//        auth(appkey, param, request);
//        if (Cools.isEmpty(param)) {
//            return R.parse(BaseRes.PARAM);
//        }
//        openService.packageUp(param);
//        return R.ok();
//    }

    /**
     * 添加入库单
     */
    @PostMapping("/order/pakin/new/default/v1")
    @PostMapping("/order/pakin/default/v1")
    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);
        }
@@ -81,20 +91,29 @@
     */
    @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]不能为空");
@@ -114,8 +133,9 @@
     */
    @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));
    }

@@ -124,14 +144,15 @@
     * 库存统计
     */
    @RequestMapping("/stock/default/v1")
    public R queryStock(@RequestHeader(required = false) String appkey) {
        auth(appkey, null);
    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;
        }
@@ -175,11 +196,101 @@
            orderDetails.add(detlDto);
        }
        System.out.println(JSON.toJSONString(param));
        // 2
        System.out.println("======================================");
        OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
        param1.setOrderNo("963001846497017856");
        System.out.println(JSON.toJSONString(param1));
    }

    /*...........................赣州新增..............以下.............赣州新增...........................*/
    @PostMapping("/rpc/watchDog/auth/v1")
    @AppAuth(memo = "心跳接口调用")
    public synchronized R hostName(@RequestHeader(required = false) String appkey,
                                   @RequestBody(required = false) HeartBeat param,
                                   HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        return R.ok();
    }

    @PostMapping("/rpc/pakIn/auth/v1")
    @AppAuth(memo = "PACK信息下发")
    public synchronized R combPack(@RequestHeader(required = false) String appkey,
                                   @RequestBody(required = false) CombParam param,
                                   HttpServletRequest 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) {
//
//        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);
//    }

//    @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) {
//        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);
//    }

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

}