From fa3e00c4d5e91613e3f2a1f2692cb68635d4ad2d Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期二, 22 七月 2025 08:31:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion --- src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java | 5 ++++- 1 files changed, 4 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 8773557..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,11 @@ 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(); -- Gitblit v1.9.1