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 | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 c2f3063..2697383 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
@@ -1,7 +1,11 @@
package com.zy.asrs.entity.param;
+import com.core.common.Cools;
+import com.zy.common.model.DetlDto;
+import com.zy.erp.kingdee.enums.KingDeeUtilType;
import lombok.Data;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -10,21 +14,33 @@
@Data
public class OpenOrderPakinParam {
+ private String formid;
+
private String orderNo;
private String orderType;
- private List<Detl> orderDetails;
+ private String orderTime;
- @Data
- public static class Detl {
+ private List<DetlDto> orderDetails;
- private String matnr;
+ public OpenOrderPakinParam(){}
- private String batch;
-
- private Double anfme;
-
+ public OpenOrderPakinParam(OpenOrderPakinJDParam param1){
+ 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<>();
+ for (OpenOrderPakinJDParam.DetlDto2 detlDto2:matList){
+ DetlDto detlDto = new DetlDto(detlDto2);
+ dtos.add(detlDto);
+ }
+ this.orderDetails = dtos;
}
}
--
Gitblit v1.9.1