From 9d8c158d4d3739ae5f8f1cb24b66232362cd44aa Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 28 十二月 2023 16:33:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 6 +++---
src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java | 2 ++
src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java | 6 +-----
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index a79ed0c..dcf29f2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -116,9 +116,9 @@
if (Cools.isEmpty(param1.getId())) {
return R.error("鍗曟嵁鍞竴鍊糩id]涓嶈兘涓虹┖");
}
- if (Cools.isEmpty(param1.getFormId())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
- }
+// if (Cools.isEmpty(param1.getFormId())) {
+// return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+// }
if (Cools.isEmpty(param1.getMatList())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java
index 97a2b8d..93e04fa 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java
@@ -20,6 +20,8 @@
private String createDate;
private String type;//绫诲瀷 (1銆佹暣鍗曚笂鎶� 2銆佽鍙蜂笂鎶�)
+ private String sourceLocName;//婧愪粨搴�
+ private String targetLocName;//鐩爣浠撳簱
private List<DetlDto2> matList;
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 d45c201..3337b5e 100644
--- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
+++ b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
@@ -32,7 +32,7 @@
PRD_MORPT(10, "鐢熶骇姹囨姤鍗�-鐢熶骇鍏ュ簱鍗�","PRD_MORPT","","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1,"PRD_MORPT2INSTOCK",0),
- STK_TRANSFERAPPLY1(11, "璋冩嫧鐢宠鍗�1-鐩存帴璋冩嫧鍗�","STK_TRANSFERAPPLY","","鐩存帴璋冩嫧鍗�","STK_TransferDirect",0,"StkTransferApply-StkTransferDirect",1),
+ STK_TRANSFERAPPLY1(11, "鐩存帴璋冩嫧鍗�","STK_TRANSFERAPPLY","","鐩存帴璋冩嫧鍗�","STK_TransferDirect",0,"StkTransferApply-StkTransferDirect",10),
STK_OUTSTOCKAPPLY(12, "鐮斿彂棰嗘枡鍑哄簱鐢宠鍗�-鐮斿彂棰嗘枡鍑哄簱鍗�","STK_OUTSTOCKAPPLY","","鐮斿彂棰嗘枡鍑哄簱鍗�","",0,"STK_OutstockApplyTosTK_MisDelivery",0),
@@ -47,10 +47,6 @@
PRD_PPBOM(17, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇鐢ㄦ枡娓呭崟鍙樻洿鍗�","PRD_PPBOM","","鐢熶骇棰嗘枡鍗�","PRD_PPBOMChange",1,"PRD_PPBOM2PPBOMCHANGE",1), //浠ｆ浛鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇琛ユ枡鍗�
//涓嬪彂鐢熶骇鐢ㄦ枡娓呭崟 鍋氬畬鍚庝笂鎶ワ紙涓嬫帹锛� 锛圗RP锛夌敓鎴愮敓浜ч鏂欏崟 鐒跺悗锛坋rp锛変笅鍙戠敓浜х敤鏂欐竻鍗曞彉鏇村崟(鍘熷崟鍙�) 璧扮敓浜х敤鏂欐竻鍗�-鐢熶骇棰嗘枡鍗�
// PRD_PPBOM(17, "鐢熶骇鐢ㄦ枡娓呭崟鍙樻洿鍗�-鐢熶骇棰嗘枡鍗�","PRD_PPBOM","","鐢熶骇琛ユ枡鍗�","PRD_FeedMtrl",1,"PRD_PPBOM2PPBOMCHANGE",1), //浠ｆ浛鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇琛ユ枡鍗�
-
- STK_TRANSFERAPPLY2(18, "璋冩嫧鐢宠鍗�2-鐩存帴璋冩嫧鍗�","STK_TRANSFERAPPLY","","鐩存帴璋冩嫧鍗�","STK_TransferDirect",0,"StkTransferApply-StkTransferDirect",1),
-
- STK_TRANSFERAPPLY3(19, "璋冩嫧鐢宠鍗�3-鐩存帴璋冩嫧鍗�","STK_TRANSFERAPPLY","","鐩存帴璋冩嫧鍗�","STK_TransferDirect",0,"StkTransferApply-StkTransferDirect",1),
STK_TRANSFERAPPLY4(20, "鐢熶骇棰嗘枡鍗�-鐢熶骇閫�鏂欏崟","STK_TRANSFERAPPLY","","鐩存帴璋冩嫧鍗�","STK_TransferDirect",0,"StkTransferApphy-StkTransferDirect",1),
;
--
Gitblit v1.9.1