修正RegionId

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/Inspect/SapDeliverRecordController.cs

@@ -202,6 +202,7 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
                             }
                             else if (str == "ZPPIMPLV")
                             {
+                                
                                 sapDeliverRecord.KeyFlag = false;//*
                             }
                             else
@@ -254,9 +255,9 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
                 }
 
                 sapDeliverRecord.Category = category;//*
-                if (category == "外协件")//所有外协件默认都是关键件
+                if (category == "外购件"&&!sapDeliverRecord.KeyFlag)//外购件，且非关键件则不导入，跳过
                 {
-                    sapDeliverRecord.KeyFlag = true;//*
+                    continue;
                 }
 
                 //sapDeliverRecord.CheckQty = string.IsNullOrEmpty(dataSet.Tables[1].Rows[i][27].ToString().Trim()) ? 0 : Convert.ToInt32(dataSet.Tables[1].Rows[i][27].ToString().Trim());

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/OutStore/SapBomRecordController.cs

@@ -178,6 +178,8 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
 
                     CreateBy = HttpContext.GetName(),
                     CreateTime = DateTime.Now,
+                    UpdateBy = HttpContext.GetName(),
+                    UpdateTime = DateTime.Now,
                     Remark = "导入数据"
                 };
                 sapBomRecord.Category = sapBomRecord.Category.Contains("外购件") ? "外购件" : "外协件";

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/OutStore/SapOutTaskRecordController.cs

@@ -261,6 +261,8 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
 
                 sapOutTaskRecord.CreateBy = HttpContext.GetName();
                 sapOutTaskRecord.CreateTime = DateTime.Now;
+                sapOutTaskRecord.UpdateBy = HttpContext.GetName();
+                sapOutTaskRecord.UpdateTime = DateTime.Now;
                 sapOutTaskRecord.Remark = "导入数据";
                 sapOutTaskRecords.Add(sapOutTaskRecord);
 

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/appsettings.json

@@ -7,8 +7,8 @@
     }
   },
   "ConnectionStrings": {
-    "conn_db": "Data Source=localhost;port=3306;User ID=sa;Password=sa123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
-    //"conn_db": "Data Source=39.106.7.239;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
+    //"conn_db": "Data Source=localhost;port=3306;User ID=sa;Password=sa123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
+    "conn_db": "Data Source=39.106.7.239;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
     //"conn_db": "Data Source=192.168.0.1;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
     "conn_db_type": "0" //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3
   },

ZrAdminNetCore-net7.0/ZR.Model/Dto/BaseSet/BasBinDto.cs

@@ -33,7 +33,7 @@ namespace ZR.Model.Dto.BaseSet
     public class BasBinDto
     {
         [Required(ErrorMessage = "库位Id 系统主键不能为空")]
-        [JsonConverter(typeof(ValueToStringConverter))]
+        //[JsonConverter(typeof(ValueToStringConverter))]
         public long BinId { get; set; }
 
         [Required(ErrorMessage = "库位编码不能为空")]
@@ -45,7 +45,7 @@ namespace ZR.Model.Dto.BaseSet
         public string BinType { get; set; }
 
         [Required(ErrorMessage = "库区编码不能为空")]
-        public string RegionId { get; set; }
+        public long RegionId { get; set; }
 
         [Required(ErrorMessage = "库位所在排不能为空")]
         public int BinRow { get; set; }

ZrAdminNetCore-net7.0/ZR.Model/Dto/BaseSet/BasRegionDto.cs

@@ -24,7 +24,7 @@ namespace ZR.Model.Dto.BaseSet
     public class BasRegionDto
     {
         [Required(ErrorMessage = "库区Id 系统主键不能为空")]
-        [JsonConverter(typeof(ValueToStringConverter))]
+        //[JsonConverter(typeof(ValueToStringConverter))]
         public long RegionId { get; set; }
 
         [Required(ErrorMessage = "库区编码不能为空")]