From ab9d9126ced7d6dac0e14c3ede5a49fdb7fc94df Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周三, 17 9月 2025 13:25:06 +0800 Subject: [PATCH] 代码初次提交 --- DEmon/WebWIPAPI/Controllers/MesIntegrController.cs | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs b/DEmon/WebWIPAPI/Controllers/MesIntegrController.cs index 7a70f5b..0852c30 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 @@ -86,7 +88,10 @@ //绗竴姝ワ細鍏堟柊澧炲埌鐗╂枡鍩虹琛� 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 +109,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 -- Gitblit v1.9.3