From cbb0dfaec496d441bbf4287ca8ae85c2776e50ed Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 13 三月 2025 13:12:39 +0800
Subject: [PATCH] #修改 1. 收货通知单明细模板修改 2. 收货通知单添加动态扩展字段
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ErpApiServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
similarity index 89%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ErpApiServiceImpl.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index 320a1f8..1e3daf7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ErpApiServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -19,9 +19,12 @@
import com.vincent.rsf.server.manager.service.PurchaseItemService;
import com.vincent.rsf.server.manager.service.PurchaseService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.api.controller.params.Order;
+import com.vincent.rsf.server.api.controller.params.OrderParams;
+import com.vincent.rsf.server.system.entity.Fields;
+import com.vincent.rsf.server.system.service.FieldsItemService;
+import com.vincent.rsf.server.system.service.FieldsService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
-import com.vincent.rsf.server.api.service.ErpApiService;
+import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.server.manager.entity.Purchase;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -48,16 +51,14 @@
*/
@Slf4j
@Service("erpApiService")
-public class ErpApiServiceImpl implements ErpApiService {
+public class ReceiveMsgServiceImpl implements ReceiveMsgService {
@Autowired
private PurchaseService purchaseService;
@Autowired
private PurchaseItemService purchaseItemService;
-
@Autowired
private AsnOrderService asnOrderService;
-
@Autowired
private AsnOrderItemService asnOrderItemService;
@Autowired
@@ -66,10 +67,14 @@
private RemotesInfoProperties remotesInfoProperties;
@Autowired
private RemotesInfoProperties.ApiInfo apiInfo;
+ @Autowired
+ private FieldsService fieldsService;
+ @Autowired
+ private FieldsItemService fieldsItemService;
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean syncPurchasee(List<Order> orders) {
+ public boolean syncPurchasee(List<OrderParams> orders) {
if (orders.isEmpty()) {
throw new CoolException("鍗曟嵁鍐呭涓嶈兘涓虹┖锛侊紒");
}
@@ -82,12 +87,22 @@
if (!purchaseService.save(purchase)) {
throw new CoolException("閲囪喘鍗曟嵁淇濆瓨澶辫触");
}
+
+ //鏌ヨ鎵╁睍瀛楁鏄惁瀛樺湪
+ List<Fields> fields = fieldsService.list(new LambdaQueryWrapper<Fields>().eq(Fields::getStatus, 1).eq(Fields::getFlagEnable, 1));
+
//鍒ゆ柇瀛愬垪琛ㄤ笉涓虹┖
if (!ors.getChildren().isEmpty()) {
ArrayList<PurchaseItem> list = new ArrayList<>();
ors.getChildren().forEach(orderItem -> {
PurchaseItem item = new PurchaseItem();
BeanUtils.copyProperties(orderItem, item);
+// if (!fields.isEmpty()) {
+// List<String> fieldValue = fields.stream().map(Fields::getFields).collect(Collectors.toList());
+// fieldValue.forEach(value -> {
+//
+// });
+// }
item.setPurchaseId(purchase.getId());
list.add(item);
});
--
Gitblit v1.9.1