#

LSH

2023-12-22 062b3da2a21fabbe5fe76178522ad763e09ed1cc

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

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

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONPObject;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -21,6 +17,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * Created by vincent on 2022/4/8
@@ -55,24 +52,45 @@
     * 添加入库单
     */
    @PostMapping("/order/pakin/default/v1")
    @AppAuth(memo = "添加订单入库")
    public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
                                           @RequestBody OpenOrderPakinParam param,
                                           @RequestBody OpenOrderPakinJDParam param1,
                                           HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
        auth(appkey, param1, request);
        if (Cools.isEmpty(param1)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getOrderNo())) {
        if (Cools.isEmpty(param1.getOrderNo())) {
            return R.error("单据编号[orderNo]不能为空");
        }
        if (Cools.isEmpty(param.getOrderType())) {
        if (Cools.isEmpty(param1.getFormId())) {
            return R.error("单据类型[orderType]不能为空");
        }
        if (Cools.isEmpty(param.getOrderDetails())) {
        if (Cools.isEmpty(param1.getMatList())) {
            return R.error("单据明细[orderDetails]不能为空");
        }
        OpenOrderPakinParam param = new OpenOrderPakinParam(param1);
        openService.pakinOrderCreate(param);
        return R.ok();
    }

    /*
     * 速腾数字孪生调用接口
     * */
    @PostMapping("/digital/twin/inventory/quantity")
    public synchronized R inventoryQuantity(@RequestHeader(required = false) String appkey,
                                            HttpServletRequest request) {
        auth(appkey, null, request);
        return R.ok(openService.inventoryQuantity());
    }
    /*
     * 速腾数字孪生调用接口
     * */
    @PostMapping("/digital/ownerAll/number/quantity")
    public synchronized R ownerAllNumber(@RequestHeader(required = false) String appkey,
                                         HttpServletRequest request) {
        auth(appkey, null, request);
        return openService.ownerAllNumber();
    }


@@ -82,21 +100,23 @@
    @PostMapping("/order/pakout/default/v1")
    @AppAuth(memo = "添加订单出库")
    public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
                                            @RequestBody OpenOrderPakoutParam param,
                                            @RequestBody OpenOrderPakinJDParam param1,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
        auth(appkey, param1, request);
        if (Cools.isEmpty(param1)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getOrderNo())) {
        if (Cools.isEmpty(param1.getOrderNo())) {
            return R.error("单据编号[orderNo]不能为空");
        }
        if (Cools.isEmpty(param.getOrderType())) {
        if (Cools.isEmpty(param1.getFormId())) {
            return R.error("单据类型[orderType]不能为空");
        }
        if (Cools.isEmpty(param.getOrderDetails())) {
        if (Cools.isEmpty(param1.getCreateDate())) {
            return R.error("单据明细[orderDetails]不能为空");
        }
        OpenOrderPakoutParam param = new OpenOrderPakoutParam(param1);

        openService.pakoutOrderCreate(param);
        return R.ok();
    }
@@ -108,9 +128,10 @@
     */
    @RequestMapping("/stock/default/v1")
    public R queryStock(@RequestHeader(required = false) String appkey,
                        @RequestBody StockVo stockVo,
                        HttpServletRequest request) {
        auth(appkey, null, request);
        return R.ok().add(openService.queryStock());
        auth(appkey, stockVo, request);
        return R.ok().add(openService.queryStock(stockVo));
    }

    private void auth(String appkey, Object obj, HttpServletRequest request) {
@@ -172,16 +193,5 @@
        param1.setOrderNo("963001846497017856");
        System.out.println(JSON.toJSONString(param1));
    }


    @RequestMapping("/manDetl/add")
    public R manDetlAdd(@RequestBody JSONObject json){
        String locNo = (String)json.get("locNo");
        String orderNo = (String)json.get("orderNo");

        return R.ok();
    }



}