From d814bde01eb91d1544b718463cd31317726bbf6b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 27 十二月 2023 21:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

---
 src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
index 3db2aae..8773557 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
@@ -28,13 +28,8 @@
 
     public OpenOrderPakinParam(OpenOrderPakinJDParam param1){
         this.orderNo=param1.getOrderNo();
-        KingDeeUtilType kingDeeUtilType = KingDeeUtilType.getFormId(param1.getFormId());
-        if (Cools.isEmpty(kingDeeUtilType)){
-            this.orderType=param1.getFormId();
-        }else {
-            this.orderType=kingDeeUtilType.desc;
-        }
-
+        KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(param1.getId());
+        this.orderType=kingDeeUtilType.desc;
         this.orderTime=param1.getCreateDate();
         List<OpenOrderPakinJDParam.DetlDto2> matList = param1.getMatList();
         List<DetlDto> dtos = new ArrayList<>();

--
Gitblit v1.9.1