From 5921ea84c8339cdf9e9d91d4d41bfe15c4764f2a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 16 六月 2023 13:26:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/ProductInController.cs |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 8291829..d7b2890 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -1260,7 +1260,8 @@
                 {
                     this.objJsonResult.code = "0";
                     this.objJsonResult.count = 1;
-                    this.objJsonResult.Message = "鐢熸垚浜у搧鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //鎴愬姛锛�
+                    //this.objJsonResult.Message = "鐢熸垚浜у搧鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
                     this.objJsonResult.data = null;
                     result = this.objJsonResult;
                 }
@@ -1268,7 +1269,8 @@
                 {
                     this.objJsonResult.code = "0";
                     this.objJsonResult.count = 0;
-                    this.objJsonResult.Message = "涓婁紶澶辫触锛�" + ClsPub.sErrInfo;
+                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //澶辫触锛�
+                    //this.objJsonResult.Message = "涓婁紶澶辫触锛�" + ClsPub.sErrInfo;
                     this.objJsonResult.data = null;
                     result = this.objJsonResult;
                 }

--
Gitblit v1.9.1