Browse Source

更新版本

FoShanPG
Administrator 3 years ago
parent
commit
d298310413
  1. 6
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs
  2. 2
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs
  3. 2
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs

6
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs

@ -259,8 +259,6 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
return await ExportErrorReportAsync(checkList); return await ExportErrorReportAsync(checkList);
} }
} }
var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss"); var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss");
var _list = _dapper.GetNoKanbanSettleDetail(input.Version); var _list = _dapper.GetNoKanbanSettleDetail(input.Version);
var stockList = _wmsDapper.GetSalesStock(); var stockList = _wmsDapper.GetSalesStock();
@ -276,9 +274,9 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
itm.Version, itm.Version,
string.Empty, string.Empty,
string.Empty, string.Empty,
itm.InvoiceQty-itm.ClaimQty, itm.InvoiceQty+itm.ClaimQty+itm.CP7ScrapQty,
tm1==null?0:tm1.Qty, tm1==null?0:tm1.Qty,
itm.InvoiceQty, itm.InvoiceQty + itm.ClaimQty + itm.CP7ScrapQty,
string.Empty, string.Empty,
_billNum, _billNum,
0, 0,

2
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs

@ -527,7 +527,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" temp2.Price AS SalePrice \n" + " temp2.Price AS SalePrice \n" +
", temp1.ClaimQty \n"+ ", temp1.ClaimQty \n"+
",temp1.CP7ScrapQty \n"+ ", temp1.CP7ScrapQty \n"+
" FROM\n" + " FROM\n" +
" (\n" + " (\n" +

2
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs

@ -213,7 +213,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
var sql2 = "SELECT A\n" + var sql2 = "SELECT A\n" +
" .WMSActualGoodsDate WmsBillNum,\n" + " .WMSDeliveryNote WmsBillNum,\n" +
" t1.MaterialCode MaterialCode,\n" + " t1.MaterialCode MaterialCode,\n" +
" A.Kanban,\n" + " A.Kanban,\n" +
" A.WMSActualGoodsDate WmsDate \n" + " A.WMSActualGoodsDate WmsDate \n" +

Loading…
Cancel
Save