From 563ffc29857acd93c7298ddfca700c1fb01b18e0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 31 十月 2025 17:03:19 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 203 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 149 insertions(+), 54 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..15ec4c4 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
@@ -4,15 +4,23 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.cfg.CoercionAction;
+import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
import com.vincent.rsf.common.domain.CommonReponse;
+import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.config.RemotesInfoProperties;
+import com.vincent.rsf.server.api.controller.erp.params.ReportParams;
+import com.vincent.rsf.server.api.entity.CommonResponse;
+import com.vincent.rsf.server.api.entity.constant.RcsConstant;
import com.vincent.rsf.server.api.entity.dto.PoItemsDto;
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;
@@ -46,19 +54,19 @@
@Autowired
private PurchaseService purchaseService;
-
@Autowired
private RemotesInfoProperties.ApiInfo apiInfo;
-
@Autowired
private RestTemplate restTemplate;
@Autowired
private RemotesInfoProperties remotesInfoProperties;
-
@Autowired
private AsnOrderService asnOrderService;
@Autowired
private AsnOrderItemService asnOrderItemService;
+ @Autowired
+ private RemotesInfoProperties.RcsApi rcsApi;
+
/**
* @author Ryan
* @description 涓婃姤璐ㄦ鍒楄〃
@@ -99,64 +107,151 @@
inspectParams.add(params);
});
+ 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);
+ }
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- //鑾峰彇涓婃姤璐ㄦ鎺ュ彛
- String url = remotesInfoProperties.getBaseUrl() + apiInfo.getNotifyInspect();
- // 璁剧疆璇锋眰鍙傛暟
- params.add("params", JSONObject.toJSONString(inspectParams));
- log.info("璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", url, JSONObject.toJSONString(inspectParams));
+
+ 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());
+ }
+ }
+
+ /**
+ * 涓婃姤宸插畬鎴愯鍗曟槑缁�
+ * @author Ryan
+ * @date 2025/10/27 21:36
+ * @param params
+ * @return com.vincent.rsf.framework.common.R
+ */
+ @Override
+ public R uploadReportOrders(ReportParams params) {
+ if (Objects.isNull(params)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ /**WMS鍩虹閰嶇疆閾炬帴*/
+ String rcsUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.REPORT_ORDERS;
+ log.info("涓婃姤宸插畬鎴愯鍗曪細{}锛� 璇锋眰鍙傛暟锛� {}", rcsUrl, JSONObject.toJSONString(params));
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("涓嬪彂浠诲姟澶辫触锛侊紒");
+ headers.add("api-version", "v2.0");
+
+ HttpEntity httpEntity = new HttpEntity(params, headers);
+ ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
+ log.info("涓婃姤宸插畬鎴愯鍗曪紝杩斿洖缁撴灉锛� {}", exchange);
+ if (Objects.isNull(exchange.getBody())) {
+ 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鍗曟嵁涓嶅瓨鍦紒锛�");
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
+ try {
+ CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
+ if (result.getCode() == 200) {
+ return R.ok().add(result.getData());
+ } else {
+ throw new CoolException("淇敼澶辫触锛侊紒");
}
- List<Long> list = asnOrderItems.stream().map(AsnOrderItem::getId).collect(Collectors.toList());
+ } catch (JsonProcessingException e) {
+ throw new CoolException(e.getMessage());
+ }
+ }
+ }
- /************************** 淇敼ASN鏄庣粏鍗曠姸鎬� ******************************/
+ /**
+ * 鐩樼偣搴撳瓨鏁版嵁淇敼
+ * @param params
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R uploadCheckOrder(ReportParams params) {
+ if (Objects.isNull(params)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ /**WMS鍩虹閰嶇疆閾炬帴*/
+ String rcsUrl = rcsApi.getHost() + ":" + rcsApi.getPort() + RcsConstant.CHECK_LOCITEM_UPDATE;
+ log.info("鐩樼偣搴撳瓨淇敼锛歿}锛� 璇锋眰鍙傛暟锛� {}", rcsUrl, JSONObject.toJSONString(params));
+ HttpHeaders headers = new HttpHeaders();
+ headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
+ params.setAction("Update").setOrderType("PD_stock");
- if (!asnOrderItemService.update(new LambdaUpdateWrapper<AsnOrderItem>().in(AsnOrderItem::getId, list).set(AsnOrderItem::getStatus, 1))) {
- throw new CoolException("ASN鏄庣粏鍗曟嵁鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ HttpEntity httpEntity = new HttpEntity(params, headers);
+ ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
+ log.info("鐩樼偣搴撳瓨淇敼锛岃繑鍥炵粨鏋滐細 {}", exchange);
+ if (Objects.isNull(exchange.getBody())) {
+ throw new CoolException("淇敼澶辫触锛侊紒");
+ } else {
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
+ try {
+ CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
+ if (result.getCode() == 200) {
+ return R.ok().add(result.getData());
+ } else {
+ throw new CoolException("淇敼澶辫触锛侊紒");
}
-
- /************************** 淇敼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());
+ } catch (JsonProcessingException e) {
+ throw new CoolException(e.getMessage());
}
}
}
--
Gitblit v1.9.1