#

Junjie

2024-05-28 2a8fbec7b091f5f0b9b45f9a6afa07f3547b4e68

#

 zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/GenerateOrderPakOutParam.java

@@ -10,7 +10,7 @@

    private String orderNo;

    private String orderType;
    private Integer orderType;

    private String orderTime;


 zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java

@@ -5,10 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.openapi.entity.HostKey;
import com.zy.asrs.common.openapi.entity.dto.OrderListDto;
import com.zy.asrs.common.openapi.entity.param.CreateMatParam;
import com.zy.asrs.common.openapi.entity.param.GenerateOrderPakInParam;
import com.zy.asrs.common.openapi.entity.param.GenerateOrderPakOutParam;
import com.zy.asrs.common.openapi.entity.param.OrderListParam;
import com.zy.asrs.common.openapi.entity.param.*;
import com.zy.asrs.common.openapi.service.ApiService;
import com.zy.asrs.common.openapi.service.HostKeyService;
import com.zy.asrs.common.web.BaseController;
@@ -19,12 +16,14 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.openapi.param.MatParam;
import com.zy.asrs.openapi.param.OrderParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

@@ -170,6 +169,49 @@
    @PostMapping("order/execute/auth/v1")
    public R wms1(@RequestBody Map<String, Object> map) {
        log.info("order/execute/auth/v1：" + JSON.toJSONString(map));
        OrderParam orderParam = JSON.parseObject(JSON.toJSONString(map), OrderParam.class);
        List<DocType> list = apiService.getOrderType();
        DocType type = null;
        for (DocType docType : list) {
            if (docType.getDocName().equals(orderParam.getOrderType())) {
                type = docType;
                break;
            }
        }
        if (type == null) {
            return R.error("单据类型不存在");
        }

        ArrayList<GenerateOrderMatParam> mats = new ArrayList<>();
        for (MatParam matParam : orderParam.getList()) {
            GenerateOrderMatParam mat = new GenerateOrderMatParam();
            mat.setMatnr(matParam.getMatnr());
            mat.setBatch(matParam.getBatch());
            mat.setAnfme(matParam.getCount());
            mats.add(mat);
        }

        if (orderParam.getInOut() == 1) {
            //入库
            GenerateOrderPakInParam param = new GenerateOrderPakInParam();
            param.setHostId(1L);
            param.setOrderType(type.getDocId().intValue());
            param.setOrderNo(orderParam.getOrderNo());
            param.setMats(mats);
            apiService.generateOrderPakIn(param);
        } else if (orderParam.getInOut() == 2) {
            //出库
            GenerateOrderPakOutParam param = new GenerateOrderPakOutParam();
            param.setHostId(1L);
            param.setOrderType(type.getDocId().intValue());
            param.setOrderNo(orderParam.getOrderNo());
            param.setMats(mats);
            apiService.generateOrderPakOut(param);
        }else {
            //其他
            return R.error("出入库类型错误");
        }

        return R.ok();
    }


 zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/param/MatParam.java

New file
@@ -0,0 +1,22 @@
package com.zy.asrs.openapi.param;

import lombok.Data;

@Data
public class MatParam {

    private String matnr;//物料编号

    private String batch;//批号

    private Double count;//数量

    private String unit;//单位

    private String warehouse;//仓库号

    private String origin;//来源单号

    private String originNo;//来源序号

}

 zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/param/OrderParam.java

New file
@@ -0,0 +1,18 @@
package com.zy.asrs.openapi.param;

import lombok.Data;

import java.util.List;

@Data
public class OrderParam {

    private String orderType;//单据类型

    private Integer inOut;//单据出入库

    private String orderNo;//单据编号

    private List<MatParam> list;//明细

}