From 28ff3332983e9b3c264c46187b88c5edeaab8d31 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期六, 08 十一月 2025 17:57:12 +0800
Subject: [PATCH] C3移库功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 2 +-
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/ReportDataParam.java | 3 +++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/ReportDataParam.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/ReportDataParam.java
index ef04b90..9bbfba7 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/ReportDataParam.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/ReportDataParam.java
@@ -52,6 +52,9 @@
@ApiModelProperty("缂栬緫鐢ㄦ埛")
private String EditUser;
+ @ApiModelProperty("搴撲綅淇℃伅")
+ private String Zone;
+
@ApiModelProperty("缂栬緫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
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 4fcbe3a..7d7c1dd 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
@@ -370,7 +370,7 @@
params.setData(reportData);
try {
R reported = uploadReportOrders(params);
- if (reported.get("code").equals("200")) {
+ if (Integer.valueOf(reported.get("code").toString()) == 200) {
order.setNtyStatus(OrderReportStatus.ORDER_REPORT_STATUS_ALL.val);
asnOrderService.updateById(order);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 1707769..4f6661a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -564,7 +564,7 @@
if (Objects.isNull(order)) {
throw new CoolException("鏁版嫇閿欒锛屽崟鎹笉瀛樺湪锛侊紒");
}
- if (order.getType().equals(OrderType.ORDER_OUT.type)) {
+ if (order.getType().equals(OrderType.ORDER_IN.type)) {
// try {
// //涓婃姤宸插畬鎴愯鍗曡嚦ERP銆丮ES绛変笁鏂圭郴缁�
//
--
Gitblit v1.9.1