From a6bee744b39fe44423624f0d268706c4257e4bba Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 16 七月 2025 08:57:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 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 26f185b..b768812 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -29,19 +29,15 @@
public OpenOrderPakoutParam(OpenOrderPakinJDParam param1){
this.orderNo=param1.getOrderNo();
- KingDeeUtilType kingDeeUtilType = null;
- if (!Cools.isEmpty(param1.getId())){
- kingDeeUtilType = KingDeeUtilType.get(param1.getId());
- }
- if (Cools.isEmpty(kingDeeUtilType)){
- kingDeeUtilType = KingDeeUtilType.getFormId(param1.getFormId());
- }
+ KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(param1.getId());
if (Cools.isEmpty(kingDeeUtilType)){
this.orderType=param1.getFormId();
}else {
this.orderType=kingDeeUtilType.desc;
}
-
+ if (kingDeeUtilType.id==7){
+ this.orderNo = param1.getSrcBillNo()+"-"+param1.getOrderNo();
+ }
this.orderTime=param1.getCreateDate();
List<OpenOrderPakinJDParam.DetlDto2> matList = param1.getMatList();
List<DetlDto> dtos = new ArrayList<>();
--
Gitblit v1.9.1