From 563ffc29857acd93c7298ddfca700c1fb01b18e0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 31 十月 2025 17:03:19 +0800
Subject: [PATCH] no message
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java | 5 -----
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportDataParam.java | 3 +++
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java | 6 +++---
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java | 3 +++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java | 5 +----
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 34 ++++++++++++++++++++++++++++++++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 1 +
7 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java
index 2a4f608..d5e4230 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java
@@ -104,9 +104,9 @@
}
@ApiOperation("鐩樼偣宸紓淇敼")
- @PostMapping("/report/check")
- public CommonResponse reportCheck(@RequestBody Map<String, Object> params) {
- return wmsErpService.reportCheck(params);
+ @PostMapping("/check/locitem/update")
+ public CommonResponse reportCheck(@RequestBody ReportParams params) {
+ return wmsErpService.reportOrders(params);
}
}
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 61529c0..f88c4d2 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
@@ -241,11 +241,7 @@
if (Objects.isNull(exchange.getBody())) {
throw new CoolException("涓婁紶澶辫触锛侊紒");
} else {
-// 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());
@@ -274,7 +270,6 @@
headers.add("Content-Type", "application/json");
headers.add("api-version", "v2.0");
- params.put("", "");
HttpEntity httpEntity = new HttpEntity(params, headers);
ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
log.info("淇敼缁撴灉锛� {}", exchange);
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 a49da54..e8f7c83 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
@@ -46,14 +46,11 @@
return reportMsgService.uploadReportOrders(params);
}
- @ApiOperation("瀹屾垚璁㈠崟涓婃姤")
+ @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("涓婃姤鏄庣粏涓嶈兘涓虹┖锛侊紒");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportDataParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportDataParam.java
index 798e1aa..1b31828 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportDataParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ReportDataParam.java
@@ -49,6 +49,9 @@
@ApiModelProperty("鍑哄簱鏁伴噺")
private Double OutQty;
+ @ApiModelProperty("搴撲綅")
+ private String Zone;
+
@ApiModelProperty("缂栬緫鐢ㄦ埛")
private String EditUser;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java
index f62dff9..0a4afb4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java
@@ -10,4 +10,7 @@
//涓婃姤璁㈠崟淇℃伅
public static String REPORT_ORDERS = "/rsf-open-api/erp/report/order";
+
+ //鐩樼偣搴撳瓨淇敼
+ public static String CHECK_LOCITEM_UPDATE = "/rsf-open-api/erp/check/locitem/update";
}
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 3d83a26..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
@@ -216,13 +216,43 @@
}
/**
- * 搴撳瓨鏁版嵁淇敼
+ * 鐩樼偣搴撳瓨鏁版嵁淇敼
* @param params
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R uploadCheckOrder(ReportParams params) {
- return null;
+ 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");
+
+ 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("淇敼澶辫触锛侊紒");
+ }
+ } catch (JsonProcessingException e) {
+ throw new CoolException(e.getMessage());
+ }
+ }
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
index bf59bde..3d4c7b0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
@@ -136,6 +136,7 @@
//璁剧疆閫氱敤鍙傛暟
param.setWMSNO(order.getCode())
.setPONO(order.getPoCode())
+ .setOrderNO(order.getPoCode())
.setOrderDate(order.getCreateTime())
.setItemCode(orderItem.getMatnrCode())
.setEditUser(nickName)
--
Gitblit v1.9.1