From 682eba0aaf922e69dfafe05fb6c1bbdbf3a0e04a Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 29 9月 2025 14:35:53 +0800
Subject: [PATCH] 优化
---
DEmon/WebWIPAPI/Controllers/MesIntegrController.cs | 152 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 141 insertions(+), 11 deletions(-)
diff --git a/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs b/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
index 0852c30..6aa50c6 100644
--- a/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
+++ b/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
@@ -34,6 +34,7 @@
{
var msg = "";
var datalist = PlaceMaterialViewService.GetInstance().GetPlacePreview(out msg);
+ datalist = datalist.Where(x => !string.IsNullOrEmpty(x.MaterialCode)).ToList();
if (!string.IsNullOrEmpty(msg))
{
responseMessage = new ApiResponse<List<PlaceMaterialViewEntity>>()
@@ -84,6 +85,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,16 +174,94 @@
};
}
-
- //灏嗗璞¤浆鍖栦负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", "");
}
+ ///// <summary>
+ ///// 瀵煎叆鍑哄簱鍗�-鐗堟湰1
+ ///// </summary>
+ ///// <param name="inputmaterials"></param>
+ ///// <returns></returns>
+ //[HttpPost]
+ //public ActionResult importOutOrder(List<InputMaterialEntity> inputmaterials)
+ //{
+ // var responseMessage = new ApiResponse<string>();
+ // 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 涓氬姟澶勭悊
+
+ // string typeName = "鍑哄簱";
+ // handler_importOutOrder(typeName, inputmaterials, out msg);
+
+ // #endregion
+
+ // if (!string.IsNullOrEmpty(msg))
+ // {
+ // responseMessage = new ApiResponse<string>()
+ // {
+ // Code = 500,
+ // Success = false,
+ // Message = "鐢熸垚鍑哄簱浠诲姟寮傚父:" + msg,
+ // Data = null,
+ // };
+ // }
+ // else
+ // {
+ // responseMessage = new ApiResponse<string>()
+ // {
+ // Code = 200,
+ // Success = true,
+ // Message = "鎴愬姛",
+ // Data = null,
+ // };
+ // }
+
+ // }
+ // catch (Exception ex)
+ // {
+ // responseMessage = new ApiResponse<string>()
+ // {
+ // Code = 500,
+ // Success = false,
+ // Message = "寮傚父:" + ex.Message,
+ // Data = null,
+ // };
+ // }
+
+ // return ApiResponseHelper.ReturnApiResponse(responseMessage, "importOutOrder", "");
+ //}
+
+
/// <summary>
- /// 瀵煎叆鍑哄簱鍗�
+ /// 瀵煎叆鍑哄簱鍗�-鐗堟湰2
/// </summary>
/// <param name="inputmaterials"></param>
/// <returns></returns>
@@ -168,6 +272,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,12 +338,8 @@
};
}
- //灏嗗璞¤浆鍖栦负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", "");
}
-
/// <summary>
/// 鍏叡瀵煎叆 鍏ュ簱鍗曟垨鍑哄簱鍗�
@@ -239,6 +364,11 @@
List<int> ids = new List<int>();
var materials = InputMaterialService.GetInstance().GetIds(codes);
List<InOutListDetailEntity> detail = new List<InOutListDetailEntity>();
+ if (materials?.Count == 0)
+ {
+ msg = ("鐗╂枡鏄庣粏鏌ヨ涓虹┖锛�");
+ return;
+ }
for (int i = 0; i < materials.Count; i++)
{
if (typeName == "鍏ュ簱")
--
Gitblit v1.9.3