From 044ee513806026dc94c8c82cd79b7d2744b704e6 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期五, 31 十月 2025 15:54:13 +0800
Subject: [PATCH] 打开上报接口
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java | 26 ++++++-------
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java | 14 +++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReportMsgService.java | 2 +
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 13 ++----
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 5 ++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 11 +++++
6 files changed, 49 insertions(+), 22 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
index 1b1c596..61529c0 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
@@ -237,23 +237,21 @@
log.info("宸插畬鎴愯鍗曚笂浼狅細{}锛� 璇锋眰鍙傛暟锛� {}", rcsUrl, httpEntity.getBody());
ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
- log.info("宸插畬鎴愯鍗曚笂浼狅紝璇锋眰缁撴灉锛� {}", exchange);
+ log.info("宸插畬鎴愯鍗曚笂浼狅紝璇锋眰缁撴灉锛� {}", exchange.getBody());
if (Objects.isNull(exchange.getBody())) {
throw new CoolException("涓婁紶澶辫触锛侊紒");
} else {
- ObjectMapper objectMapper = new ObjectMapper();
- objectMapper.coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
- try {
- CommonResponse commonResponse = new CommonResponse();
- ErpCommonResponse result = objectMapper.readValue(exchange.getBody(), ErpCommonResponse.class);
- if (!result.getIsError()) {
- commonResponse.setCode(200).setMsg(result.getMessage()).setData(result.getData());
- return commonResponse;
- } else {
- throw new CoolException("涓婁紶澶辫触锛侊紒");
- }
- } catch (JsonProcessingException e) {
- throw new CoolException(e.getMessage());
+// ObjectMapper objectMapper = new ObjectMapper();
+// objectMapper.coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
+ CommonResponse commonResponse = new CommonResponse();
+////
+// ErpCommonResponse result = objectMapper.readValue(exchange.getBody(), ErpCommonResponse.class);
+ ErpCommonResponse result = JSONObject.parseObject(exchange.getBody(), ErpCommonResponse.class);
+ if (!result.getIsError()) {
+ commonResponse.setCode(200).setMsg(result.getMessage()).setData(result.getData());
+ return commonResponse;
+ } else {
+ throw new CoolException("涓婁紶澶辫触锛侊紒");
}
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java
index 516077e..a49da54 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java
@@ -44,7 +44,21 @@
}
return reportMsgService.uploadReportOrders(params);
+ }
+ @ApiOperation("瀹屾垚璁㈠崟涓婃姤")
+ @PostMapping("/orders/check/update")
+ public R checkReport(@RequestBody ReportParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getOrderType())) {
+ return R.error("璁㈠崟绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(params.getAction()) || params.getAction().isEmpty()) {
+ return R.error("涓婃姤鏄庣粏涓嶈兘涓虹┖锛侊紒");
+ }
+ return reportMsgService.uploadCheckOrder(params);
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReportMsgService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReportMsgService.java
index bf51a67..134d495 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReportMsgService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReportMsgService.java
@@ -18,4 +18,6 @@
boolean reportInspectNotify(List<PoItemsDto> items);
R uploadReportOrders(ReportParams params);
+
+ R uploadCheckOrder(ReportParams params);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index 98ddf08..e9cee6b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -19,10 +19,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
@Service
@@ -120,17 +117,17 @@
if (Cools.isEmpty(waveOrderRelas)) {
throw new CoolException("娉㈡瀵瑰簲鍏宠仈鍗曟湭鎵惧埌");
}
- List<Long> ids = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toList());
+ Set<Long> ids = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet());
ArrayList<WkOrderItem> list = new ArrayList<>();
List<WkOrder> wkOrderList = asnOrderService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, ids));
for (WkOrder wkOrder : wkOrderList) {
- WkOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<WkOrderItem>()
+ List<WkOrderItem> orderItem = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
.eq(WkOrderItem::getOrderId, wkOrder.getId())
.eq(StringUtils.isNotEmpty(taskItem.getMatnrCode()), WkOrderItem::getMatnrCode, taskItem.getMatnrCode())
- .eq(StringUtils.isNotEmpty(taskItem.getBatch()), WkOrderItem::getSplrBatch, taskItem.getBatch())
+// .eq(StringUtils.isNotEmpty(taskItem.getBatch()), WkOrderItem::getSplrBatch, taskItem.getBatch())
);
if (null != orderItem) {
- list.add(orderItem);
+ list.addAll(orderItem);
}
}
containerWaveDto.setWkOrderItems(list);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index 63fc48e..fda3e36 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -433,6 +433,11 @@
.setUpdateTime(new Date())
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId);
+
+ if (syncOrder.getType().equals(OrderType.ORDER_OUT.type)){
+ wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
+ }
+
if (!asnOrderService.save(wkOrder)) {
throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
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 f5f48d9..3d83a26 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
@@ -214,4 +214,15 @@
}
}
}
+
+ /**
+ * 搴撳瓨鏁版嵁淇敼
+ * @param params
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R uploadCheckOrder(ReportParams params) {
+ return null;
+ }
}
--
Gitblit v1.9.1