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 @@
+
+
+
+
+ false
+ false
+ true
+ Release
+ Any CPU
+ FileSystem
+ E:\发布文件
+ FileSystem
+ <_TargetId>Folder
+
+
\ 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
///
public DateTime? CreateTime { get; set; }
+ ///
+ /// 类型
+ ///
+ 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;