diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWSparePart/SparePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWSparePart/SparePartAppService.cs
index 866e580b..6a777bfc 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWSparePart/SparePartAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/VWSparePart/SparePartAppService.cs
@@ -63,7 +63,7 @@ namespace Win.Sfs.SettleAccount.Entities.VWSparePart
///
- /// 导入功能
+ /// 大众备件调整导入(财务期初时用的功能)
///
/// 上传的文件(前端已经限制只能上传一个附件)
///
@@ -112,6 +112,16 @@ namespace Win.Sfs.SettleAccount.Entities.VWSparePart
return ApplicationConsts.SuccessStr;
}
+ ///
+ /// 大众备件明细数据导入功能(以后正常使用的功能)
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
[HttpPost]
[Route("ExcelImport90")]
[DisableRequestSizeLimit]
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
index 16e455b6..7b988cca 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
@@ -256,8 +256,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
var _list90Summary = _excelHelper.ExcelToListOne();//有单号
- var _list = _listSummary.Where(p => p.OrderBillNum == "").ToList();//过滤 没有采购订单号为空的集合
- var _listBill = _list90Summary.Where(p => p.OrderBillNum != "").ToList();//过滤 有采购订单号的集合
+ var _list = _listSummary.Where(p =>string.IsNullOrEmpty(p.OrderBillNum)).ToList();//没有采购订单号的集合
+ var _listBill = _list90Summary.Where(p =>!string.IsNullOrEmpty(p.OrderBillNum)).ToList();//有采购订单号的集合
@@ -328,7 +328,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
if (_lst != null && _lst.Count>0)
{
//没有采购订单号
- var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.OrderBillNum == "").ToListAsync();
+ var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && string.IsNullOrEmpty(p.OrderBillNum)).ToListAsync();
var error = from itm1 in outPutDetail
join itm2 in _lst on
@@ -412,7 +412,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
if (_lstBill != null && _lstBill.Count>0)
{
//有采购订单号
- var outPutDetailBill = await _wmsRepository90.Where(p => p.Version == input.Version && p.OrderBillNum != "").ToListAsync();
+ var outPutDetailBill = await _wmsRepository90.Where(p => p.Version == input.Version && !string.IsNullOrEmpty(p.OrderBillNum)).ToListAsync();
var error = from itm1 in outPutDetailBill
join itm2 in _lstBill on
@@ -631,7 +631,12 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
return true;
}
-
+ ///
+ /// 出库单导入功能
+ ///
+ ///
+ ///
+ ///
[HttpPost]
[Route("ExcelImport")]
[DisableRequestSizeLimit]
@@ -666,8 +671,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
var result90 = await _exportImporter.ExtendExcelOfSheetOneImport(files, _excelImportService);
- var result_nobill = result.Where(p => p.OrderBillNum == "").ToList();
- var result_withbill = result90.Where(p => p.OrderBillNum != "").ToList();
+ var result_nobill = result.Where(p =>string.IsNullOrEmpty(p.OrderBillNum)).ToList();//没有采购单号集合
+ var result_withbill = result90.Where(p =>!string.IsNullOrEmpty(p.OrderBillNum)).ToList();//有采购单号集合
//没有采购单号
@@ -677,7 +682,8 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
List _lst = new List();
var _lsCopy = new List();
- foreach (var itm in result_nobill)
+ var result_nobill_filter = result_nobill.Where(p => string.IsNullOrEmpty(p.OrderBillNum) && !string.IsNullOrEmpty(p.MaterialCode));
+ foreach (var itm in result_nobill_filter)
{
WmsSharePartOutPutDetial _detail = new WmsSharePartOutPutDetial(
GuidGenerator.Create(),
@@ -772,7 +778,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
List _lst = new List();
var _lsCopy = new List();
- var filte_result_withbill = result_withbill.Where(p => p.OrderBillNum != "");//采购单号为空的过滤掉
+ var filte_result_withbill = result_withbill.Where(p =>!string.IsNullOrEmpty(p.OrderBillNum));//采购单号为空的过滤掉
foreach (var itm in filte_result_withbill)
{
WmsSharePart90OutPutDetial _detail = new WmsSharePart90OutPutDetial(
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
index 5698ca71..cbe620ce 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
@@ -176,7 +176,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
#region 大众备件0-90天和90天以上输出
///
- /// 大众备件0-90天报表输出
+ /// 大众备件数据调整结算输出
///
///
///
@@ -215,7 +215,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
}
///
- /// 大众备件结算核对明细表
+ /// 大众备件输出(包括带订货单号和无订单号)
///
/// 采购订单号
/// 厂内物料号