From 18d68d8f70a6a434f6fda012299ae1b219c81ed7 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期二, 19 十一月 2024 13:31:48 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6d247c2..04cb1dc 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -158,7 +158,7 @@
break;
default:
log.info("鏈煡鐨勫崟鎹被鍨�:{}", param);
- mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁());
+ mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁());
break;
}
@@ -249,7 +249,7 @@
break;
default:
log.info("鏈煡鐨勫崟鎹被鍨�:{}", param);
- mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁());
+ mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get鎿嶄綔鍗曟嵁());
break;
}
@@ -316,6 +316,8 @@
//orderDetl.setbFree1(param.getBFree1());
orderDetl.setId(param.getId());
orderDetl.setIvouchrowno(param.getIvouchrowno());
+ orderDetl.setINum(param.getINum());
+ orderDetl.setIinvexchrate(param.getIinvexchrate());
//娣诲姞鍗曟嵁鏄庣粏鍒板崟鎹富浣�
List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
@@ -352,10 +354,11 @@
//orderDetl.setiQuantity(childInfo.getIQuantity());
orderDetl.setCsocode(param.getCsocode());
//orderDetl.setbFree1(childInfo.getBFree1());
- orderDetl.setId(childInfo.getIds());
+ orderDetl.setId(Cools.isEmpty(childInfo.getIPOsID()) ? childInfo.getId() : childInfo.getIPOsID());
orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
-
-
+ if (!Cools.isEmpty(childInfo.getCFree1())) {
+ orderDetl.setBFree1(childInfo.getCFree1());
+ }
orderDetls.add(orderDetl);
}
orderSyncParam.setChildren(orderDetls);
@@ -384,6 +387,9 @@
orderDetl.setCsocode(param.getCsocode());
orderDetl.setId(childInfo.getIds());
//orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
+ if (!Cools.isEmpty(childInfo.getCFree1())) {
+ orderDetl.setBFree1(childInfo.getCFree1());
+ }
orderDetls.add(orderDetl);
}
orderSyncParam.setChildren(orderDetls);
--
Gitblit v1.9.1