diff --git a/Admin.Core.Api/Admin.Core.Api.xml b/Admin.Core.Api/Admin.Core.Api.xml index b1a6345..da772f4 100644 --- a/Admin.Core.Api/Admin.Core.Api.xml +++ b/Admin.Core.Api/Admin.Core.Api.xml @@ -325,7 +325,7 @@ - + 小料同步MES物料信息 diff --git a/Admin.Core.Api/Controllers/Business/MaterialController.cs b/Admin.Core.Api/Controllers/Business/MaterialController.cs index 21ed126..b936c58 100644 --- a/Admin.Core.Api/Controllers/Business/MaterialController.cs +++ b/Admin.Core.Api/Controllers/Business/MaterialController.cs @@ -247,14 +247,11 @@ namespace Admin.Core.Api /// /// [HttpGet] - public async Task> xlDownLoadMateralInfo() + public async Task> xlDownLoadMateralInfo(string materialCode, string materialName) { try { - string ss1 = Guid.NewGuid().ToString("N"); - string ss2 = "0001"; - var ss3 = "8114514"; - var result = await _xl_materialService.xlInsertMaterial(ss1, ss2, ss3, DateTime.Now); + var result = await _xl_materialService.xlInsertMaterial(materialCode, materialName); if (result) { return Success(result); diff --git a/Admin.Core.IService/IService_New/Ixl_materialServices.cs b/Admin.Core.IService/IService_New/Ixl_materialServices.cs index 5146696..9c70dfc 100644 --- a/Admin.Core.IService/IService_New/Ixl_materialServices.cs +++ b/Admin.Core.IService/IService_New/Ixl_materialServices.cs @@ -31,6 +31,6 @@ namespace Admin.Core.IService Task> MaterialVerification(string barCode); - Task xlInsertMaterial(string ID, string materialCode, string materialName, DateTime CreateDateTime); + Task xlInsertMaterial(string materialCode, string materialName); } } \ No newline at end of file diff --git a/Admin.Core.Service/Service_New/xl_materialServices.cs b/Admin.Core.Service/Service_New/xl_materialServices.cs index 32175e9..86f4626 100644 --- a/Admin.Core.Service/Service_New/xl_materialServices.cs +++ b/Admin.Core.Service/Service_New/xl_materialServices.cs @@ -692,16 +692,16 @@ namespace Admin.Core.Service /// /// /// - public async Task xlInsertMaterial(string ID, string materialCode, string materialName, DateTime CreateDateTime) + public async Task xlInsertMaterial(string materialCode, string materialName) { try { xl_material xl_m = new xl_material() { - ID = ID, + ID = Guid.NewGuid().ToString("N"), Material_code = materialCode, Material_name = materialName, - CreateDateTime = CreateDateTime, + CreateDateTime = DateTime.Now, Remark = null, Batch_number = null, Barcode1 = null,