From e34c002fefc989c22c69918319a55394e72e50d3 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 22 十二月 2023 09:58:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
index e78cf7a..e2f1270 100644
--- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
+++ b/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 闈為粯璁や笅鎺ㄦ椂鍚敤 榛樿涓嬫帹鏃跺惎鐢╮uleId
+ public Integer pakIn; //鍑哄叆搴撴爣蹇�
+ public String ruleId;//鍗曟嵁杞崲鍞竴鏍囪瘑 闈為粯璁や笅鎺ㄦ椂鍚敤 榛樿涓嬫帹鏃跺惎鐢╟orrespondingFormId
- 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;
--
Gitblit v1.9.1