优化

schangxiang@126.com

2025-09-17 e8e8a06fc68a6a645ce32be2cc9c3aaa67a97d68

优化

 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", "");
        }



 DEmon/WebWIPAPI/Utils/ApiResponseHelper.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
using 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
            };
        }

    }
}

 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>

 DEmon/iWareDataCore/BASE/Service/MaterialViewService.cs

@@ -282,6 +282,10 @@
                    {
                        return b1;
                    }
                    if (materialSaves?.Count == 0)
                    {//说明这些物料都有了，不需要再导入了 ã€Editby 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++)
                    {