Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js

@@ -56,7 +56,7 @@ const schema = {
       input: "tabs",
       options: [
         { value: 1, label: "正常" },
-        { value: 2, label: "报废" },
+        { value: 2, label: "重开" },
         { value: 3, label: "提交" },
       ],
     },

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeSyncBaseAppService.cs

@@ -189,6 +189,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                 {
                     t.Version = int.Parse(t.BillTime?.ToString("yyyyMM"));
                 }
+                if (t.ErpToLoc != null)
+                {
+                    if (t.ErpToLoc.Length == 4)
+                    {
+                        t.BusinessType = EnumBusinessType.MaiDanJianBBAC;
+                    }
+                }
+               
                 t.CreateTime = dateTimeNow;
                 t.CreationTime = dateTimeNow;
             });

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeSyncBaseAppService.cs

@@ -190,6 +190,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                 {
                     t.Version = int.Parse(t.BillTime?.ToString("yyyyMM"));
                 }
+                if(t.ErpToLoc!=null)
+                {
+                    if (t.ErpToLoc.Length == 4)
+                    {
+                        t.BusinessType = EnumBusinessType.MaiDanJianHBPO;
+                    }
+                }
+               
                 t.CreateTime = dateTimeNow;
                 t.CreationTime = dateTimeNow;
             });

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs

@@ -627,15 +627,29 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             log.ChangedTime = log.Id.ToDateTime().Value.ToLocalTime();
             if (log.ChangedQty >= decimal.Zero)
             {
-                log.Qty = log.ChangedQty;
+                if(log.LogType != VmiLogType.Type100)
-                log.LogType = VmiLogType.Type500;
+                {
-                log.ChangedType = VmiType.In;
+                    log.Qty = log.ChangedQty;
+                    log.LogType = VmiLogType.Type500;
+                    log.ChangedType = VmiType.In;
+                }
+                else
+                {
+                    log.Qty = log.ChangedQty;                    
+                    log.ChangedType = VmiType.In;
+                }
+               
             }
             else
             {
-                log.Qty = -log.Qty;
+                if(log.LogType != VmiLogType.Type100)
-                log.LogType = VmiLogType.Type600;
+                {
-                log.ChangedType = VmiType.Out;
+                    log.Qty = -log.Qty;
+                    log.LogType = VmiLogType.Type600;
+                    log.ChangedType = VmiType.Out;
+                }
+
+               
             }
             log.ChangedBy = this._currentUser.UserName;
         }
@@ -763,6 +777,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 await file.OpenReadStream().CopyToAsync(ms).ConfigureAwait(false);
                 var data = ms.ToArray();
                 var tupleList = this.ImportInternal<VmiLog>(data);
+                
                 if (tupleList.Any(o => o.Item2.Count > 0))
                 {
                     using var workbook = new XLWorkbook(new MemoryStream(data));
@@ -784,7 +799,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 }
                 var logList = tupleList.Select(o => o.Item1).ToList();
                 logList.AsParallel().ForEach(Update);
-                var messageList = logList.Select(log => new VmiMessage { Message = JsonSerializer.Serialize(log) }).ToList();
+                //var messageList = logList.Select(log => new VmiMessage { Message = JsonSerializer.Serialize(log) }).ToList();
                 var connectionString = this._serviceProvider.GetRequiredService<IConfiguration>().GetConnectionString("SettleAccountService");
                 var options = new DbContextOptionsBuilder<SettleAccountDbContext>().UseSqlServer(connectionString).Options;
                 using var context = new SettleAccountDbContext(options);
@@ -804,7 +819,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
 
 
                     await context.BulkInsertAsync(logList).ConfigureAwait(false);
-                    await context.BulkInsertAsync(messageList).ConfigureAwait(false);
+                    //await context.BulkInsertAsync(messageList).ConfigureAwait(false);
                     transaction.Commit();
                 }
                 catch (Exception ex)