From 67f4004e7645ecb4b88191981bcb106a55cd5765 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 29 八月 2023 16:03:14 +0800
Subject: [PATCH] U8接口bug修复
---
src/main/java/com/zy/asrs/controller/OpenController.java | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 93fe59d..8228a63 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -244,34 +244,55 @@
return R.parse(BaseRes.PARAM);
}
- int MsgT = 0;
- int MsgF = 0;
- StringBuilder Msg= new StringBuilder("鍘熷洜锛�");
+ int msgU = 0;
+ int msgT = 0;
+ int msgF = 0;
+ StringBuilder msg= new StringBuilder("鍘熷洜锛�");
List<MatInfoParam> matDetails = (List<MatInfoParam>) param.get("matDetails");
for (Object matDetail : matDetails){
MatInfoParam matInfoParam = JSONObject.parseObject(JSON.toJSONString(matDetail),MatInfoParam.class);
if (Cools.isEmpty(matDetails)) {
- MsgF++;
+ msgF++;
continue;
}
openService.syncMat(matInfoParam);
- if(matInfoParam.isType()){
- MsgT++;
- }else {
- MsgF++;
- Msg.append(matInfoParam.getCinvcode()).append(":").append(matInfoParam.getMemo()).append(";");
+ if(matInfoParam.isUpdate()){
+ msgU++;
+ }else if(matInfoParam.isInsert()){
+ msgT++;
+ } else if(matInfoParam.isError()){
+ msgF++;
+ msg.append(matInfoParam.getCinvcode()).append(":").append(matInfoParam.getMemo()).append(";");
}
}
-
- if (MsgF==0){
- return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�");
- }else if (MsgT==0){
- return R.ok("鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
- }else {
- return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�;"+"鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
+ String message = "";
+ boolean success = false;
+ if(msgT != 0){
+ message += "鎴愬姛鎺ユ敹鐗╂枡锛�"+msgT+"涓�";
+ success = true;
}
+ if(msgU != 0){
+ message += "鎴愬姛淇敼鐗╂枡锛�"+msgU+"涓�";
+ success = true;
+ }
+ if(msgF != 0){
+ message += "鎺ユ敹鐗╂枡澶辫触锛�"+msgF+"涓�;"+msg;
+ }
+ if(success){
+ return R.ok(message);
+ }else {
+ return R.error(message);
+ }
+
+// if (MsgF==0){
+// return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�");
+// }else if (MsgT==0){
+// return R.error("鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
+// }else {
+// return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�;"+"鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
+// }
}
--
Gitblit v1.9.1