Browse Source

更新版本

FoShanPG
Administrator 2 years ago
parent
commit
5678fe446a
  1. 6
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
  2. 3
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettledPartAndErpPartPriceDiffRepository.cs

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

@ -153,7 +153,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList(); var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
var outPutDetail = await _wmsRepository.Where(p => p.Version == version && p.State!=4).ToListAsync(); var outPutDetail = await _wmsRepository.Where(p => p.Version == version && p.State!=4).Select(p=>new {MaterialCode=p.MaterialCode,KennCode=p.KennCode,ChassisNumber=p.ChassisNumber,BillNum=p.BillNum ,Qty=p.Qty})
.ToListAsync();
var error = from itm1 in outPutDetail var error = from itm1 in outPutDetail
@ -437,7 +438,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
_lst.AddRange(_lsCopy.ToArray()); _lst.AddRange(_lsCopy.ToArray());
} }
var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList(); var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State != 4 ).ToListAsync(); var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State != 4 ).Select(p => new { MaterialCode = p.MaterialCode, KennCode = p.KennCode, ChassisNumber = p.ChassisNumber, BillNum = p.BillNum, Qty = p.Qty })
.ToListAsync();
var error = from itm1 in outPutDetail var error = from itm1 in outPutDetail
join itm2 in _ls1 on join itm2 in _ls1 on

3
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettledPartAndErpPartPriceDiffRepository.cs

@ -97,7 +97,7 @@ namespace Win.Sfs.SettleAccount.Repository.Report
{ {
string sqlString = string sqlString =
"select\n" + "select\n" +
"a.ErpMaterialCode,\n" + "a.ErpMaterialCode,\n" +
"isnull(d.materialCode,\n" + "isnull(d.materialCode,\n" +
"SettleMaterialCode) MaterialCode,\n" + "SettleMaterialCode) MaterialCode,\n" +
@ -138,7 +138,6 @@ namespace Win.Sfs.SettleAccount.Repository.Report
"where\n" + "where\n" +
"b.MaterialCode is null\n"; "b.MaterialCode is null\n";
string _sql = string.Format(sqlString, version, customcode); string _sql = string.Format(sqlString, version, customcode);
var _query = DbConnection.Query<PartCodeDiff>(_sql, null, null, true, 1200, null); var _query = DbConnection.Query<PartCodeDiff>(_sql, null, null, true, 1200, null);
//var _query = _db.Query<SettledPartAndErpPartPriceDiff>(); //var _query = _db.Query<SettledPartAndErpPartPriceDiff>();
return _query.ToList(); return _query.ToList();

Loading…
Cancel
Save