From 2632e1b05c4f68cc49b9acb3b3a8847cc0ed86e2 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 27 十二月 2023 08:46:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
index db5fffa..26f185b 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -29,7 +29,13 @@
public OpenOrderPakoutParam(OpenOrderPakinJDParam param1){
this.orderNo=param1.getOrderNo();
- KingDeeUtilType kingDeeUtilType = KingDeeUtilType.getFormId(param1.getFormId());
+ KingDeeUtilType kingDeeUtilType = null;
+ if (!Cools.isEmpty(param1.getId())){
+ kingDeeUtilType = KingDeeUtilType.get(param1.getId());
+ }
+ if (Cools.isEmpty(kingDeeUtilType)){
+ kingDeeUtilType = KingDeeUtilType.getFormId(param1.getFormId());
+ }
if (Cools.isEmpty(kingDeeUtilType)){
this.orderType=param1.getFormId();
}else {
--
Gitblit v1.9.1