From e8e8a06fc68a6a645ce32be2cc9c3aaa67a97d68 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 17 9月 2025 13:51:36 +0800
Subject: [PATCH] 优化
---
DEmon/WebWIPAPI/WebWIPAPI.csproj | 1
DEmon/iWareDataCore/BASE/Service/MaterialViewService.cs | 4 ++
DEmon/WebWIPAPI/Utils/ApiResponseHelper.cs | 38 +++++++++++++++++++
DEmon/WebWIPAPI/Controllers/MesIntegrController.cs | 61 ++++++++++++++++++++++++++----
4 files changed, 95 insertions(+), 9 deletions(-)
diff --git a/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs b/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
index 0852c30..b1f80da 100644
--- a/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
+++ b/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
@@ -84,6 +84,31 @@
try
{
+ #region 楠岃瘉
+ if (importMaterials?.Count() == 0)
+ {
+ responseMessage = new ApiResponse<string>()
+ {
+ Code = 500,
+ Success = false,
+ Message = "鏁版嵁鏉℃暟涓�0",
+ Data = null,
+ };
+ return ApiResponseHelper.ReturnApiResponse(responseMessage, "importInOrder", "");
+ }
+ if (importMaterials.Select(x => x.ListNo).Distinct().Count() != 1)
+ {
+ responseMessage = new ApiResponse<string>()
+ {
+ Code = 500,
+ Success = false,
+ Message = "鏈璇锋眰鍗曞彿蹇呴』涓哄悓涓�鍊�",
+ Data = null,
+ };
+ return ApiResponseHelper.ReturnApiResponse(responseMessage, "importInOrder", "");
+ }
+ #endregion
+
#region 涓氬姟澶勭悊
//绗竴姝ワ細鍏堟柊澧炲埌鐗╂枡鍩虹琛�
@@ -148,11 +173,7 @@
};
}
-
- //灏嗗璞¤浆鍖栦负json鏍煎紡
- var responseStr = JsonConvert.SerializeObject(responseMessage);
- LogTextHelper.WriteLine(Resources.LogDir, "WIPAPI:{0},{1}, {2}", "importInOrder", "璇锋眰鍙傛暟锛�" + "", "鍝嶅簲淇℃伅;" + responseStr);
- return Json(responseMessage, JsonRequestBehavior.DenyGet);
+ return ApiResponseHelper.ReturnApiResponse(responseMessage, "importInOrder", "");
}
@@ -168,6 +189,31 @@
try
{
var msg = "";
+
+ #region 楠岃瘉
+ if (inputmaterials?.Count() == 0)
+ {
+ responseMessage = new ApiResponse<string>()
+ {
+ Code = 500,
+ Success = false,
+ Message = "鏁版嵁鏉℃暟涓�0",
+ Data = null,
+ };
+ return ApiResponseHelper.ReturnApiResponse(responseMessage, "importOutOrder", "");
+ }
+ if (inputmaterials.Select(x => x.ListNo).Distinct().Count() != 1)
+ {
+ responseMessage = new ApiResponse<string>()
+ {
+ Code = 500,
+ Success = false,
+ Message = "鏈璇锋眰鍗曞彿蹇呴』涓哄悓涓�鍊�",
+ Data = null,
+ };
+ return ApiResponseHelper.ReturnApiResponse(responseMessage, "importOutOrder", "");
+ }
+ #endregion
#region 涓氬姟澶勭悊
@@ -209,10 +255,7 @@
};
}
- //灏嗗璞¤浆鍖栦负json鏍煎紡
- var responseStr = JsonConvert.SerializeObject(responseMessage);
- LogTextHelper.WriteLine(Resources.LogDir, "WIPAPI:{0},{1}, {2}", "importOutOrder", "璇锋眰鍙傛暟锛�" + "", "鍝嶅簲淇℃伅;" + responseStr);
- return Json(responseMessage, JsonRequestBehavior.DenyGet);
+ return ApiResponseHelper.ReturnApiResponse(responseMessage, "importOutOrder", "");
}
diff --git a/DEmon/WebWIPAPI/Utils/ApiResponseHelper.cs b/DEmon/WebWIPAPI/Utils/ApiResponseHelper.cs
new file mode 100644
index 0000000..dd570a0
--- /dev/null
+++ b/DEmon/WebWIPAPI/Utils/ApiResponseHelper.cs
@@ -0,0 +1,38 @@
+锘縰sing Newtonsoft.Json;
+using System.Web.Mvc;
+using WebWIPAPI.Models;
+using WebWIPAPI.Properties;
+
+
+namespace WebWIPAPI.Utils
+{
+ /// <summary>
+ /// API鍝嶅簲甯姪绫�
+ /// </summary>
+ public class ApiResponseHelper
+ {
+ /// <summary>
+ /// 灏嗘寚瀹氱殑娉涘瀷 API 鍝嶅簲瀵硅薄搴忓垪鍖栦负 JSON 鏍煎紡鏃ュ織骞惰褰曪紝鐒跺悗杩斿洖涓�涓姝� GET 璇锋眰鐨� JSON 缁撴灉銆�
+ /// </summary>
+ /// <typeparam name="T">ApiResponse 娉涘瀷绫诲瀷鍙傛暟锛岃〃绀哄搷搴旀暟鎹殑绫诲瀷</typeparam>
+ /// <param name="response">瑕佽繑鍥炵殑 API 鍝嶅簲瀵硅薄锛屽寘鍚姸鎬佺爜銆佹秷鎭拰鏁版嵁绛変俊鎭�</param>
+ /// <param name="actionName">褰撳墠 API 瀵瑰簲鐨� Action 鍚嶇О锛岀敤浜庢棩蹇楄褰曪紝鏍囪瘑璇锋眰鏉ユ簮</param>
+ /// <param name="requestParams">璇锋眰鍙傛暟鐨勬弿杩颁俊鎭紝鍙互鏄弬鏁板璞＄殑 JSON 瀛楃涓叉垨绠�瑕佹弿杩帮紝榛樿涓虹┖瀛楃涓�</param>
+ /// <returns>
+ /// 杩斿洖涓�涓厤缃负绂佹 GET 璇锋眰鐨� <see cref="JsonResult"/>锛�
+ /// 鍏朵腑鍖呭惈浼犲叆鐨� <paramref name="response"/> 鏁版嵁锛�
+ /// 骞跺湪鏃ュ織涓褰� Action 鍚嶇О銆佽姹傚弬鏁颁笌鍝嶅簲淇℃伅銆�
+ /// </returns>
+ public static JsonResult ReturnApiResponse<T>(ApiResponse<T> response, string actionName, string requestParams = "")
+ {
+ var responseStr = JsonConvert.SerializeObject(response);
+ LogTextHelper.WriteLine(Resources.LogDir, "WIPAPI:{0},{1}, {2}", actionName, "璇锋眰鍙傛暟锛�" + requestParams, "鍝嶅簲淇℃伅锛�" + responseStr);
+ return new JsonResult
+ {
+ Data = response,
+ JsonRequestBehavior = JsonRequestBehavior.DenyGet
+ };
+ }
+
+ }
+}
diff --git a/DEmon/WebWIPAPI/WebWIPAPI.csproj b/DEmon/WebWIPAPI/WebWIPAPI.csproj
index 890fcab..788c804 100644
--- a/DEmon/WebWIPAPI/WebWIPAPI.csproj
+++ b/DEmon/WebWIPAPI/WebWIPAPI.csproj
@@ -132,6 +132,7 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
+ <Compile Include="Utils\ApiResponseHelper.cs" />
<Compile Include="Utils\ClassHelper.cs" />
<Compile Include="Utils\LogTextHelper.cs" />
</ItemGroup>
diff --git a/DEmon/iWareDataCore/BASE/Service/MaterialViewService.cs b/DEmon/iWareDataCore/BASE/Service/MaterialViewService.cs
index 4e10090..dd9aa1d 100644
--- a/DEmon/iWareDataCore/BASE/Service/MaterialViewService.cs
+++ b/DEmon/iWareDataCore/BASE/Service/MaterialViewService.cs
@@ -282,6 +282,10 @@
{
return b1;
}
+ if (materialSaves?.Count == 0)
+ {//璇存槑杩欎簺鐗╂枡閮芥湁浜嗭紝涓嶉渶瑕佸啀瀵煎叆浜� 銆怑ditby shaocx,2025-09-17銆�
+ return true;
+ }
var sql = string.Format("INSERT INTO BASEMaterial(status, name, code, materialno, version, typeid, guaranteeperiod, cost, classificationsociety, unit, serialno, description, remark, verticalposition, weight, issueprojectno, procurementprojectno, cuttingtype, pageno, thick, wide, length, markingpen, laneseparation) VALUES");
for (var j = 0; j < materialSaves.Count; j++)
{
--
Gitblit v1.9.3