#

lty

4 天以前 dea586adf232c722e8d2dfa833c3d7711a1019df

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

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

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
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.param.PackParam;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -35,31 +35,43 @@

    @Autowired
    private OpenService openService;
    @Autowired
    private WaitPakinService waitPakinService;


    @PostMapping("/order/matSync/default/v1")
    @AppAuth(memo = "response.mat_sync_interface")
    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")
    @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/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,
                                           HttpServletRequest request) {
@@ -68,13 +80,13 @@
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getOrderNo())) {
            return R.error("单据编号[orderNo]不能为空");
            return R.error("response.order_no_required");
        }
        if (Cools.isEmpty(param.getOrderType())) {
            return R.error("单据类型[orderType]不能为空");
            return R.error("response.order_type_required");
        }
        if (Cools.isEmpty(param.getOrderDetails())) {
            return R.error("单据明细[orderDetails]不能为空");
            return R.error("response.order_details_required");
        }
        openService.pakinOrderCreate(param);
        return R.ok();
@@ -88,14 +100,16 @@
                                             @RequestBody(required = false) OpenOrderCompleteParam param,
                                             HttpServletRequest request) {
        auth(appkey, param, request);
        return R.ok().add(openService.pakinOrderComplete(param));
        R r = R.ok();
        r.put("data",openService.pakinOrderComplete(param));
        return r;
    }

    /**
     * 添加出库单
     */
    @PostMapping("/order/pakout/new/default/v1")
    @AppAuth(memo = "添加订单出库")
    @PostMapping("/order/pakout/default/v1")
    @AppAuth(memo = "response.add_order_outbound")
    public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
                                            @RequestBody OpenOrderPakoutParam param,
                                            HttpServletRequest request) {
@@ -104,19 +118,19 @@
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getLgort())) {
            return R.error("单据编号[lgort]不能为空");
            return R.error("response.lgort_required");
        }
        if (!param.getLgort().equals("5006")) {
            return R.ok();
        }
        if (Cools.isEmpty(param.getOrderNo())) {
            return R.error("单据编号[orderNo]不能为空");
            return R.error("response.order_no_required");
        }
        if (Cools.isEmpty(param.getOrderType())) {
            return R.error("单据类型[orderType]不能为空");
            return R.error("response.order_type_required");
        }
        if (Cools.isEmpty(param.getOrderDetails())) {
            return R.error("单据明细[orderDetails]不能为空");
            return R.error("response.order_details_required");
        }
        openService.pakoutOrderCreate(param);
        return R.ok();
@@ -130,7 +144,9 @@
                                              @RequestBody(required = false) OpenOrderCompleteParam param,
                                              HttpServletRequest request) {
        auth(appkey, param, request);
        return R.ok().add(openService.pakoutOrderComplete(param));
        R r = R.ok();
        r.put("data",openService.pakoutOrderComplete(param));
        return r;
    }


@@ -141,9 +157,59 @@
    public R queryStock(@RequestHeader(required = false) String appkey,
                        HttpServletRequest request) {
        auth(appkey, null, request);
        return R.ok().add(openService.queryStock());
        R r = R.ok();
        r.put("data",openService.queryStock());
        return r;
    }

    /**
     * PDA检索盘点数量
     */
    @PostMapping("/pick/v1/getPickList")
    @AppAuth(memo = "PDA Inventory Count Lookup")
    public synchronized R getPickList(@RequestHeader(required = false) String appkey,
                                      @RequestBody PdaPickListParam param,
                                      HttpServletRequest request) {
//        auth(appkey, param, request);

        List<PickWrkDetlListParam> list = openService.getPickList(param);
        if (!list.isEmpty()) {
            return R.ok(list);
        }
        return R.error("Location does not exist or has no details.");
    }

    /**
     * PDA检索组托数据
     */
    @PostMapping("/comb/v1/getCombList")
    @AppAuth(memo = "PDA Get Comb List")
    public synchronized R getCombList(@RequestHeader(required = false) String appkey,
                                      @RequestBody PdaPickListParam param,
                                      HttpServletRequest request) {
//        auth(appkey, param, request);

        List<WaitPakin> list = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
        if (!list.isEmpty()) {
            return R.ok(list);
        }
        return R.error("Combs does not exist or has no details.");
    }

    /**
     * PDA检索组托数据
     */
    @PostMapping("/comb/v1/deleteComb")
    @AppAuth(memo = "PDA Delete Comb")
    public synchronized R deleteComb(@RequestHeader(required = false) String appkey,
                                      @RequestBody PdaPickListParam param,
                                      HttpServletRequest request) {
        boolean result = waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
        if(result) {
            return R.ok();
        }
        return R.error("Combs does not exist or has no details.");
    }

    private void auth(String appkey, Object obj, HttpServletRequest request) {
        log.info("{}接口被访问；appkey:{}；请求数据：{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
@@ -152,10 +218,10 @@
            return;
        }
        if (Cools.isEmpty(appkey)) {
            throw new CoolException("认证失败，请确认appkey无误！");
            throw new CoolException("response.auth_failed_check_appkey");
        }
        if (!APP_KEY_LIST.contains(appkey)) {
            throw new CoolException("认证失败，请确认appkey无误！");
            throw new CoolException("response.auth_failed_check_appkey");
        }
    }