#

LSH

2023-12-22 b12ec942e72151e6fb431d6c3a655d02c4216a05

#

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

@@ -54,21 +54,22 @@
    @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();
    }
@@ -99,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();
    }

 src/main/java/com/zy/asrs/entity/param/MatSyncParam.java

@@ -194,6 +194,23 @@
         * 备注
         */
        private String memo;
        /*
        * 批次
        * */
        private String batch;
        private String width;
        private String fheight;
        private String standby1;
        private String standby2;
        private String standby3;
        private String standby4;
        private String standby5;
        private String standby6;
        private String standby7;
        private String standby8;
        private String standby9;
        private String standby10;
        private String standby11;
    }

}

 src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java

New file
@@ -0,0 +1,48 @@
package com.zy.asrs.entity.param;

import lombok.Data;

import java.util.List;

/**
 * Created by vincent on 2022/4/8
 */
@Data
public class OpenOrderPakinJDParam {


    private String orderNo;
    private String formId;

    private String srcBillNo;

    private String createDate;

    private List<DetlDto2> matList;

    @Data
    public static class DetlDto2{


        private String matnr;
        private String maktx;

        private String batch;
        private String specs;

        private Double anfme;

        private String owner;

        public DetlDto2(){}
        public DetlDto2(String matnr,String maktx,String batch,String specs,Double anfme,String owner){
            this.matnr=matnr;
            this.maktx=maktx;
            this.batch=batch;
            this.specs=specs;
            this.anfme=anfme;
            this.owner=owner;
        }
    }

}

 src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java

@@ -1,8 +1,11 @@
package com.zy.asrs.entity.param;

import com.core.common.Cools;
import com.zy.common.model.DetlDto;
import com.zy.erp.kingdee.enums.KingDeeUtilType;
import lombok.Data;

import java.util.ArrayList;
import java.util.List;

/**
@@ -19,4 +22,25 @@

    private List<DetlDto> orderDetails;

    public OpenOrderPakinParam(){}

    public OpenOrderPakinParam(OpenOrderPakinJDParam param1){
        this.orderNo=param1.getOrderNo();
        KingDeeUtilType kingDeeUtilType = KingDeeUtilType.getFormId(param1.getFormId());
        if (Cools.isEmpty(kingDeeUtilType)){
            this.orderType=param1.getFormId();
        }else {
            this.orderType=kingDeeUtilType.desc;
        }

        this.orderTime=param1.getCreateDate();
        List<OpenOrderPakinJDParam.DetlDto2> matList = param1.getMatList();
        List<DetlDto> dtos = new ArrayList<>();
        for (OpenOrderPakinJDParam.DetlDto2 detlDto2:matList){
            DetlDto detlDto = new DetlDto(detlDto2);
            dtos.add(detlDto);
        }
        this.orderDetails = dtos;
    }

}

 src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java

@@ -1,8 +1,10 @@
package com.zy.asrs.entity.param;

import com.alibaba.fastjson.JSON;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.zy.common.model.DetlDto;
import com.zy.erp.kingdee.enums.KingDeeUtilType;
import lombok.Data;

import java.util.ArrayList;
@@ -23,6 +25,26 @@

    private List<DetlDto> orderDetails;

    public OpenOrderPakoutParam(){}

    public OpenOrderPakoutParam(OpenOrderPakinJDParam param1){
        this.orderNo=param1.getOrderNo();
        KingDeeUtilType kingDeeUtilType = KingDeeUtilType.getFormId(param1.getFormId());
        if (Cools.isEmpty(kingDeeUtilType)){
            this.orderType=param1.getFormId();
        }else {
            this.orderType=kingDeeUtilType.desc;
        }

        this.orderTime=param1.getCreateDate();
        List<OpenOrderPakinJDParam.DetlDto2> matList = param1.getMatList();
        List<DetlDto> dtos = new ArrayList<>();
        for (OpenOrderPakinJDParam.DetlDto2 detlDto2:matList){
            DetlDto detlDto = new DetlDto(detlDto2);
            dtos.add(detlDto);
        }
        this.orderDetails = dtos;
    }

    public static void main(String[] args) {
        OpenOrderPakoutParam param = new OpenOrderPakoutParam();

 src/main/java/com/zy/common/model/DetlDto.java

@@ -2,6 +2,7 @@

import com.core.common.Cools;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.OpenOrderPakinJDParam;
import lombok.Data;

import java.util.List;
@@ -30,6 +31,14 @@
    public DetlDto() {
    }

    public DetlDto(OpenOrderPakinJDParam.DetlDto2 detlDto2) {
        this.matnr=detlDto2.getMatnr();
        this.batch=detlDto2.getBatch();
        this.anfme=detlDto2.getAnfme();
        this.ownerName=detlDto2.getOwner();
        this.payment=0;
    }

    public DetlDto(String matnr, Double anfme) {
        this.matnr = matnr;
        this.anfme = anfme;

 src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java

@@ -82,6 +82,18 @@
        return null;
    }

    public static KingDeeUtilType getFormId(String formId) {
        if (null == formId) {
            return null;
        }
        for (KingDeeUtilType type : KingDeeUtilType.values()) {
            if (type.formId.equals(formId)) {
                return type;
            }
        }
        return null;
    }

    public static KingDeeUtilType get(KingDeeUtilType type) {
        if (null == type) {
            return null;