PG
/
Win.Sfs.SmartSettlementSystem.PG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更新版本

FoShanPG
Administrator 3 years ago
parent
04f5bdb4eb
commit
e3cadd08e1
2 changed files with 83 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettleAccounts/SettleAccountRepository.cs
  2. 134
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/SettleAccount/SettleAccountImportService.cs

32
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/SettleAccounts/SettleAccountRepository.cs
View File

@ -106,24 +106,24 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccount
try try
{ {
DbContext.Database.SetCommandTimeout(1200); DbContext.Database.SetCommandTimeout(1200);
List<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount> _insertls = new List<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount>(); //List<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount> _insertls = new List<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount>();
if (list.Count > 0) //if (list.Count > 0)
{ //{
var _version = list.FirstOrDefault().Version; // var _version = list.FirstOrDefault().Version;
var _ls= GetQueryable().Where(p => p.Version == _version).Select(p=>new { MaterialCode=p.MaterialCode, ChassisNumber=p.ChassisNumber }).ToList(); // var _ls= GetQueryable().Where(p => p.Version == _version).Select(p=>new { MaterialCode=p.MaterialCode, ChassisNumber=p.ChassisNumber }).ToList();
var _query = from r1 in list join r2 in _ls on new { r1.ChassisNumber, r1.MaterialCode } equals new { r2.ChassisNumber, r2.MaterialCode } // var _query = from r1 in list join r2 in _ls on new { r1.ChassisNumber, r1.MaterialCode } equals new { r2.ChassisNumber, r2.MaterialCode }
into temp from t in temp.DefaultIfEmpty() // into temp from t in temp.DefaultIfEmpty()
where t==null // where t==null
select r1 ; // select r1 ;
foreach (var s in _query.ToList()) // foreach (var s in _query.ToList())
{ // {
_insertls.Add(s); // _insertls.Add(s);
} // }
} //}
BulkConfig cfg = new BulkConfig() { BulkCopyTimeout=0, BatchSize=2000}; BulkConfig cfg = new BulkConfig() { BulkCopyTimeout=0, BatchSize=100000, };
DbContext.BulkInsert(_insertls,cfg); DbContext.BulkInsert(list,cfg);
} }
catch (Exception e) catch (Exception e)
{ {

134
src/Modules/SettleAccount/src/SettleAccount.Job/Services/SettleAccount/SettleAccountImportService.cs
View File

@ -59,73 +59,73 @@ namespace TaskJob.Services
{ {
var filePath = fileSavePath + itm;//获取到导入的excel var filePath = fileSavePath + itm;//获取到导入的excel
var exten = Path.GetExtension(fileSavePath); var exten = Path.GetExtension(fileSavePath);
List<string> _errorList = new List<string>(); //List<string> _errorList = new List<string>();
var checkList = new List<ErrorExportDto>(); //var checkList = new List<ErrorExportDto>();
//var _chList = await _relrepository.GetAllAsync(GuidGenerator.Create(), true); ////var _chList = await _relrepository.GetAllAsync(GuidGenerator.Create(), true);
//var _chls = _chList.Select(p => p.SettleMaterialCode).Distinct(); ////var _chls = _chList.Select(p => p.SettleMaterialCode).Distinct();
List<string> _precodeList = new List<string>();// //List<string> _precodeList = new List<string>();//
if (exten.ToUpper() == ".TXT") //if (exten.ToUpper() == ".TXT")
{ //{
using (TextReader textReader = new StreamReader(filePath)) // using (TextReader textReader = new StreamReader(filePath))
{ // {
int i = 0; // int i = 0;
while (true) // while (true)
{ // {
string str = textReader.ReadLine(); // string str = textReader.ReadLine();
if (string.IsNullOrEmpty(str)) // if (string.IsNullOrEmpty(str))
{ // {
break; // break;
} // }
else // else
{ // {
try // try
{ // {
var _lst = str.Split(new char[] { '|' }).ToList(); // var _lst = str.Split(new char[] { '|' }).ToList();
string _settleyear = _lst[1].Trim(); // string _settleyear = _lst[1].Trim();
string _kENNCode = _lst[2].Trim(); // string _kENNCode = _lst[2].Trim();
string _chassisNumber = _lst[3].Trim(); // string _chassisNumber = _lst[3].Trim();
string _model = _lst[4].Trim(); // string _model = _lst[4].Trim();
DateTime _cP5A = DateTime.Parse(_lst[5].Trim()); // DateTime _cP5A = DateTime.Parse(_lst[5].Trim());
DateTime _cP7 = DateTime.Parse(_lst[6].Trim()); // DateTime _cP7 = DateTime.Parse(_lst[6].Trim());
string _materialCode = _lst[7].Trim(); // string _materialCode = _lst[7].Trim();
decimal _qty = decimal.Parse(_lst[8].Trim()); // decimal _qty = decimal.Parse(_lst[8].Trim());
string _settlementID = _lst[9].Trim(); // string _settlementID = _lst[9].Trim();
string _settlementSupplier = _lst[10].Trim(); // string _settlementSupplier = _lst[10].Trim();
_setls.Add(new Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount( // _setls.Add(new Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount(
Guid.NewGuid(), // Guid.NewGuid(),
Guid.NewGuid(), // Guid.NewGuid(),
_settleyear, // _settleyear,
_kENNCode, // _kENNCode,
_chassisNumber, // _chassisNumber,
_model, // _model,
_cP5A, // _cP5A,
_cP7, // _cP7,
_materialCode, // _materialCode,
_qty, // _qty,
_settlementID, // _settlementID,
_settlementSupplier, // _settlementSupplier,
DateTime.Now.Year.ToString(), // DateTime.Now.Year.ToString(),
DateTime.Now.Month.ToString(), // DateTime.Now.Month.ToString(),
_id, // _id,
version, // version,
DateTime.Now, // DateTime.Now,
Guid.NewGuid() // Guid.NewGuid()
)); // ));
} // }
catch // catch
{ // {
} // }
} // }
i++; // i++;
} // }
textReader.Close(); // textReader.Close();
} // }
} //}
else //else
{ //{
// _setls= _inputService.Input<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount>(filePath); // _setls= _inputService.Input<Win.Sfs.SettleAccount.Entities.SettleAccounts.SettleAccount>(filePath);
var errorlist = new List<ErrorExportDto>(); var errorlist = new List<ErrorExportDto>();
var dtoList = _inputService.Input<SettleAccountImportDto>(filePath, null, errorlist); var dtoList = _inputService.Input<SettleAccountImportDto>(filePath, null, errorlist);
foreach (var dto in dtoList) foreach (var dto in dtoList)
{ {
@ -139,7 +139,7 @@ namespace TaskJob.Services
DateTime.Now.Month.ToString(), dto.SettleYear, _id, version, DateTime.Now, Guid.NewGuid()); DateTime.Now.Month.ToString(), dto.SettleYear, _id, version, DateTime.Now, Guid.NewGuid());
_setls.Add(_settleaccount); _setls.Add(_settleaccount);
} }
} //}
#region #region
//var errorFileName = "错误文件.xlsx"; //var errorFileName = "错误文件.xlsx";
//checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("ERP物料号{0}底盘号 {1}有重复", "11111111111", "22222222222"), string.Empty)); //checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("ERP物料号{0}底盘号 {1}有重复", "11111111111", "22222222222"), string.Empty));

Write Preview
Loading…
Cancel
Save