From f782248da68c035aae12f902f29d828e9867abb0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 29 9月 2025 12:45:51 +0800
Subject: [PATCH] 222
---
DEmon/WebWIPAPI/Controllers/MesIntegrController.cs | 78 +++++++++++++++++++++++++++++++++------
1 files changed, 66 insertions(+), 12 deletions(-)
diff --git a/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs b/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
index 7a70f5b..6ee0b86 100644
--- a/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
+++ b/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs
@@ -1,4 +1,5 @@
-锘縰sing iWareCommon.Common.Entity;
+锘縰sing AutoMapper;
+using iWareCommon.Common.Entity;
using iWareCommon.Utils;
using iWareDataCore.BASE.Entity;
using iWareDataCore.BASE.Service;
@@ -10,6 +11,7 @@
using System.Web.Mvc;
using WebWIPAPI.Models;
using WebWIPAPI.Properties;
+using WebWIPAPI.Utils;
using LogTextHelper = WebWIPAPI.Utils.LogTextHelper;
namespace WebWIPAPI.Controllers
@@ -32,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>>()
@@ -82,11 +85,39 @@
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 涓氬姟澶勭悊
//绗竴姝ワ細鍏堟柊澧炲埌鐗╂枡鍩虹琛�
List<MaterialViewEntity> materials = new List<MaterialViewEntity>();
- materials = ClassHelper.RotationMapping<List<MaterialViewEntity>, List<MaterialViewForMesEntity>>(importMaterials);
+
+ materials = ClassHelper.RotationMapping_Json<List<MaterialViewEntity>, List<MaterialViewForMesEntity>>(importMaterials);
+
+
MaterialViewService.GetInstance().ImportExcelFromMes(materials, out msg);
if (!string.IsNullOrEmpty(msg))
{
@@ -104,7 +135,7 @@
string typeName = "鍏ュ簱";
List<InputMaterialEntity> inputmaterials = new List<InputMaterialEntity>();
- inputmaterials = ClassHelper.RotationMapping<List<InputMaterialEntity>, List<MaterialViewForMesEntity>>(importMaterials);
+ inputmaterials = ClassHelper.RotationMapping_Json<List<InputMaterialEntity>, List<MaterialViewForMesEntity>>(importMaterials);
handler_importOutOrder(typeName, inputmaterials, out msg);
#endregion
@@ -143,11 +174,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", "");
}
@@ -163,6 +190,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 涓氬姟澶勭悊
@@ -204,10 +256,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", "");
}
@@ -234,6 +283,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