BoXu.Zheng
/
BeiJinSettleAccount
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更新版本
continuous-integration/drone/push Build is passing
Details

master
zhaoxinyu 10 months ago
parent
93dea7da05
commit
cb2d28f02b
4 changed files with 106 additions and 60 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. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
  2. 119
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs
  3. 1
      code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
  4. 44
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiLog.cs

2
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
View File

@ -365,9 +365,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
{ {
return new JsonResult(new { Code = 200, Message = "导入成功" }); return new JsonResult(new { Code = 200, Message = "导入成功" });
} }
importPubSaDetails = HandleSaDetails(importPubSaDetails); importPubSaDetails = HandleSaDetails(importPubSaDetails);
#region 数据校验 #region 数据校验
var checkList = await CheckAsync(importPubSaDetails).ConfigureAwait(false); var checkList = await CheckAsync(importPubSaDetails).ConfigureAwait(false);
if (checkList.Count > 0) if (checkList.Count > 0)

119
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs
View File

@ -772,8 +772,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
{ {
ExportImporter _exportImporter = new ExportImporter(); ExportImporter _exportImporter = new ExportImporter();
var dtos = await _exportImporter.UploadExcelImport<VimLogImportDTO>(files, _excelImportService).ConfigureAwait(false); var dtos = await _exportImporter.UploadExcelImport<VimLogImportDTO1>(files, _excelImportService).ConfigureAwait(false);
var logList = _maper.Map<List<VimLogImportDTO>, List<VmiLog>>(dtos); var logList = _maper.Map<List<VimLogImportDTO1>, List<VmiLog>>(dtos);
using var ms = new MemoryStream(); using var ms = new MemoryStream();
//var file = files.FirstOrDefault(); //var file = files.FirstOrDefault();
//await file.OpenReadStream().CopyToAsync(ms).ConfigureAwait(false); //await file.OpenReadStream().CopyToAsync(ms).ConfigureAwait(false);
@ -813,12 +813,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
seDetail.BeginDate = DateTime.Now; seDetail.BeginDate = DateTime.Now;
seDetail.CreationTime = DateTime.Now; seDetail.CreationTime = DateTime.Now;
seDetail.IsDeleted = false; seDetail.IsDeleted = false;
seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); seDetail.Version = int.Parse(DateTime.Now.ToString("yyyyMM"));
seDetail.ShippingDate = (DateTime)item.BillTime; seDetail.ShippingDate = DateTime.Now;
seDetail.Qty = item.Qty; seDetail.Qty = item.Qty;
seDetail.IsHaveEdiData = false; seDetail.IsHaveEdiData = false;
seDetail.BusinessType = EnumBusinessType.JisBBAC; seDetail.BusinessType = EnumBusinessType.JisBBAC;
seDetail.AssembleData = (DateTime)item.AssembleData; seDetail.AssembleData = DateTime.Now;
seDetail.BillType = 0; seDetail.BillType = 0;
seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType; seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType; seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
@ -835,7 +835,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
seDetail.PN = item.VinCode; seDetail.PN = item.VinCode;
seDetail.LU = item.CustPartCode; seDetail.LU = item.CustPartCode;
seDetail.CustPartCode = item.CustPartCode; seDetail.CustPartCode = item.CustPartCode;
seDetail.BillTime = item.BillTime; seDetail.BillTime = DateTime.Now;
seDetail.Remark = "期初初始化"; seDetail.Remark = "期初初始化";
seDetails.Add(seDetail); seDetails.Add(seDetail);
} }
@ -846,12 +846,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
seDetail.BeginDate = DateTime.Now; seDetail.BeginDate = DateTime.Now;
seDetail.CreationTime = DateTime.Now; seDetail.CreationTime = DateTime.Now;
seDetail.IsDeleted = false; seDetail.IsDeleted = false;
seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); seDetail.Version = int.Parse(DateTime.Now.ToString("yyyyMM"));
seDetail.ShippingDate = (DateTime)item.BillTime; seDetail.ShippingDate = DateTime.Now;
seDetail.Qty = item.Qty; seDetail.Qty = item.Qty;
seDetail.IsHaveEdiData = false; seDetail.IsHaveEdiData = false;
seDetail.BusinessType = EnumBusinessType.MaiDanJianBBAC; seDetail.BusinessType = EnumBusinessType.MaiDanJianBBAC;
seDetail.AssembleData = (DateTime)item.AssembleData; seDetail.AssembleData = DateTime.Now;
seDetail.BillType = 0; seDetail.BillType = 0;
seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType; seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType; seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
@ -868,7 +868,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
seDetail.PN = item.VinCode; seDetail.PN = item.VinCode;
seDetail.LU = item.CustPartCode; seDetail.LU = item.CustPartCode;
seDetail.CustPartCode = item.CustPartCode; seDetail.CustPartCode = item.CustPartCode;
seDetail.BillTime = item.BillTime; seDetail.BillTime = DateTime.Now;
seDetail.Remark = "期初初始化"; seDetail.Remark = "期初初始化";
seDetails.Add(seDetail); seDetails.Add(seDetail);
} }
@ -892,12 +892,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
seDetail.BeginDate = DateTime.Now; seDetail.BeginDate = DateTime.Now;
seDetail.CreationTime = DateTime.Now; seDetail.CreationTime = DateTime.Now;
seDetail.IsDeleted = false; seDetail.IsDeleted = false;
seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); seDetail.Version = int.Parse(DateTime.Now.ToString("yyyyMM"));
seDetail.ShippingDate = (DateTime)item.BillTime; seDetail.ShippingDate = DateTime.Now;
seDetail.Qty = item.Qty; seDetail.Qty = item.Qty;
seDetail.IsHaveEdiData = false; seDetail.IsHaveEdiData = false;
seDetail.BusinessType = EnumBusinessType.JisHBPO; seDetail.BusinessType = EnumBusinessType.JisHBPO;
seDetail.AssembleData = (DateTime)item.AssembleData; seDetail.AssembleData = DateTime.Now;
seDetail.BillType = 0; seDetail.BillType = 0;
seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType; seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType; seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
@ -914,7 +914,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
seDetail.PN = item.VinCode; seDetail.PN = item.VinCode;
seDetail.LU = item.CustPartCode; seDetail.LU = item.CustPartCode;
seDetail.CustPartCode = item.CustPartCode; seDetail.CustPartCode = item.CustPartCode;
seDetail.BillTime = item.BillTime; seDetail.BillTime = DateTime.Now;
seDetail.Remark = "期初初始化"; seDetail.Remark = "期初初始化";
seDetails.Add(seDetail); seDetails.Add(seDetail);
} }
@ -939,12 +939,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
seDetail.BeginDate = DateTime.Now; seDetail.BeginDate = DateTime.Now;
seDetail.CreationTime = DateTime.Now; seDetail.CreationTime = DateTime.Now;
seDetail.IsDeleted = false; seDetail.IsDeleted = false;
seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); seDetail.Version = int.Parse(DateTime.Now.ToString("yyyyMM"));
seDetail.ShippingDate = (DateTime)item.BillTime; seDetail.ShippingDate = (DateTime)DateTime.Now;
seDetail.Qty = item.Qty; seDetail.Qty = item.Qty;
seDetail.IsHaveEdiData = false; seDetail.IsHaveEdiData = false;
seDetail.BusinessType = EnumBusinessType.MaiDanJianHBPO; seDetail.BusinessType = EnumBusinessType.MaiDanJianHBPO;
seDetail.AssembleData = (DateTime)item.AssembleData; seDetail.AssembleData =DateTime.Now;
seDetail.BillType = 0; seDetail.BillType = 0;
seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType; seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType; seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
@ -961,7 +961,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
seDetail.PN = item.VinCode; seDetail.PN = item.VinCode;
seDetail.LU = item.CustPartCode; seDetail.LU = item.CustPartCode;
seDetail.CustPartCode = item.CustPartCode; seDetail.CustPartCode = item.CustPartCode;
seDetail.BillTime = item.BillTime; seDetail.BillTime = DateTime.Now;
seDetail.Remark = "期初初始化"; seDetail.Remark = "期初初始化";
seDetails.Add(seDetail); seDetails.Add(seDetail);
} }
@ -985,11 +985,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
seDetail.BeginDate = DateTime.Now; seDetail.BeginDate = DateTime.Now;
seDetail.CreationTime = DateTime.Now; seDetail.CreationTime = DateTime.Now;
seDetail.IsDeleted = false; seDetail.IsDeleted = false;
seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); seDetail.Version = int.Parse(DateTime.Now.ToString("yyyyMM"));
seDetail.ShippingDate = (DateTime)item.BillTime; seDetail.ShippingDate = (DateTime)DateTime.Now;
seDetail.Qty = item.Qty; seDetail.Qty = item.Qty;
seDetail.BusinessType = EnumBusinessType.ZhiGongJianBBAC; seDetail.BusinessType = EnumBusinessType.ZhiGongJianBBAC;
seDetail.AssembleData = (DateTime)item.AssembleData; seDetail.AssembleData =DateTime.Now;
seDetail.BillType = 0; seDetail.BillType = 0;
seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType; seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType; seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
@ -1005,7 +1005,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
seDetail.PN = item.VinCode; seDetail.PN = item.VinCode;
seDetail.LU = item.CustPartCode; seDetail.LU = item.CustPartCode;
seDetail.CustPartCode = item.CustPartCode; seDetail.CustPartCode = item.CustPartCode;
seDetail.BillTime = item.BillTime; seDetail.BillTime = DateTime.Now;
seDetail.Remark = "期初初始化"; seDetail.Remark = "期初初始化";
seDetails.Add(seDetail); seDetails.Add(seDetail);
} }
@ -1029,11 +1029,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
seDetail.BeginDate = DateTime.Now; seDetail.BeginDate = DateTime.Now;
seDetail.CreationTime = DateTime.Now; seDetail.CreationTime = DateTime.Now;
seDetail.IsDeleted = false; seDetail.IsDeleted = false;
seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); seDetail.Version = int.Parse(DateTime.Now.ToString("yyyyMM"));
seDetail.ShippingDate = (DateTime)item.BillTime; seDetail.ShippingDate = (DateTime)DateTime.Now;
seDetail.Qty = item.Qty; seDetail.Qty = item.Qty;
seDetail.BusinessType = EnumBusinessType.ZhiGongJianHBPO; seDetail.BusinessType = EnumBusinessType.ZhiGongJianHBPO;
seDetail.AssembleData = (DateTime)item.AssembleData; seDetail.AssembleData =DateTime.Now;
seDetail.BillType = 0; seDetail.BillType = 0;
seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType; seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType; seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
@ -1049,7 +1049,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
seDetail.PN = item.VinCode; seDetail.PN = item.VinCode;
seDetail.LU = item.CustPartCode; seDetail.LU = item.CustPartCode;
seDetail.CustPartCode = item.CustPartCode; seDetail.CustPartCode = item.CustPartCode;
seDetail.BillTime = item.BillTime; seDetail.BillTime = DateTime.Now;
seDetail.Remark = "期初初始化"; seDetail.Remark = "期初初始化";
seDetails.Add(seDetail); seDetails.Add(seDetail);
} }
@ -1073,11 +1073,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
seDetail.BeginDate = DateTime.Now; seDetail.BeginDate = DateTime.Now;
seDetail.CreationTime = DateTime.Now; seDetail.CreationTime = DateTime.Now;
seDetail.IsDeleted = false; seDetail.IsDeleted = false;
seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); seDetail.Version = int.Parse(DateTime.Now.ToString("yyyyMM"));
seDetail.ShippingDate = (DateTime)item.BillTime; seDetail.ShippingDate = (DateTime)DateTime.Now;
seDetail.Qty = item.Qty; seDetail.Qty = item.Qty;
seDetail.BusinessType = EnumBusinessType.BeiJian; seDetail.BusinessType = EnumBusinessType.BeiJian;
seDetail.AssembleData = (DateTime)item.AssembleData; seDetail.AssembleData =DateTime.Now;
seDetail.BillType = 0; seDetail.BillType = 0;
seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType; seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType; seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
@ -1093,7 +1093,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
seDetail.PN = item.VinCode; seDetail.PN = item.VinCode;
seDetail.LU = item.CustPartCode; seDetail.LU = item.CustPartCode;
seDetail.CustPartCode = item.CustPartCode; seDetail.CustPartCode = item.CustPartCode;
seDetail.BillTime = item.BillTime; seDetail.BillTime = DateTime.Now;
seDetail.Remark = "期初初始化"; seDetail.Remark = "期初初始化";
seDetails.Add(seDetail); seDetails.Add(seDetail);
} }
@ -1117,11 +1117,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
seDetail.BeginDate = DateTime.Now; seDetail.BeginDate = DateTime.Now;
seDetail.CreationTime = DateTime.Now; seDetail.CreationTime = DateTime.Now;
seDetail.IsDeleted = false; seDetail.IsDeleted = false;
seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); seDetail.Version = int.Parse(DateTime.Now.ToString("yyyyMM"));
seDetail.ShippingDate = (DateTime)item.BillTime; seDetail.ShippingDate = (DateTime)DateTime.Now;
seDetail.Qty = item.Qty; seDetail.Qty = item.Qty;
seDetail.BusinessType = EnumBusinessType.YinDuJian; seDetail.BusinessType = EnumBusinessType.YinDuJian;
seDetail.AssembleData = (DateTime)item.AssembleData; seDetail.AssembleData =DateTime.Now;
seDetail.BillType = 0; seDetail.BillType = 0;
seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType; seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType;
seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType; seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType;
@ -1137,7 +1137,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
seDetail.PN = item.VinCode; seDetail.PN = item.VinCode;
seDetail.LU = item.CustPartCode; seDetail.LU = item.CustPartCode;
seDetail.CustPartCode = item.CustPartCode; seDetail.CustPartCode = item.CustPartCode;
seDetail.BillTime = item.BillTime; seDetail.BillTime = DateTime.Now;
seDetail.Remark = "期初初始化"; seDetail.Remark = "期初初始化";
seDetails.Add(seDetail); seDetails.Add(seDetail);
} }
@ -1180,6 +1180,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
var value = _codeRepository.FirstOrDefault(p => p.Project == "库存账期").Value; var value = _codeRepository.FirstOrDefault(p => p.Project == "库存账期").Value;
foreach (var itm in logList) foreach (var itm in logList)
{ {
itm.BillTime = DateTime.Now;
itm.ChangedTime = DateTime.Now;
itm.LogType = itm.Qty > 0 ? VmiLogType.Type100 : VmiLogType.Type300;
itm.Version = GetVersionByBillTime(itm.BillTime.Value, value); itm.Version = GetVersionByBillTime(itm.BillTime.Value, value);
} }
foreach (var itm in p_list) foreach (var itm in p_list)
@ -1350,8 +1353,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
// seDetail.BeginDate = DateTime.Now; // seDetail.BeginDate = DateTime.Now;
// seDetail.CreationTime = DateTime.Now; // seDetail.CreationTime = DateTime.Now;
// seDetail.IsDeleted = false; // seDetail.IsDeleted = false;
// seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); // seDetail.Version = int.Parse(DateTime.Now.ToString("yyyyMM"));
// seDetail.ShippingDate = (DateTime)item.BillTime; // seDetail.ShippingDate = (DateTime)DateTime.Now;
// seDetail.Qty = item.Qty; // seDetail.Qty = item.Qty;
// seDetail.IsHaveEdiData = false; // seDetail.IsHaveEdiData = false;
// seDetail.BusinessType = EnumBusinessType.JisBBAC; // seDetail.BusinessType = EnumBusinessType.JisBBAC;
@ -1372,7 +1375,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
// seDetail.PN = item.VinCode; // seDetail.PN = item.VinCode;
// seDetail.LU = item.CustPartCode; // seDetail.LU = item.CustPartCode;
// seDetail.CustPartCode = item.CustPartCode; // seDetail.CustPartCode = item.CustPartCode;
// seDetail.BillTime= item.BillTime; // seDetail.BillTime= DateTime.Now;
// seDetail.Remark = "期初初始化"; // seDetail.Remark = "期初初始化";
// seDetails.Add(seDetail); // seDetails.Add(seDetail);
// } // }
@ -1383,8 +1386,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
// seDetail.BeginDate = DateTime.Now; // seDetail.BeginDate = DateTime.Now;
// seDetail.CreationTime = DateTime.Now; // seDetail.CreationTime = DateTime.Now;
// seDetail.IsDeleted = false; // seDetail.IsDeleted = false;
// seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); // seDetail.Version = int.Parse(DateTime.Now.ToString("yyyyMM"));
// seDetail.ShippingDate = (DateTime)item.BillTime; // seDetail.ShippingDate = (DateTime)DateTime.Now;
// seDetail.Qty = item.Qty; // seDetail.Qty = item.Qty;
// seDetail.IsHaveEdiData = false; // seDetail.IsHaveEdiData = false;
// seDetail.BusinessType = EnumBusinessType.MaiDanJianBBAC; // seDetail.BusinessType = EnumBusinessType.MaiDanJianBBAC;
@ -1405,7 +1408,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
// seDetail.PN = item.VinCode; // seDetail.PN = item.VinCode;
// seDetail.LU = item.CustPartCode; // seDetail.LU = item.CustPartCode;
// seDetail.CustPartCode = item.CustPartCode; // seDetail.CustPartCode = item.CustPartCode;
// seDetail.BillTime = item.BillTime; // seDetail.BillTime = DateTime.Now;
// seDetail.Remark = "期初初始化"; // seDetail.Remark = "期初初始化";
// seDetails.Add(seDetail); // seDetails.Add(seDetail);
// } // }
@ -1416,8 +1419,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
// seDetail.BeginDate = DateTime.Now; // seDetail.BeginDate = DateTime.Now;
// seDetail.CreationTime = DateTime.Now; // seDetail.CreationTime = DateTime.Now;
// seDetail.IsDeleted = false; // seDetail.IsDeleted = false;
// seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); // seDetail.Version = int.Parse(DateTime.Now.ToString("yyyyMM"));
// seDetail.ShippingDate = (DateTime)item.BillTime; // seDetail.ShippingDate = (DateTime)DateTime.Now;
// seDetail.Qty = item.Qty; // seDetail.Qty = item.Qty;
// seDetail.IsHaveEdiData = false; // seDetail.IsHaveEdiData = false;
// seDetail.BusinessType = EnumBusinessType.JisHBPO; // seDetail.BusinessType = EnumBusinessType.JisHBPO;
@ -1438,7 +1441,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
// seDetail.PN = item.VinCode; // seDetail.PN = item.VinCode;
// seDetail.LU = item.CustPartCode; // seDetail.LU = item.CustPartCode;
// seDetail.CustPartCode = item.CustPartCode; // seDetail.CustPartCode = item.CustPartCode;
// seDetail.BillTime = item.BillTime; // seDetail.BillTime = DateTime.Now;
// seDetail.Remark = "期初初始化"; // seDetail.Remark = "期初初始化";
// hbpo_seDetails.Add(seDetail); // hbpo_seDetails.Add(seDetail);
// } // }
@ -1449,8 +1452,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
// seDetail.BeginDate = DateTime.Now; // seDetail.BeginDate = DateTime.Now;
// seDetail.CreationTime = DateTime.Now; // seDetail.CreationTime = DateTime.Now;
// seDetail.IsDeleted = false; // seDetail.IsDeleted = false;
// seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); // seDetail.Version = int.Parse(DateTime.Now.ToString("yyyyMM"));
// seDetail.ShippingDate = (DateTime)item.BillTime; // seDetail.ShippingDate = (DateTime)DateTime.Now;
// seDetail.Qty = item.Qty; // seDetail.Qty = item.Qty;
// seDetail.IsHaveEdiData = false; // seDetail.IsHaveEdiData = false;
// seDetail.BusinessType = EnumBusinessType.MaiDanJianHBPO; // seDetail.BusinessType = EnumBusinessType.MaiDanJianHBPO;
@ -1471,7 +1474,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
// seDetail.PN = item.VinCode; // seDetail.PN = item.VinCode;
// seDetail.LU = item.CustPartCode; // seDetail.LU = item.CustPartCode;
// seDetail.CustPartCode = item.CustPartCode; // seDetail.CustPartCode = item.CustPartCode;
// seDetail.BillTime = item.BillTime; // seDetail.BillTime = DateTime.Now;
// seDetail.Remark = "期初初始化"; // seDetail.Remark = "期初初始化";
// hbpo_seDetails.Add(seDetail); // hbpo_seDetails.Add(seDetail);
// } // }
@ -1482,8 +1485,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
// seDetail.BeginDate = DateTime.Now; // seDetail.BeginDate = DateTime.Now;
// seDetail.CreationTime = DateTime.Now; // seDetail.CreationTime = DateTime.Now;
// seDetail.IsDeleted = false; // seDetail.IsDeleted = false;
// seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); // seDetail.Version = int.Parse(DateTime.Now?.ToString("yyyyMM"));
// seDetail.ShippingDate = (DateTime)item.BillTime; // seDetail.ShippingDate = (DateTime)DateTime.Now;
// seDetail.Qty = item.Qty; // seDetail.Qty = item.Qty;
// //seDetail.IsHaveEdiData = false; // //seDetail.IsHaveEdiData = false;
// seDetail.BusinessType = EnumBusinessType.ZhiGongJianBBAC; // seDetail.BusinessType = EnumBusinessType.ZhiGongJianBBAC;
@ -1504,7 +1507,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
// seDetail.PN = item.VinCode; // seDetail.PN = item.VinCode;
// seDetail.LU = item.CustPartCode; // seDetail.LU = item.CustPartCode;
// seDetail.CustPartCode = item.CustPartCode; // seDetail.CustPartCode = item.CustPartCode;
// seDetail.BillTime = item.BillTime; // seDetail.BillTime = DateTime.Now;
// seDetail.Remark = "期初初始化"; // seDetail.Remark = "期初初始化";
// pub_seDetails.Add(seDetail); // pub_seDetails.Add(seDetail);
// } // }
@ -1515,8 +1518,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
// seDetail.BeginDate = DateTime.Now; // seDetail.BeginDate = DateTime.Now;
// seDetail.CreationTime = DateTime.Now; // seDetail.CreationTime = DateTime.Now;
// seDetail.IsDeleted = false; // seDetail.IsDeleted = false;
// seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); // seDetail.Version = int.Parse(DateTime.Now?.ToString("yyyyMM"));
// seDetail.ShippingDate = (DateTime)item.BillTime; // seDetail.ShippingDate = (DateTime)DateTime.Now;
// seDetail.Qty = item.Qty; // seDetail.Qty = item.Qty;
// //seDetail.IsHaveEdiData = false; // //seDetail.IsHaveEdiData = false;
// seDetail.BusinessType = EnumBusinessType.ZhiGongJianHBPO; // seDetail.BusinessType = EnumBusinessType.ZhiGongJianHBPO;
@ -1537,7 +1540,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
// seDetail.PN = item.VinCode; // seDetail.PN = item.VinCode;
// seDetail.LU = item.CustPartCode; // seDetail.LU = item.CustPartCode;
// seDetail.CustPartCode = item.CustPartCode; // seDetail.CustPartCode = item.CustPartCode;
// seDetail.BillTime = item.BillTime; // seDetail.BillTime = DateTime.Now;
// seDetail.Remark = "期初初始化"; // seDetail.Remark = "期初初始化";
// pub_seDetails.Add(seDetail); // pub_seDetails.Add(seDetail);
// } // }
@ -1548,8 +1551,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
// seDetail.BeginDate = DateTime.Now; // seDetail.BeginDate = DateTime.Now;
// seDetail.CreationTime = DateTime.Now; // seDetail.CreationTime = DateTime.Now;
// seDetail.IsDeleted = false; // seDetail.IsDeleted = false;
// seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); // seDetail.Version = int.Parse(DateTime.Now?.ToString("yyyyMM"));
// seDetail.ShippingDate = (DateTime)item.BillTime; // seDetail.ShippingDate = (DateTime)DateTime.Now;
// seDetail.Qty = item.Qty; // seDetail.Qty = item.Qty;
// //seDetail.IsHaveEdiData = false; // //seDetail.IsHaveEdiData = false;
// seDetail.BusinessType = EnumBusinessType.BeiJian; // seDetail.BusinessType = EnumBusinessType.BeiJian;
@ -1570,7 +1573,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
// seDetail.PN = item.VinCode; // seDetail.PN = item.VinCode;
// seDetail.LU = item.CustPartCode; // seDetail.LU = item.CustPartCode;
// seDetail.CustPartCode = item.CustPartCode; // seDetail.CustPartCode = item.CustPartCode;
// seDetail.BillTime = item.BillTime; // seDetail.BillTime = DateTime.Now;
// seDetail.Remark = "期初初始化"; // seDetail.Remark = "期初初始化";
// pub_seDetails.Add(seDetail); // pub_seDetails.Add(seDetail);
// } // }
@ -1581,8 +1584,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
// seDetail.BeginDate = DateTime.Now; // seDetail.BeginDate = DateTime.Now;
// seDetail.CreationTime = DateTime.Now; // seDetail.CreationTime = DateTime.Now;
// seDetail.IsDeleted = false; // seDetail.IsDeleted = false;
// seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); // seDetail.Version = int.Parse(DateTime.Now?.ToString("yyyyMM"));
// seDetail.ShippingDate = (DateTime)item.BillTime; // seDetail.ShippingDate = (DateTime)DateTime.Now;
// seDetail.Qty = item.Qty; // seDetail.Qty = item.Qty;
// //seDetail.IsHaveEdiData = false; // //seDetail.IsHaveEdiData = false;
// seDetail.BusinessType = EnumBusinessType.YinDuJian; // seDetail.BusinessType = EnumBusinessType.YinDuJian;
@ -1603,7 +1606,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
// seDetail.PN = item.VinCode; // seDetail.PN = item.VinCode;
// seDetail.LU = item.CustPartCode; // seDetail.LU = item.CustPartCode;
// seDetail.CustPartCode = item.CustPartCode; // seDetail.CustPartCode = item.CustPartCode;
// seDetail.BillTime = item.BillTime; // seDetail.BillTime = DateTime.Now;
// seDetail.Remark = "期初初始化"; // seDetail.Remark = "期初初始化";
// pub_seDetails.Add(seDetail); // pub_seDetails.Add(seDetail);
// } // }

