From c15b1746609c605a225a2200d966b48dd759b22e Mon Sep 17 00:00:00 2001
From: "liulb@mesnac.com" <haiwei@123>
Date: Thu, 2 Nov 2023 18:24:54 +0800
Subject: [PATCH] .

---
 .../PublishProfiles/FolderProfile1.pubxml       | 17 +++++++++++++++++
 Admin.Core.Api/appsettings.Development.json     |  2 +-
 Admin.Core.Model/Model_New/Hw_BinAlarm.cs       |  4 ++++
 .../Service_New/xl_materialServices.cs          |  1 +
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 Admin.Core.Api/Properties/PublishProfiles/FolderProfile1.pubxml

diff --git a/Admin.Core.Api/Properties/PublishProfiles/FolderProfile1.pubxml b/Admin.Core.Api/Properties/PublishProfiles/FolderProfile1.pubxml
new file mode 100644
index 0000000..0278a2b
--- /dev/null
+++ b/Admin.Core.Api/Properties/PublishProfiles/FolderProfile1.pubxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <DeleteExistingFiles>false</DeleteExistingFiles>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>E:\发布文件</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <_TargetId>Folder</_TargetId>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Admin.Core.Api/appsettings.Development.json b/Admin.Core.Api/appsettings.Development.json
index b196aa1..f76603e 100644
--- a/Admin.Core.Api/appsettings.Development.json
+++ b/Admin.Core.Api/appsettings.Development.json
@@ -82,7 +82,7 @@
       "Enabled": true,
       "HitRate": 50,
       //"Connection": "Server=127.0.0.1;Port=5432;User Id=postgres;Password=postgres;Database=Admin.Core;",
-      "Connection": "Data Source=localhost;Initial Catalog=cwss_xl;User ID=sa;Password=sa;Integrated Security=false;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+      "Connection": "Data Source=localhost;Initial Catalog=cwss_xl;User ID=sa;Password=haiwei@123;Integrated Security=false;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
       //"Connection": "Data Source=.;Initial Catalog=RCEP_Market;User ID=sa;Password=Password01!;Integrated Security=false;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
       //"Connection": "db/hw.db",
 
diff --git a/Admin.Core.Model/Model_New/Hw_BinAlarm.cs b/Admin.Core.Model/Model_New/Hw_BinAlarm.cs
index ddc1e6f..c07ce47 100644
--- a/Admin.Core.Model/Model_New/Hw_BinAlarm.cs
+++ b/Admin.Core.Model/Model_New/Hw_BinAlarm.cs
@@ -58,5 +58,9 @@ namespace Admin.Core.Model
         /// Nullable:True
         /// </summary>
         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        public string TypeName { get; set; }
     }
 }
\ 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 8fd026f..900542b 100644
--- a/Admin.Core.Service/Service_New/xl_materialServices.cs
+++ b/Admin.Core.Service/Service_New/xl_materialServices.cs
@@ -87,6 +87,7 @@ namespace Admin.Core.Service
                     binAlarm.MaterialCode = pmtBin.Material_ID;
                     binAlarm.MaterialName = material.Material_name;
                     binAlarm.Weights = weight;
+                    binAlarm.TypeName = "入库";
                     binAlarm.CreateTime = DateTime.Now;
                     //同时记录该扫码到数据库中
                     pmtBin.BinWeight = pmtBin.BinWeight + weight;