From 340b69790a7a2eff1ff5de75f109dc77f4b4008f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 13 十一月 2024 16:12:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 c941f18..2697383 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
@@ -27,8 +27,12 @@
public OpenOrderPakinParam(){}
public OpenOrderPakinParam(OpenOrderPakinJDParam param1){
- this.orderNo=param1.getOrderNo();
KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(param1.getId());
+ this.orderNo=param1.getOrderNo();
+ 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