change - 甲方要求更改

Admin.Core.Api/appsettings.json

@@ -80,8 +80,8 @@
       "DBType": 1,
       "Enabled": true,
       "HitRate": 50,
-      "Connection": "Data Source=127.0.0.1;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=192.168.10.50;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=127.0.0.1;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=192.168.10.50;Initial Catalog=cwss_xl;User ID=sa;Password=sa;Integrated Security=false;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
       "ProviderName": "System.Data.SqlClient"
     }
   ],

Admin.Core.Model/ViewModels/MesDownLoadPlanList.cs

@@ -90,7 +90,7 @@ public class MesDownLoadPlanList
     /// <summary>
     /// 反应釜编号
     /// </summary>
-    public string MainId { get; set; }
+    public string MainId { get; set; } = string.Empty;
 
 
 }

Admin.Core.Service/Service_New/Hw_WarehouseServices.cs

@@ -284,7 +284,7 @@ namespace Admin.Core.Service
                 list.ForEach((a) =>
                 {
                     Hw_WareHouse_Sub sb = new Hw_WareHouse_Sub();
-                    sb.MainId = int.TryParse(a.MainId, out int value) ? value : throw new Exception("MainID格式错误！请传入int类型的反应釜编号");
+                    //sb.MainId = int.TryParse(a.MainId, out int value) ? value : throw new Exception("MainID格式错误！请传入int类型的反应釜编号");
                     sb.PId = a.PId;
                     sb.ProductName = a.ProductName;
                     sb.MaterialID = a.Material_Code;
@@ -492,7 +492,7 @@ namespace Admin.Core.Service
                 list.ForEach((a) =>
                 {
                     Hw_WareHouse_Sub sb = new Hw_WareHouse_Sub();
-                    sb.MainId = int.TryParse(a.MainId, out int value) ? value : throw new Exception("MainID格式错误！请传入int类型的反应釜编号");
+                    //sb.MainId = int.TryParse(a.MainId, out int value) ? value : throw new Exception("MainID格式错误！请传入int类型的反应釜编号");
                     sb.PId = a.PId;
                     sb.ProductName = a.ProductName;
                     sb.MaterialID = a.Material_Code;
@@ -685,7 +685,7 @@ namespace Admin.Core.Service
                 list.ForEach((a) =>
                 {
                     Hw_WareHouse_Sub sb = new Hw_WareHouse_Sub();
-                    sb.MainId = int.TryParse(a.MainId, out int value) ? value : throw new Exception("MainID格式错误！请传入int类型的反应釜编号");
+                    //sb.MainId = int.TryParse(a.MainId, out int value) ? value : throw new Exception("MainID格式错误！请传入int类型的反应釜编号");
                     sb.PId = a.PId;
                     sb.ProductName = a.ProductName;
                     sb.BinId = a.BinId == "" || a.BinId == null ? 0 : int.Parse(a.BinId);

Admin.Core.Service/Service_New/xl_materialServices.cs

@@ -86,7 +86,7 @@ namespace Admin.Core.Service
 
                     if (!string.IsNullOrEmpty(barCode.Trim()))
                     {
-                        string[] str = barCode.Split("-");
+                        string[] str = barCode.Split("#");
                       
                        //保存料仓投料重量
                         Hw_BinTypeErrorPreventionReport hw = new Hw_BinTypeErrorPreventionReport()