From 207823b94f5627fae49d29b51b5ce7186a70c8e0 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 04 一月 2025 09:59:48 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 d4362b8..2697383 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
@@ -14,6 +14,8 @@
 @Data
 public class OpenOrderPakinParam {
 
+    private String formid;
+
     private String orderNo;
 
     private String orderType;
@@ -25,14 +27,12 @@
     public OpenOrderPakinParam(){}
 
     public OpenOrderPakinParam(OpenOrderPakinJDParam param1){
+        KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(param1.getId());
         this.orderNo=param1.getOrderNo();
-        KingDeeUtilType kingDeeUtilType = KingDeeUtilType.getFormId(param1.getFormId());
-        if (Cools.isEmpty(kingDeeUtilType)){
-            this.orderType=param1.getFormId();
-        }else {
-            this.orderType=kingDeeUtilType.desc;
+        if (kingDeeUtilType.id==7){
+            this.orderNo = param1.getSrcBillNo()+"-"+param1.getOrderNo();
         }
-
+        this.orderType=kingDeeUtilType.desc;
         this.orderTime=param1.getCreateDate();
         List<OpenOrderPakinJDParam.DetlDto2> matList = param1.getMatList();
         List<DetlDto> dtos = new ArrayList<>();

--
Gitblit v1.9.1