Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

LSH

2023-12-22 e34c002fefc989c22c69918319a55394e72e50d3

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

@@ -1,7 +1,7 @@
package com.zy.erp.kingdee.enums;

public enum KingDeeUtilType {
    BD_MATERIAL(0, "物料档案","BD_MATERIAL","","","",1),
//    BD_MATERIAL(0, "物料档案","BD_MATERIAL","","","",1),
//    STK_InStock(1, "采购入库单","STK_InStock","FRealQty","","",1),
//    PUR_MRB(2, "采购退料单","PUR_MRB","FRMREALQTY","","",1),
//    PRD_PickMtrl(3, "生产领料单","PRD_PickMtrl","FActualQty","","",1),
@@ -15,35 +15,39 @@
//    SP_ReturnMtrl(11, "简单生产退料单","SP_ReturnMtrl","FQty","","",1),
//    SAL_OUTSTOCK(12, "销售出库单","SAL_OUTSTOCK","FRealQty","","",1),
//    SAL_RETURNSTOCK(13, "销售退货单","SAL_RETURNSTOCK","FRealQty","","",1),
    SAL_DELIVERYNOTICE(14, "发货通知单","SAL_DELIVERYNOTICE","FQty","销售出库单","SAL_OUTSTOCK",0),
    STK_MISCELLANEOUS(15, "其他入库单","STK_MISCELLANEOUS","FQty","其他入库单","STK_MISCELLANEOUS",1),
    SAL_DELIVERYNOTICE(14, "发货通知单","SAL_DELIVERYNOTICE","FQty","销售出库单","SAL_OUTSTOCK",0,"1294e56a-7df7-4cd1-b86d-e52bb0893ac3"),
    STK_MISCELLANEOUS(15, "其他入库单","STK_MISCELLANEOUS","FQty","其他入库单","STK_MISCELLANEOUS",1,"731ce15d-c58d-4c21-96f9-d121c0a7b255"),
//    BD_Supplier(16, "供应商","BD_Supplier","","","",1),
    PUR_ReceiveBill(17, "收料通知单","PUR_ReceiveBill","FPOQTY","采购入库单","STK_InStock",1),
    PRD_MORPT(18, "生产汇报单","PRD_MORPT","FFinishQty","生产入库单","PRD_INSTOCK",1),
    PUR_ReceiveBill(17, "收料通知单","PUR_ReceiveBill","FPOQTY","采购入库单","STK_InStock",1,""),
    PRD_MORPT(18, "生产汇报单","PRD_MORPT","FFinishQty","生产入库单","PRD_INSTOCK",1,""),
//    PRD_INSTOCK(19, "生产入库单","PRD_INSTOCK","","","",1),
    SAL_RETURNNOTICE(20, "退货通知单","SAL_RETURNNOTICE","FBaseJunkedQty","销售退货单","SAL_RETURNSTOCK",1),
    STK_OutStockApply(21, "出库申请单","STK_OutStockApply","FTotalSecQty","其他出库单","STK_MisDelivery",0),
    SAL_RETURNNOTICE(20, "退货通知单","SAL_RETURNNOTICE","FBaseJunkedQty","销售退货单","SAL_RETURNSTOCK",1,""),
    STK_OutStockApply(21, "出库申请单","STK_OutStockApply","FTotalSecQty","其他出库单","STK_MisDelivery",0,""),
    //米多青岛
    STK_OutStockApply30(30, "试用品发货通知单","","","研发样品出库单","",0),
    STK_OutStockApply31(31, "试用品发货通知单","","","研发样品出库单","",0),
    STK_OutStockApply32(32, "试用品发货通知单","","","研发样品出库单","",0),
    STK_OutStockApply33(33, "试用品发货通知单","","","研发样品出库单","",0),
    STK_OutStockApply34(34, "试用品发货通知单","","","研发样品出库单","",0),
    STK_OutStockApply35(35, "试用品发货通知单","","","研发样品出库单","",0),
    STK_OutStockApply30(30, "试用品发货通知单","","","研发样品出库单","",0,"731ce15d-c58d-4c21-96f9-d121c0a7b255"),
//    STK_OutStockApply31(31, "试用品发货通知单","","","研发样品出库单","",0,"")
//    STK_OutStockApply31(31, "试用品发货通知单","","","研发样品出库单","",0,"")
//    STK_OutStockApply31(31, "试用品发货通知单","","","研发样品出库单","",0,"")
//    STK_OutStockApply31(31, "试用品发货通知单","","","研发样品出库单","",0,"")
//    STK_OutStockApply31(31, "试用品发货通知单","","","研发样品出库单","",0,"")
//    STK_OutStockApply31(31, "试用品发货通知单","","","研发样品出库单","",0,"")
//    STK_OutStockApply31(31, "试用品发货通知单","","","研发样品出库单","",0,"")
//    STK_OutStockApply31(31, "试用品发货通知单","","","研发样品出库单","",0,"")




    ;
    public Integer id;
    public String desc;
    public String formId;
    public String anfme;
    public String correspondingName;
    public String correspondingFormId;
    public Integer pakIn;
    public String desc;//类型名称
    public String formId;//单据类型唯一编码
    public String anfme;//单据数量字段名
    public String correspondingName;//目标单据数量字段
    public String correspondingFormId;//目标formId  非默认下推时启用  默认下推时启用ruleId
    public Integer pakIn; //出入库标志
    public String ruleId;//单据转换唯一标识 非默认下推时启用  默认下推时启用correspondingFormId

    KingDeeUtilType(Integer id, String desc,String formId,String anfme,String correspondingName,String correspondingFormId,int pakIn){
    KingDeeUtilType(Integer id, String desc,String formId,String anfme,String correspondingName,String correspondingFormId,int pakIn,String ruleId){
        this.id = id;
        this.desc = desc;
        this.formId = formId;
@@ -51,6 +55,7 @@
        this.correspondingName = correspondingName;
        this.correspondingFormId = correspondingFormId;
        this.pakIn = pakIn;   //1入库  0出库
        this.ruleId = ruleId;
    }

    public static KingDeeUtilType get(Short id) {
@@ -77,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;