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 |   90 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs b/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
index 8f71d8e..6aa50c6 100644
--- a/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
+++ b/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
@@ -178,8 +178,90 @@
         }
 
 
+        ///// <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>
@@ -259,7 +341,6 @@
             return ApiResponseHelper.ReturnApiResponse(responseMessage, "importOutOrder", "");
         }
 
-
         /// <summary>
         /// 鍏叡瀵煎叆 鍏ュ簱鍗曟垨鍑哄簱鍗�
         /// </summary>
@@ -283,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