diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Materials/MaterialDtoBase.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Materials/MaterialDtoBase.cs
index 07f0059d..2dd9413c 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Materials/MaterialDtoBase.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Materials/MaterialDtoBase.cs
@@ -30,6 +30,11 @@ namespace Win.Sfs.SettleAccount.Entities.Errors
///
public string WmsBillNum { set; get; }
+ public string MaterialDesc { set; get; }
+
+
+ public string CustomerMaterialCode { set; get; }
+
}
public class ErrorBillImportDto
@@ -37,18 +42,25 @@ namespace Win.Sfs.SettleAccount.Entities.Errors
///
///错误单据号
///
- public string BillNum { get; protected set; }
-
+ [ImporterHeader(Name = "底盘|看板号|订单号")]
+ public string BillNum { get; set; }
///
/// 物料号
///
+ [ImporterHeader(Name = "ERP物料号")]
public string MaterialCode { set; get; }
-
///
/// 发货单号
///
+ [ImporterHeader(Name = "交货单号")]
public string WmsBillNum { set; get; }
+ [ImporterHeader(Name = "物料描述")]
+ public string MaterialDesc { set; get; }
+
+ [ImporterHeader(Name = "客户物料号")]
+ public string CustomerMaterialCode { set; get; }
+
}
public class ErrorBillExportDto
@@ -62,7 +74,7 @@ namespace Win.Sfs.SettleAccount.Entities.Errors
///
/// 物料号
///
- [ExporterHeader(DisplayName = "物料号", IsBold = true)]
+ [ExporterHeader(DisplayName = "ERP物料号", IsBold = true)]
public string MaterialCode { set; get; }
///
@@ -71,6 +83,13 @@ namespace Win.Sfs.SettleAccount.Entities.Errors
[ExporterHeader(DisplayName = "交货单号", IsBold = true)]
public string WmsBillNum { set; get; }
+
+ [ExporterHeader(DisplayName = "物料描述", IsBold = true)]
+ public string MaterialDesc { set; get; }
+
+ [ExporterHeader(DisplayName = "客户物料号", IsBold = true)]
+ public string CustomerMaterialCode { set; get; }
+
}
@@ -91,6 +110,11 @@ namespace Win.Sfs.SettleAccount.Entities.Errors
///
public string WmsBillNum { set; get; }
public Guid BranchId { get; set; }
+
+ public string MaterialDesc { set; get; }
+
+
+ public string CustomerMaterialCode { set; get; }
}
}
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErpShipping/ErpShippingAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErpShipping/ErpShippingAppService.cs
index e2e77be6..0799658f 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErpShipping/ErpShippingAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErpShipping/ErpShippingAppService.cs
@@ -231,13 +231,9 @@ namespace Win.Sfs.SettleAccount.ERPShippingDetails
//
byte[] result = null;
-
-
-
_fileName = string.Format("ERP_{0}.xlsx", Guid.NewGuid().ToString("N"));
result = await _excel.ExportAsByteArray(dtoDetails);
-
result.ShouldNotBeNull();
//浼ļɶ
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErrorListBill/ErrorBillAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErrorListBill/ErrorBillAppService.cs
index f6195929..0ec73581 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErrorListBill/ErrorBillAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ErrorListBill/ErrorBillAppService.cs
@@ -68,10 +68,10 @@ namespace Win.Sfs.SettleAccount.Entities.ErrorBills
/// 缓存
public ErrorBillAppService(
- ISettleAccountBranchEfCoreRepository repository,
- ISettleAccountBranchEfCoreRepository mapRepository,
- ISettleAccountBranchEfCoreRepository bomRepository,
- ISettleAccountBranchEfCoreRepository bomversionRepository,
+ ISettleAccountBranchEfCoreRepository repository,
+ ISettleAccountBranchEfCoreRepository mapRepository,
+ ISettleAccountBranchEfCoreRepository bomRepository,
+ ISettleAccountBranchEfCoreRepository bomversionRepository,
TaskJobService service,
//ISettleAccountBranchEfCoreRepository relationshipRepository,
ISettleAccountBranchEfCoreRepository priceRepository,
@@ -114,17 +114,14 @@ namespace Win.Sfs.SettleAccount.Entities.ErrorBills
- public List RemoveError(List p_list) where T : ReportDetailBase, new ()
- {
+ //public List RemoveError(List p_list) where T : ReportDetailBase, new ()
+ //{
-
-
-
- return p_list;
+ // return p_list;
- }
+ //}
@@ -154,7 +151,9 @@ namespace Win.Sfs.SettleAccount.Entities.ErrorBills
GuidGenerator.Create(),
itm.BillNum,
itm.MaterialCode,
- itm.WmsBillNum
+ itm.WmsBillNum,
+ itm.MaterialDesc,
+ itm.CustomerMaterialCode
);
await _repository.InsertAsync(entity);
}
@@ -184,7 +183,6 @@ namespace Win.Sfs.SettleAccount.Entities.ErrorBills
return dto;
}
-
private async Task GetFromCacheAsync(Guid id)
{
var result = await _repository.GetAsync(id);
@@ -192,7 +190,6 @@ namespace Win.Sfs.SettleAccount.Entities.ErrorBills
return result;
}
-
private async Task GetCountAsync(ErrorBillRequestDto input)
{
return await _repository.GetCountByFilterAsync(input.BranchId, input.Filters);
@@ -304,7 +301,7 @@ namespace Win.Sfs.SettleAccount.Entities.ErrorBills
virtual public async Task ExportAsync(ErrorBillRequestDto input)
{
- string _fileName = string.Format("错误单据_{0}.xlsx", DateTime.Now.ToString("yyyyMMdd"));
+ string _fileName = string.Format("错误单据输出_{0}.xlsx", DateTime.Now.ToString("yyyyMMdd"));
var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
0, true);
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/ErrorBillNum/ErrorBillNum.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/ErrorBillNum/ErrorBillNum.cs
index 005ac1d8..1dd5e4aa 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/ErrorBillNum/ErrorBillNum.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/ErrorBillNum/ErrorBillNum.cs
@@ -14,12 +14,14 @@ namespace Win.Sfs.SettleAccount.Errors
public ErrorBill(
Guid id,
Guid branchId,
- string billNum, string materialCode, string wmsBillNum):base(id)
+ string billNum, string materialCode, string wmsBillNum,string materialDesc,string customerMaterialCode):base(id)
{
BranchId = branchId;
BillNum = billNum;
MaterialCode = materialCode;
WmsBillNum = wmsBillNum;
+ MaterialDesc = materialDesc;
+ CustomerMaterialCode = customerMaterialCode;
}
///
@@ -37,6 +39,11 @@ namespace Win.Sfs.SettleAccount.Errors
///
public string WmsBillNum { set; get; }
-
+
+ public string MaterialDesc { set; get; }
+
+
+ public string CustomerMaterialCode { set; get; }
+
}
}
\ No newline at end of file