Prechádzať zdrojové kódy

修复批量插入提示列名不匹配的问题(BulkCopy区分大小写,实体和数据库不匹配)

Murphy 2 rokov pred
rodič
commit
72ff3d36c9

+ 1 - 1
MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/BomChildExamineDto.cs

@@ -285,7 +285,7 @@ namespace Business.ResourceExamineManagement.Dto
         /// 损耗率
         /// </summary>
         [Comment("损耗率")]
-        public decimal? Scrap { get; set; }
+        public decimal? scrap { get; set; }
 
         /// <summary>
         /// 固定损耗量

+ 2 - 1
MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -1619,7 +1619,7 @@ namespace Business.Replenishment
                 //循环平铺整个资源检查的物料库存情况、缺料情况,子集缺料需要用父级缺料*子集使用数量-
                 var parent = returnlist.Find(s => s.fid == item.parent_id);
                 //当前物料总共需要数量
-                item.needCount = Math.Ceiling(parent.needCount * item.qty * (1 + (item.Scrap.GetValueOrDefault() / 100)) + item.wastage.GetValueOrDefault());
+                item.needCount = Math.Ceiling(parent.needCount * item.qty * (1 + (item.scrap.GetValueOrDefault() / 100)) + item.wastage.GetValueOrDefault());
                 item.needCountNoloss = parent.needCount * item.qty;
             }
         }
@@ -4046,6 +4046,7 @@ namespace Business.Replenishment
                     {
                         _businessBangDbContext.BulkInsert(purchaseoccupyList);
                     }
+                    _businessBangDbContext.SaveChanges();
                     await unitOfWork.CompleteAsync();
                 }
                 catch (Exception e)

+ 2 - 2
MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs

@@ -545,7 +545,7 @@ namespace Business.ResourceExamineManagement
                 //循环平铺整个资源检查的物料库存情况、缺料情况,子集缺料需要用父级缺料*子集使用数量-
                 var parent = returnlist.Find(s => s.fid == item.parent_id);
                 //当前物料总共需要数量
-                item.needCount = Math.Ceiling(parent.needCount * item.qty * (1 + (item.Scrap.GetValueOrDefault() / 100)) + item.wastage.GetValueOrDefault());
+                item.needCount = Math.Ceiling(parent.needCount * item.qty * (1 + (item.scrap.GetValueOrDefault() / 100)) + item.wastage.GetValueOrDefault());
                 item.needCountNoloss = parent.needCount * item.qty;
             }
         }
@@ -593,7 +593,7 @@ namespace Business.ResourceExamineManagement
             else
             {
                 //判断缺料数量
-                item.self_lack_qty = Math.Ceiling(parent.lack_qty * item.qty * (1 + (item.Scrap.GetValueOrDefault() / 100)) + item.wastage.GetValueOrDefault());
+                item.self_lack_qty = Math.Ceiling(parent.lack_qty * item.qty * (1 + (item.scrap.GetValueOrDefault() / 100)) + item.wastage.GetValueOrDefault());
                 item.lack_qty = item.self_lack_qty - item.sqty;
                 item.lack_qty = item.lack_qty < 0 ? 0 : item.lack_qty;
                 //判断状态

+ 2 - 2
MicroServices/Business/Business.Application/ResourceExamineManagement/PretreatmentAppService.cs

@@ -130,7 +130,7 @@ namespace Business.ResourceExamineManagement
                     cdto.Op = c.Op;
                     cdto.clean_leadtime = icitem.clean_leadtime;
                     cdto.PurLT = icitem.PurLT;
-                    cdto.Scrap = c.scrap.GetValueOrDefault();
+                    cdto.scrap = c.scrap.GetValueOrDefault();
                     cdto.wastage = c.wastage.GetValueOrDefault();
                     //递归寻找子级
                     GetBomList(bomlist, bomchildlist, icitemlist, cdto, returnlist, type, orderNum);
@@ -166,7 +166,7 @@ namespace Business.ResourceExamineManagement
                         childDto.item_number = icitem.number;
                         childDto.Op = c.Op;
                         childDto.clean_leadtime = icitem.clean_leadtime;
-                        childDto.Scrap = c.scrap.GetValueOrDefault();
+                        childDto.scrap = c.scrap.GetValueOrDefault();
                         childDto.wastage = c.wastage.GetValueOrDefault();
                         returnlist.Add(childDto);
                     }

