From f1148a16d18e7d0f095fbd2341410104de665fc1 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 14:39:54 +0800
Subject: [PATCH] erp物料对接修改
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 125 +++++++++++++++++++++--------------------
1 files changed, 65 insertions(+), 60 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
index 570175a..c575dc0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
@@ -11,8 +11,8 @@
import com.vincent.rsf.server.api.entity.params.ErpInspectItem;
import com.vincent.rsf.server.api.entity.params.ErpInspectParams;
import com.vincent.rsf.server.api.service.ReportMsgService;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrder;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.Purchase;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
@@ -99,65 +99,70 @@
inspectParams.add(params);
});
-
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- //鑾峰彇涓婃姤璐ㄦ鎺ュ彛
- String url = remotesInfoProperties.getBaseUrl() + apiInfo.getNotifyInspect();
- // 璁剧疆璇锋眰鍙傛暟
- params.add("params", JSONObject.toJSONString(inspectParams));
- log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", url, JSONObject.toJSONString(inspectParams));
- HttpHeaders headers = new HttpHeaders();
- headers.add("Content-Type", "application/json");
- HttpEntity httpEntity = new HttpEntity<>(params, headers);
- // 璇锋眰
- ResponseEntity<String> exchange = restTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
- log.info("涓嬪彂浠诲姟 杩斿洖缁撴灉锛歿}", exchange);
- if (Objects.isNull(exchange.getBody()) || exchange.getBody() == null) {
- throw new CoolException("涓嬪彂浠诲姟澶辫触锛侊紒");
- } else {
- CommonReponse reponse = (CommonReponse) JSON.parse(exchange.getBody());
- if (reponse.getCode() == 0) {
- //淇敼asn涓婃姤鐘舵��
- Set<String> itemSets = items.stream().map(PoItemsDto::getId).collect(Collectors.toSet());
- Set<Long> longSet = new HashSet<>();
- itemSets.forEach(set -> {
- longSet.add(Long.parseLong(set));
- });
-
- List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getPoDetlId, longSet));
- if (asnOrderItems.isEmpty()) {
- throw new CoolException("ASN鍗曟嵁涓嶅瓨鍦紒锛�");
- }
- List<Long> list = asnOrderItems.stream().map(AsnOrderItem::getId).collect(Collectors.toList());
-
- /************************** 淇敼ASN鏄庣粏鍗曠姸鎬� ******************************/
-
-
- if (!asnOrderItemService.update(new LambdaUpdateWrapper<AsnOrderItem>().in(AsnOrderItem::getId, list).set(AsnOrderItem::getStatus, 1))) {
- throw new CoolException("ASN鏄庣粏鍗曟嵁鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
-
- /************************** 淇敼ASN涓诲崟鏁版嵁 ******************************/
- //鑾峰彇ASN鏄庣粏璁㈠崟鏍囪瘑
- List<Long> ids = asnOrderItems.stream().map(AsnOrderItem::getAsnId).collect(Collectors.toList());
- //ASN鏄庣粏鍗曟嵁鍒嗙粍
- Map<Long, List<AsnOrderItem>> asnIds = asnOrderItems.stream().collect(Collectors.groupingBy(AsnOrderItem::getAsnId));
- ids.forEach(id -> {
- int count = asnOrderService.count(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, id));
- if (count == asnIds.get(id).size()) {
- if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>().eq(AsnOrder::getId, id).set(AsnOrder::getStatus, 1))) {
- throw new CoolException("ASN涓诲崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
- } else {
- if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>().eq(AsnOrder::getId, id).set(AsnOrder::getStatus, 2))) {
- throw new CoolException("ASN涓诲崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
- }
- });
- return true;
- } else {
- throw new CoolException(reponse.getMsg());
+ CommonReponse reponse = new CommonReponse();
+ if (!remotesInfoProperties.getHost().equals("http://127.0.0.1")){
+ MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
+ //鑾峰彇涓婃姤璐ㄦ鎺ュ彛
+ String url = remotesInfoProperties.getBaseUrl() + apiInfo.getNotifyInspect();
+ // 璁剧疆璇锋眰鍙傛暟
+ params.add("params", JSONObject.toJSONString(inspectParams));
+ log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", url, JSONObject.toJSONString(inspectParams));
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ HttpEntity httpEntity = new HttpEntity<>(params, headers);
+ // 璇锋眰
+ ResponseEntity<String> exchange = restTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
+ log.info("涓嬪彂浠诲姟 杩斿洖缁撴灉锛歿}", exchange);
+ if (Objects.isNull(exchange.getBody()) || exchange.getBody() == null) {
+ throw new CoolException("涓嬪彂浠诲姟澶辫触锛侊紒");
}
+ reponse = (CommonReponse) JSON.parse(exchange.getBody());
+ }else {
+ reponse.setCode(0);
+ }
+
+
+ if (reponse.getCode() == 0) {
+ //淇敼asn涓婃姤鐘舵��
+ Set<String> itemSets = items.stream().map(PoItemsDto::getId).collect(Collectors.toSet());
+ Set<Long> longSet = new HashSet<>();
+ itemSets.forEach(set -> {
+ longSet.add(Long.parseLong(set));
+ });
+
+ List<WkOrderItem> wkOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getPoDetlId, longSet));
+ if (wkOrderItems.isEmpty()) {
+ throw new CoolException("ASN鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ List<Long> list = wkOrderItems.stream().map(WkOrderItem::getId).collect(Collectors.toList());
+
+ /************************** 淇敼ASN鏄庣粏鍗曠姸鎬� ******************************/
+
+
+ if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>().in(WkOrderItem::getId, list).set(WkOrderItem::getNtyStatus, 1))) {
+ throw new CoolException("ASN鏄庣粏鍗曟嵁鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+ /************************** 淇敼ASN涓诲崟鏁版嵁 ******************************/
+ //鑾峰彇ASN鏄庣粏璁㈠崟鏍囪瘑
+ List<Long> ids = wkOrderItems.stream().map(WkOrderItem::getOrderId).collect(Collectors.toList());
+ //ASN鏄庣粏鍗曟嵁鍒嗙粍
+ Map<Long, List<WkOrderItem>> asnIds = wkOrderItems.stream().collect(Collectors.groupingBy(WkOrderItem::getOrderId));
+ ids.forEach(id -> {
+ int count = asnOrderService.count(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, id));
+ if (count == asnIds.get(id).size()) {
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>().eq(WkOrder::getId, id).set(WkOrder::getNtyStatus, 1))) {
+ throw new CoolException("ASN涓诲崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ } else {
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>().eq(WkOrder::getId, id).set(WkOrder::getNtyStatus, 2))) {
+ throw new CoolException("ASN涓诲崟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ });
+ return true;
+ } else {
+ throw new CoolException(reponse.getMsg());
}
}
}
--
Gitblit v1.9.1