From 5e17e2126b23a0bf3e5037c72266c0612bc8c172 Mon Sep 17 00:00:00 2001
From: SoulStar <gxhsoulstar@163.com>
Date: Thu, 22 Aug 2024 09:52:32 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=B0=8F=E6=96=99=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=8E=A5=E5=8F=A3GUID=E6=97=B6=E9=97=B4=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.Core.Api/Admin.Core.Api.xml                         | 2 +-
 Admin.Core.Api/Controllers/Business/MaterialController.cs | 7 ++-----
 Admin.Core.IService/IService_New/Ixl_materialServices.cs  | 2 +-
 Admin.Core.Service/Service_New/xl_materialServices.cs     | 6 +++---
 4 files changed, 7 insertions(+), 10 deletions(-)

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 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Admin.Core.Api.xl_materialController.xlDownLoadMateralInfo">
+        <member name="M:Admin.Core.Api.xl_materialController.xlDownLoadMateralInfo(System.String,System.String)">
             <summary>
             小料同步MES物料信息
             </summary>
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
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<MessageModel<bool>> xlDownLoadMateralInfo()
+        public async Task<MessageModel<bool>> 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<MessageModel<bool>> MaterialVerification(string barCode);
 
-        Task<bool> xlInsertMaterial(string ID, string materialCode, string materialName, DateTime CreateDateTime);
+        Task<bool> 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
         /// <param name="batch"></param>
         /// <param name="productName"></param>
         /// <returns></returns>
-        public async Task<bool> xlInsertMaterial(string ID, string materialCode, string materialName, DateTime CreateDateTime)
+        public async Task<bool> 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,