From b1cc225b7c21bf930e931c3991fe994270b225d6 Mon Sep 17 00:00:00 2001
From: SoulStar <gxhsoulstar@163.com>
Date: Wed, 21 Aug 2024 13:24:29 +0800
Subject: [PATCH] =?UTF-8?q?add=20-=20=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=86=99=E5=85=A5=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.Core.Api/Admin.Core.Api.xml             |  6 +++
 .../Business/MaterialController.cs            | 26 +++++++++++
 Admin.Core.Api/Properties/launchSettings.json |  4 +-
 .../IService_New/Ixl_materialServices.cs      |  3 ++
 .../Service_New/xl_materialServices.cs        | 43 +++++++++++++++++++
 5 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/Admin.Core.Api/Admin.Core.Api.xml b/Admin.Core.Api/Admin.Core.Api.xml
index db9e744..b1a6345 100644
--- a/Admin.Core.Api/Admin.Core.Api.xml
+++ b/Admin.Core.Api/Admin.Core.Api.xml
@@ -325,6 +325,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Admin.Core.Api.xl_materialController.xlDownLoadMateralInfo">
+            <summary>
+            小料同步MES物料信息
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:Admin.Core.Api.SolventController">
             <summary>
             溶剂称量 PDA接口
diff --git a/Admin.Core.Api/Controllers/Business/MaterialController.cs b/Admin.Core.Api/Controllers/Business/MaterialController.cs
index 948847a..21ed126 100644
--- a/Admin.Core.Api/Controllers/Business/MaterialController.cs
+++ b/Admin.Core.Api/Controllers/Business/MaterialController.cs
@@ -11,6 +11,7 @@ using System.Linq;
 using S71500.Impl;
 using Admin.Core.Model.ViewModels;
 using log4net;
+using Npgsql.TypeHandlers;
 
 namespace Admin.Core.Api
 {
@@ -240,5 +241,30 @@ namespace Admin.Core.Api
             return message;
         }
         #endregion
+
+        /// <summary>
+        /// 小料同步MES物料信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<MessageModel<bool>> xlDownLoadMateralInfo()
+        {
+            try
+            {
+                string ss1 = Guid.NewGuid().ToString("N");
+                string ss2 = "0001";
+                var ss3 = "8114514";
+                var result = await _xl_materialService.xlInsertMaterial(ss1, ss2, ss3, DateTime.Now);
+                if (result)
+                {
+                    return Success(result);
+                }
+            }
+            catch (Exception ex)
+            {
+
+            }
+            return Failed<bool>("执行失败！");
+        }
     }
 }
\ No newline at end of file
diff --git a/Admin.Core.Api/Properties/launchSettings.json b/Admin.Core.Api/Properties/launchSettings.json
index 70fe2ba..692d901 100644
--- a/Admin.Core.Api/Properties/launchSettings.json
+++ b/Admin.Core.Api/Properties/launchSettings.json
@@ -24,8 +24,8 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "dotnetRunMessages": "true",
-      //"applicationUrl": "http://localhost:5001;http://localhost:5000"
-      "applicationUrl": "http://192.168.137.1:5001;http://192.168.137.1:5000"
+      "applicationUrl": "http://localhost:5001;http://localhost:5000"
+      //"applicationUrl": "http://192.168.137.1:5001;http://192.168.137.1:5000"
 
     }
   }
diff --git a/Admin.Core.IService/IService_New/Ixl_materialServices.cs b/Admin.Core.IService/IService_New/Ixl_materialServices.cs
index b5755e2..5146696 100644
--- a/Admin.Core.IService/IService_New/Ixl_materialServices.cs
+++ b/Admin.Core.IService/IService_New/Ixl_materialServices.cs
@@ -2,6 +2,7 @@
 using Admin.Core.IService;
 using Admin.Core.Model;
 using Admin.Core.Model.ViewModels;
+using System;
 using System.Threading.Tasks;
 
 namespace Admin.Core.IService
@@ -29,5 +30,7 @@ namespace Admin.Core.IService
         Task<int> BindBarrel(string code);
 
         Task<MessageModel<bool>> MaterialVerification(string barCode);
+
+        Task<bool> xlInsertMaterial(string ID, string materialCode, string materialName, DateTime CreateDateTime);
     }
 }
\ 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 3dc53e7..32175e9 100644
--- a/Admin.Core.Service/Service_New/xl_materialServices.cs
+++ b/Admin.Core.Service/Service_New/xl_materialServices.cs
@@ -684,5 +684,48 @@ namespace Admin.Core.Service
         }
         #endregion
 
+        /// <summary>
+        /// 小料上位机同步插入物料信息
+        /// </summary>
+        /// <param name="planDate"></param>
+        /// <param name="recipeGUID"></param>
+        /// <param name="batch"></param>
+        /// <param name="productName"></param>
+        /// <returns></returns>
+        public async Task<bool> xlInsertMaterial(string ID, string materialCode, string materialName, DateTime CreateDateTime)
+        {
+            try
+            {
+                xl_material xl_m = new xl_material()
+                {
+                    ID = ID,
+                    Material_code = materialCode,
+                    Material_name = materialName,
+                    CreateDateTime = CreateDateTime,
+                    Remark = null,
+                    Batch_number = null,
+                    Barcode1 = null,
+                    Barcode2 = null,
+                    Barcode3 = null,
+                    IsEnable = "是"
+                };
+
+                var result = await _xl_materialRepository.Add(xl_m);
+                if (result == 1)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            catch (Exception ex)
+            {
+                return false;
+            }
+        }
+
+
     }
 }
\ No newline at end of file