From 830bb157b5e46a6c041d5f0c0a883a22e37cb0f7 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 19 三月 2026 10:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz-spring3.5' into devlop-phyz-spring3.5
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
index eb790f4..8ca9934 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
@@ -123,7 +123,7 @@
if ("200".equals(resultMsg)){
return CommonResponse.ok(resultMsg);
}
- return CommonResponse.ok();
+ return CommonResponse.error(resultMsg);
}
@ApiOperation("鍏�/鍑哄簱浠诲姟閫氱煡鍗�")
@@ -145,6 +145,9 @@
String i = erpReportService.addOrderToServer(order);
if (i.equals("200")){
errorMsg.append(order.getOrderNo()+"涓嬪彂鎴愬姛;");
+ if (orderList.size()==1){
+ return CommonResponse.ok(errorMsg.toString());
+ }
} else {
errorMsg.append(order.getOrderNo()+"涓嬪彂澶辫触,鍘熷洜锛�"+i+";");
if (orderList.size()==1){
--
Gitblit v1.9.1