1
code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
View File

@ -1011,6 +1011,7 @@ namespace Win.Sfs.SettleAccount
private void CreateMapVimLog() private void CreateMapVimLog()
{ {
CreateMap<VmiLog, VimLogImportDTO>().ReverseMap(); CreateMap<VmiLog, VimLogImportDTO>().ReverseMap();
CreateMap<VmiLog, VimLogImportDTO1>().ReverseMap();
} }

44
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiLog.cs
View File

@ -282,6 +282,50 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi
} }
public class VimLogImportDTO1
{
//库存事务分类 变动时间 变动类型 厂内零件号 客户零件号 发货类型 数量 ERP库位 发货子类型 EDI订单生产码
[ImporterHeader(Name = "厂内零件号")]
[Required(ErrorMessage = "{0}是必填项")]
public string RealPartCode { get; set; }//原始
[ImporterHeader(Name = "客户零件号")]
[Required(ErrorMessage = "{0}是必填项")]
public string CustPartCode { get; set; }
[ImporterHeader(Name = "发货类型")]
public EnumDeliverBjBmpBillType? DeliverBillType { get; set; }
[ImporterHeader(Name = "数量")]
[Required(ErrorMessage = "{0}是必填项")]
public decimal Qty { get; set; }
//[ImporterHeader(Name = "发运日期")]
//[Required(ErrorMessage = "{0}是必填项")]
//public DateTime? BillTime { get; set; }
//[ImporterHeader(Name = "订单日期")]
//[Required(ErrorMessage = "{0}是必填项")]
//public DateTime? AssembleData { get; set; }
[ImporterHeader(Name = "ERP库位")]
[Required(ErrorMessage = "{0}是必填项")]
public string ErpToLoc { get; set; }
[ImporterHeader(Name = "发货子类型")]
[Required(ErrorMessage = "{0}是必填项")]
public EnumDeliverSubBillType? DeliverSubBillType { get; set; }
[ImporterHeader(Name = "EDI订单生产码")]
public string VinCode { get; set; }
}

Write Preview
Loading…
Cancel
Save