+ 2 - 2
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -1010,8 +1010,8 @@ namespace Business.ResourceExamineManagement
                     }
                     if (bomExamineList.Any())
                     {
-                        await _mysql_bom_child_examine.InsertManyAsync(bomExamineList);
-                        //_businessBangDbContext.BulkInsert(bomExamineList.OrderBy(s => s.num_order).ToList());
+                        //await _mysql_bom_child_examine.InsertManyAsync(bomExamineList);
+                        _businessBangDbContext.BulkInsert(bomExamineList.OrderBy(s => s.num_order).ToList());
                     }
                     if (mooccupyList.Any())
                     {

+ 1 - 1
MicroServices/Business/Business.Domain/StructuredDB/Bang/b_bom_child_examine.cs

@@ -308,7 +308,7 @@ namespace Business.Domain
         /// </summary>
         [Comment("损耗率")]
         [Precision(23, 10)]
-        public decimal? Scrap { get; set; }
+        public decimal? scrap { get; set; }
 
         /// <summary>
         /// 固定损耗量

+ 11 - 14
MicroServices/Business/Business.Host/appsettings.json

@@ -3,26 +3,23 @@
     "CorsOrigins": "https://*.abc.com,http://localhost:9527,http://123.60.181.157:8020,http://123.60.181.157:8022,http://123.60.181.157:8024,http://123.60.180.165:8020,http://123.60.180.165:8022,http://123.60.180.165:8024,http://172.16.8.154:8020"
   },
   "ConnectionStrings": {
-    //"Default": "Server=123.60.180.165;Database=dopbiz;Uid=root; Pwd=5heng=uN;Allow User Variables=true",
-    //"DOPLog": "Server=123.60.180.165;Database=doplog;Uid=root; Pwd=5heng=uN;Allow User Variables=true",
-    //"DOPBang": "Server=123.60.180.165;Database=dopbang;Uid=root; Pwd=5heng=uN;Allow User Variables=true",
-    //"DOPExt": "Server=123.60.180.165;Database=dopext;Uid=root; Pwd=5heng=uN;Allow User Variables=true",
+    "Default": "Server=123.60.180.165;Database=dopbiz;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
+    "DOPLog": "Server=123.60.180.165;Database=dopbiz;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
+    "DOPBang": "Server=123.60.180.165;Database=dopbiz;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
+    "DOPExt": "Server=123.60.180.165;Database=DOPEXT;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
+    "MongoDB": "mongodb://zzydop:h1Q$us3r@123.60.180.165/dopbase",
 
-    //"Default": "Server=123.60.180.165;Database=dopbiz;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
-    //"DOPLog": "Server=123.60.180.165;Database=dopbiz;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
-    //"DOPBang": "Server=123.60.180.165;Database=dopbiz;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
-    //"DOPExt": "Server=123.60.180.165;Database=DOPEXT;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
-    //"MongoDB": "mongodb://zzydop:h1Q$us3r@123.60.180.165/dopbase",
     //"Default": "Server=123.60.181.157;Database=dopbiz;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
     //"DOPLog": "Server=123.60.181.157;Database=dopbiz;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
     //"DOPBang": "Server=123.60.181.157;Database=dopbiz;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
     //"DOPExt": "Server=123.60.181.157;Database=DOPEXT;uid=sa;pwd=5h3n9)uN;Trusted_Connection=false;TrustServerCertificate=True",
     //"MongoDB": "mongodb://zzydop:h1Q$us3r@123.60.181.157/dopbase",
-    "Default": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    "DOPLog": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    "DOPBang": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    "DOPExt": "Server=172.16.8.154;Database=DOPEXT;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
-    "MongoDB": "mongodb://zzydop:zzyd0pB()@172.16.8.154/dopbase",
+
+    //"Default": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    //"DOPLog": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    //"DOPBang": "Server=172.16.8.154;Database=dopbiz;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    //"DOPExt": "Server=172.16.8.154;Database=DOPEXT;uid=sa;pwd=ac%qams)aCXI;Trusted_Connection=false;TrustServerCertificate=True",
+    //"MongoDB": "mongodb://zzydop:zzyd0pB()@172.16.8.154/dopbase",
     "Factory_id": "8010",
     "Company_id": "1000"
   },