Merge branch 'master' of https://e.coding.net/ccwin-in/PG/Win.sfs.SmartSettlementSystem.PG

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs

@@ -232,12 +232,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                  input.SkipCount, true);
 
             var totalCount = await GetCountAsync(input);
-
-
-
             var _ls = _repository.GetDic("WmsJitOutPut");
-
-
             foreach (var itm in entities)
             {
                 var _first = _ls.FirstOrDefault(p => p.BillNum == itm.BillNum);

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQKBOutputAppService.cs

@@ -346,7 +346,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                 0,
                 0,
                 itm.Price,
-                itm.Amt
+                Math.Round((itm.Price * itm.Qty),2)
                 );
 
             await _wmsRepository.GetDbContext().BulkInsertAsync(query.ToList(), new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });

src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs

@@ -337,7 +337,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         public string Creator { set; get; }
 
 
-        public string Extend { set; get; }
+