From 01468f977925eb5926b843fd0cd74fee42bdc9a7 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 26 十二月 2023 08:45:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 46ce227..da03f09 100644
--- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
+++ b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
@@ -2,22 +2,22 @@
public enum KingDeeUtilType {
- SAL_DELIVERYNOTICE(1, "鍙戣揣閫氱煡鍗�","SAL_DELIVERYNOTICE","FQty","閿�鍞嚭搴撳崟","SAL_OUTSTOCK",0,"DeliveryNotice_Outstock"),
+ SAL_DELIVERYNOTICE(1, "鍙戣揣閫氱煡鍗�-閿�鍞嚭搴撳崟","SAL_DELIVERYNOTICE","FQty","閿�鍞嚭搴撳崟","SAL_OUTSTOCK",0,"DeliveryNotice-Outstock"),
//绫冲闈掑矝
- STK_OutStockApply30(2, "璇曠敤鍝佸彂璐ч�氱煡鍗�","","","鐮斿彂鏍峰搧鍑哄簱鍗�","",0,""),
+ STK_OutStockApply30(2, "璇曠敤鍝佸彂璐ч�氱煡鍗�-鍏朵粬鍑哄簱鍗�","","","鍏朵粬鍑哄簱鍗�","STK_MisDelivery",0,""),
/*
* 閫�璐ч�氱煡鍗曡嚦閿�鍞��璐у崟鍗曟嵁鍞竴鏍囪瘑锛氫竴绾э細SalReturnNotice-SalReturnstock 浜岀骇锛歛0ab8e5c-5224-4ba2-b31f-b061e64aa1a2
* */
- SAL_RETURNNOTICE(3, "閫�璐ч�氱煡鍗�","SAL_RETURNNOTICE","","閿�鍞��璐у崟","SAL_RETURNSTOCK",0,"SalReturnNotice-SalReturnstock"),
+ SAL_RETURNNOTICE(3, "閫�璐ч�氱煡鍗�-閿�鍞��璐у崟","SAL_RETURNNOTICE","","閿�鍞��璐у崟","SAL_RETURNSTOCK",0,"SalReturnNotice-SalReturnstock"),
/*
* 閲囪喘鏀舵枡鍗曡嚦閲囪喘鍏ュ簱鍗曞敮涓�鏍囪瘑:涓�绾э細PUR_ReceiveBill-STK_InStock 浜岀骇锛歜60e30ca-634c-4f92-b874-db9837496705
* */
- PUR_ReceiveBill(4, "鏀舵枡閫氱煡鍗�","PUR_ReceiveBill","","閲囪喘鍏ュ簱鍗�","STK_InStock",1,"PUR_ReceiveBill-STK_InStock"),
+ PUR_ReceiveBill(4, "鏀舵枡閫氱煡鍗�-閲囪喘鍏ュ簱鍗�","PUR_ReceiveBill","","閲囪喘鍏ュ簱鍗�","STK_InStock",1,"PUR_ReceiveBill-STK_InStock"),
/*
* 閫�鏂欑敵璇峰崟鑷抽噰璐��鏂欏崟鍗曟嵁鍞竴鏍囪瘑:PUR_MRAPP-PUR_MRB
* */
- PUR_MRAPP(5, "閫�鏂欑敵璇峰崟","PUR_MRAPP","","閲囪喘閫�鏂欏崟","PUR_MRB",1,"PUR_MRAPP-PUR_MRB"),
+ PUR_MRAPP(5, "閫�鏂欑敵璇峰崟-閲囪喘閫�鏂欏崟","PUR_MRAPP","","閲囪喘閫�鏂欏崟","PUR_MRB",1,"PUR_MRAPP-PUR_MRB"),
/*
* 鐢熶骇鐢ㄦ枡娓呭崟鍒扮敓浜ч鏂欏崟鍞竴鏍囪瘑锛氫竴绾э細PRD_PPBOM2PICKMTRL_NORMAL 浜岀骇锛�3539ff08-0c46-435d-a8cd-b6308b0b57b5
* */
@@ -27,14 +27,15 @@
PRD_PPBOM3(8, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇閫�鏂欏崟","PRD_PPBOM","","鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl",1,"PRD_PPBOM2RETURNMTRL"),
- PRD_MO(9, "鐢熶骇璁㈠崟","PRD_MO","","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1,"PRD_MO2INSTOCK"),
+ PRD_MO(9, "鐢熶骇璁㈠崟-鐢熶骇鍏ュ簱鍗�","PRD_MO","","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1,"PRD_MO2INSTOCK"),
- PRD_MORPT(10, "鐢熶骇姹囨姤鍗�","PRD_MORPT","","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1,"PRD_MORPT2INSTOCK"),
+ PRD_MORPT(10, "鐢熶骇姹囨姤鍗�-鐢熶骇鍏ュ簱鍗�","PRD_MORPT","","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1,"PRD_MORPT2INSTOCK"),
- STK_TRANSFERAPPLY(11, "璋冩嫧鐢宠鍗�","STK_TRANSFERAPPLY","","鐩存帴璋冩嫧鍗�","STK_TransferDirect",0,"StkTransferApphy-StkTransferDirect"),
+ STK_TRANSFERAPPLY(11, "璋冩嫧鐢宠鍗�-鐩存帴璋冩嫧鍗�","STK_TRANSFERAPPLY","","鐩存帴璋冩嫧鍗�","STK_TransferDirect",0,"StkTransferApphy-StkTransferDirect"),
- STK_OutStockApply337(12, "鐮斿彂棰嗘枡鍑哄簱鐢宠鍗�","","","鐮斿彂棰嗘枡鍑哄簱鍗�","",0,""),
- STK_MisDelivery(13, "鍏朵粬鍑哄簱鍗�","STK_MisDelivery","","鍏朵粬鍑哄簱鍗�","STK_MisDelivery",0,""),
+ STK_OutStockApply337(12, "鐮斿彂棰嗘枡鍑哄簱鐢宠鍗�-鐮斿彂棰嗘枡鍑哄簱鍗�","","","鐮斿彂棰嗘枡鍑哄簱鍗�","",0,""),
+ STK_MisDelivery13(13, "缁勮鎷嗗嵏鍗�1","STK_ASSEMBLY","","","",0,""),
+ STK_MisDelivery14(14, "缁勮鎷嗗嵏鍗�2","STK_ASSEMBLY","","","",0,""),
--
Gitblit v1.9.1