From 84d74096a72578a83d9f3b48afa8c39b4ba0ae9a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 25 十二月 2023 11:06:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java | 78 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 22 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 0d05383..2086a72 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,56 @@
// 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),
-// BD_Supplier(16, "渚涘簲鍟�","BD_Supplier","","","",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_DELIVERYNOTICE(14, "鍙戣揣閫氱煡鍗�","SAL_DELIVERYNOTICE","FQty","閿�鍞嚭搴撳崟","SAL_OUTSTOCK",0,"DeliveryNotice_Outstock"),
+// STK_MISCELLANEOUS(15, "鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS","FQty","鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS",1,""),
+//// BD_Supplier(16, "渚涘簲鍟�","BD_Supplier","","","",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,""),
//绫冲闈掑矝
- 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,""),
+ /*
+ * 閫�璐ч�氱煡鍗曡嚦閿�鍞��璐у崟鍗曟嵁鍞竴鏍囪瘑锛氫竴绾э細SalReturnNotice-SalReturnstock 浜岀骇锛歛0ab8e5c-5224-4ba2-b31f-b061e64aa1a2
+ * */
+ STK_OutStockApply31(31, "閫�璐ч�氱煡鍗�","","","閿�鍞��璐у崟","",0,"SalReturnNotice-SalReturnstock"),
+ /*
+ * 閲囪喘鏀舵枡鍗曡嚦閲囪喘鍏ュ簱鍗曞敮涓�鏍囪瘑:涓�绾э細PUR_ReceiveBill-STK_InStock 浜岀骇锛歜60e30ca-634c-4f92-b874-db9837496705
+ * */
+ STK_OutStockApply32(31, "鏀舵枡閫氱煡鍗�","","","閲囪喘鍏ュ簱鍗�","",0,"PUR_ReceiveBill-STK_InStock"),
+ /*
+ * 閫�鏂欑敵璇峰崟鑷抽噰璐��鏂欏崟鍗曟嵁鍞竴鏍囪瘑:PUR_MRAPP-PUR_MRB
+ * */
+ STK_OutStockApply33(31, "閫�鏂欑敵璇峰崟","","","閲囪喘閫�鏂欏崟","",0,"PUR_MRAPP-PUR_MRB"),
+ /*
+ * 鐢熶骇鐢ㄦ枡娓呭崟鍒扮敓浜ч鏂欏崟鍞竴鏍囪瘑锛氫竴绾э細PRD_PPBOM2PICKMTRL_NORMAL 浜岀骇锛�3539ff08-0c46-435d-a8cd-b6308b0b57b5
+ * */
+ STK_OutStockApply34(31, "鐢熶骇鐢ㄦ枡娓呭崟","","","鐢熶骇棰嗘枡鍗�","",0,"PRD_PPBOM2PICKMTRL_NORMAL"),
+
+ STK_OutStockApply35(31, "璇曠敤鍝佸彂璐ч�氱煡鍗�","","","鐮斿彂鏍峰搧鍑哄簱鍗�","",0,""),
+
+ STK_OutStockApply36(31, "璇曠敤鍝佸彂璐ч�氱煡鍗�","","","鐮斿彂鏍峰搧鍑哄簱鍗�","",0,""),
+
+ STK_OutStockApply37(31, "璇曠敤鍝佸彂璐ч�氱煡鍗�","","","鐮斿彂鏍峰搧鍑哄簱鍗�","",0,""),
+
+ STK_OutStockApply38(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 +72,7 @@
this.correspondingName = correspondingName;
this.correspondingFormId = correspondingFormId;
this.pakIn = pakIn; //1鍏ュ簱 0鍑哄簱
+ this.ruleId = ruleId;
}
public static KingDeeUtilType get(Short id) {
@@ -77,6 +99,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