44673626 3 years ago
parent
commit
707b258132
  1. 10345
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211129095823_init.Designer.cs
  2. 4385
      src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211129095823_init.cs
  3. 23
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs
  4. 67
      src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
  5. 9
      src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
  6. 5
      src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Prices/PriceList.cs
  7. 39
      src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Prices/PriceListManager.cs
  8. 2
      src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettleAccountEntityBase.cs
  9. 61
      src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/ReportDetailBase.cs
  10. 118
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs
  11. 149
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs
  12. 5
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDiffDapperRepository.cs
  13. 1
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleFisDiffDetailDapperRepository.cs
  14. 40
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettleDiffDapperRepository.cs
  15. 51
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/OutputService.cs
  16. 87
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDetailDiffExportService.cs
  17. 4
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDiffExportService.cs
  18. 4
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettleDiffExportService.cs
  19. 13
      src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs
  20. 20
      vue/src/router/modules/fis.js
  21. 6
      vue/src/views/pg-fis/basedate/assemblyCfg/detail.vue
  22. 73
      vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
  23. 10
      vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
  24. 14
      vue/src/views/pg-fis/basedate/logRemind/index.vue
  25. 2
      vue/src/views/pg-fis/basedate/m100BIll/detail.vue
  26. 30
      vue/src/views/pg-fis/basedate/m100BIll/index.vue
  27. 6
      vue/src/views/pg-fis/basedate/m100Online/detail.vue
  28. 293
      vue/src/views/pg-fis/basedate/m100Online/index.vue
  29. 2
      vue/src/views/pg-fis/basedate/productLine/index.vue
  30. 6
      vue/src/views/pg-fis/basedate/r100Online/detail.vue
  31. 32
      vue/src/views/pg-fis/basedate/r100Online/index.vue
  32. 4
      vue/src/views/pg-fis/basedate/repeatR100/detail.vue
  33. 103
      vue/src/views/pg-fis/basedate/repeatR100/index.vue
  34. 6
      vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue
  35. 24
      vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
  36. 36
      vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
  37. 57
      vue/src/views/pg-fis/components/mixins/message_table.js
  38. 59
      vue/src/views/pg-fis/styles/crmtable.scss

10345
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211129095823_init.Designer.cs

File diff suppressed because it is too large

4385
src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211129095823_init.cs

File diff suppressed because it is too large

23
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs

@ -170,29 +170,6 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
var entityList = ObjectMapper.Map<List<PriceListImportDto>, List<PriceList>>(result); var entityList = ObjectMapper.Map<List<PriceListImportDto>, List<PriceList>>(result);
var _ls = entityList.Where(p=>p.EndDate.ToString().Contains("9999")).GroupBy(p => new { p.MaterialCode, p.CustomerCode,p.Type }).Select(p=>p.FirstOrDefault()); var _ls = entityList.Where(p=>p.EndDate.ToString().Contains("9999")).GroupBy(p => new { p.MaterialCode, p.CustomerCode,p.Type }).Select(p=>p.FirstOrDefault());
// List<PriceList> _ls = new List<PriceList>();
//foreach (var itm in matialCodeList)
//{
// var priceList= entityList.Where(p => p.MaterialCode == itm).Distinct().ToList();
// var _list =priceList.OrderBy(p => p.BeginDate).ToList();
// int i = 0;//查询下条记录
// foreach (var price in _list)
// {
// i++;
// if (_list.Count == i)
// {
// price.EndDate = DateTime.MaxValue;
// break;
// }
// else
// {
// var _nextPrice = _list[i];
// price.EndDate = _nextPrice.BeginDate.AddDays(-1);
// }
// _ls.Add(price);
// }
//}
foreach (var itm in _ls) foreach (var itm in _ls)
{ {
itm.Update(GuidGenerator.Create(),version); itm.Update(GuidGenerator.Create(),version);

67
src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs

@ -306,6 +306,44 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
return _taskid; return _taskid;
} }
/// <summary>
/// 大众发票与结算核对明细表
/// </summary>
/// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
/// <returns></returns>
[HttpGet]
[Route("InvoiceSettledDetailDiff-Make")]
[DisableRequestSizeLimit]
public async Task<string> InvoiceSettledDetailDiffMake(
string version,
string materialCode,
string begin,
string end,
string cp7begin,
string cp7end,
string kenncode,
string chassisNumber
)
{
List<CustomCondition> customConditionList = new List<CustomCondition>();
customConditionList.Add(new CustomCondition() { Name = "Version", Value =string.IsNullOrEmpty(version) ?string.Empty:version });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = string.IsNullOrEmpty(materialCode) ?string.Empty: materialCode });
customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = string.IsNullOrEmpty(begin) ? string.Empty : materialCode });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = string.IsNullOrEmpty(end) ? string.Empty : materialCode });
customConditionList.Add(new CustomCondition() { Name = "Cp7BeginTime", Value = string.IsNullOrEmpty(cp7begin) ? string.Empty : cp7begin });
customConditionList.Add(new CustomCondition() { Name = "Cp7EndTime", Value = string.IsNullOrEmpty(cp7end) ? string.Empty : cp7end });
customConditionList.Add(new CustomCondition() { Name = "KennCode", Value = string.IsNullOrEmpty(kenncode) ? string.Empty : kenncode });
customConditionList.Add(new CustomCondition() { Name = "ChassisNumber", Value = string.IsNullOrEmpty(chassisNumber) ? string.Empty : chassisNumber });
var _taskid = await _service.ExportEnqueueAsync("大众发票与结算核对明细表", ExportExtentsion.Excel, CurrentUser, typeof(InvoiceSettledDetailDiffExportService), customConditionList, (rs) =>
{
});
return _taskid;
}
/// <summary> /// <summary>
/// 3.大众准时化结算数量差异比对表 /// 3.大众准时化结算数量差异比对表
/// </summary> /// </summary>
@ -338,30 +376,33 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
[Route("UnSettleDiffExport-Make")] [Route("UnSettleDiffExport-Make")]
[DisableRequestSizeLimit] [DisableRequestSizeLimit]
public async Task<string> UnSettleDiffExportServiceMake(string version, string materialCode, string begin, string end) public async Task<string> UnSettleDiffExportServiceMake(string version, string type,string year,string materialCode,string sapMaterialCode, string begin, string end)
{ {
List<CustomCondition> customConditionList = new List<CustomCondition>(); List<CustomCondition> customConditionList = new List<CustomCondition>();
customConditionList.Add(new CustomCondition() { Name = "Version", Value = version }); customConditionList.Add(new CustomCondition() { Name = "Version", Value = version });
customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = materialCode }); customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = materialCode });
customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = begin }); customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = begin });
customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = end }); customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = end });
var _taskid = await _service.ExportEnqueueAsync("大众准时化未结差异比对表", ExportExtentsion.Excel, CurrentUser, typeof(UnSettleDiffExportService), customConditionList, (rs) => customConditionList.Add(new CustomCondition() { Name = "Type", Value = type });
{ customConditionList.Add(new CustomCondition() { Name = "Year", Value = year });
}); customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = materialCode });
return _taskid; customConditionList.Add(new CustomCondition() { Name = "SapMaterialCode", Value = sapMaterialCode });
}
//var type = p_list.Where(p => p.Name == "Type").FirstOrDefault().Value;
//var year = p_list.Where(p => p.Name == "Year").FirstOrDefault().Value;
//var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value;
//var sapCode = p_list.Where(p => p.Name == "SapMaterialCode").FirstOrDefault().Value;
//var beginTime = p_list.Where(p => p.Name == "BegingTime").FirstOrDefault().Value;
//var endTime = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value;
var _taskid = await _service.ExportEnqueueAsync("大众准时化未结差异比对表", ExportExtentsion.Excel, CurrentUser, typeof(UnSettleDiffExportService), customConditionList, (rs) =>
{
});
return _taskid;
}
/// <summary> /// <summary>
/// 结算总成和ERP总成价格对比 /// 结算总成和ERP总成价格对比

9
src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml

@ -2484,6 +2484,13 @@
<param name="files">上传的文件(前端已经限制只能上传一个附件)</param> <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.InvoiceSettledDetailDiffMake(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary>
大众发票与结算核对明细表
</summary>
<param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
<returns></returns>
</member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.SettleFisDiffExportMake(System.String,System.String,System.String,System.String)"> <member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.SettleFisDiffExportMake(System.String,System.String,System.String,System.String)">
<summary> <summary>
3.大众准时化结算数量差异比对表 3.大众准时化结算数量差异比对表
@ -2491,7 +2498,7 @@
<param name="files">上传的文件(前端已经限制只能上传一个附件)</param> <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.UnSettleDiffExportServiceMake(System.String,System.String,System.String,System.String)"> <member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.UnSettleDiffExportServiceMake(System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
<summary> <summary>
6.大众准时化未结差异比对表 6.大众准时化未结差异比对表
</summary> </summary>

5
src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Prices/PriceList.cs

@ -8,6 +8,11 @@ using Win.Sfs.Shared.DomainBase;
namespace Win.Sfs.SettleAccount.Entities.Prices namespace Win.Sfs.SettleAccount.Entities.Prices
{ {
public class ErpPrice
{
public string SapErpPartCode { set; get; }
public decimal SapPrice { set; get; }
}
public class PriceList:FullAuditedAggregateRootBase<Guid> public class PriceList:FullAuditedAggregateRootBase<Guid>
{ {
public PriceList() public PriceList()

39
src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Prices/PriceListManager.cs

@ -78,20 +78,37 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
var pricelist = GetPriceList(version); var pricelist = GetPriceList(version);
List<PriceList> _list = new List<PriceList>();
foreach (var itm in pricelist) //var LeftJoin = from emp in ListOfEmployees
{ // join dept in ListOfDepartment
var entity = entities.FirstOrDefault(p => p.Type == itm.Type && p.CustomerCode == itm.CustomerCode && p.MaterialCode == p.MaterialCode); // on emp.DeptID equals dept.ID into JoinedEmpDept
if (entity != null) // from dept in JoinedEmpDept.DefaultIfEmpty()
{
itm.Price = entity.Price;
entities.Remove(entity); var add= from itm1 in entities join itm2 in pricelist
} on new { itm1.Type, itm1.CustomerCode, itm1.MaterialCode } equals new { itm2.Type, itm2.CustomerCode, itm2.MaterialCode }
} into temp from itm3 in temp.DefaultIfEmpty() where itm3 == null select itm1;
var update = from itm1 in entities
join itm2 in pricelist
on new { itm1.Type, itm1.CustomerCode, itm1.MaterialCode } equals new { itm2.Type, itm2.CustomerCode, itm2.MaterialCode }
where itm1.Price != itm2.Price
select new PriceList(itm2.Id, itm2.BeginDate, itm2.EndDate, itm1.Price, itm2.MaterialCode,itm2.Type, itm2.ParentId, itm2.Version);
await _repository.GetDbContext().BulkInsertAsync<PriceList>(entities); await _repository.GetDbContext().BulkUpdateAsync(update.ToList());
await _repository.GetDbContext().BulkInsertAsync<PriceList>(add.ToList());
var _first = _versionRepository.FirstOrDefault(p => p.Version == version); var _first = _versionRepository.FirstOrDefault(p => p.Version == version);

2
src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/SettleAccountEntityBase.cs

@ -12,7 +12,7 @@ namespace Win.Sfs.SettleAccount.Entities
public class CacheManager public class CacheManager
{ {
public static List<Material> CacheMaterials { set; get; } public static List<Material> CacheMaterials { set; get; }
public static List<PriceList> CachePriceList { set; get; } public static List<ErpPrice> CachePriceList { set; get; }
} }
public interface ISettleAccountEntityBase public interface ISettleAccountEntityBase

61
src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/ReportDetailBase.cs

@ -10,32 +10,67 @@ namespace Win.Sfs.SettleAccount.Reports
public class ReportDetailBase public class ReportDetailBase
{ {
[ExporterHeader(DisplayName = "交货单号 ")] [ExporterHeader(DisplayName = "交货单号 ")]
public string WmsBillNum { set; get; } public virtual string WmsBillNum { set; get; }
[ExporterHeader(DisplayName = "实际发货日期 ")] [ExporterHeader(DisplayName = "实际发货日期 ")]
public DateTime CP5Time { set; get; } public virtual DateTime CP5Time { set; get; }
[ExporterHeader(DisplayName = "KENN号")] [ExporterHeader(DisplayName = "KENN号")]
public string KENNCode { set; get; } public virtual string KENNCode { set; get; }
[ExporterHeader(DisplayName = "底盘号")] [ExporterHeader(DisplayName = "底盘号")]
public string ChassisNumber { set; get; } public virtual string ChassisNumber { set; get; }
[ExporterHeader(DisplayName = "交货状态 ")] [ExporterHeader(DisplayName = "交货状态 ")]
public string WmsState { set; get; } public virtual string WmsState { set; get; }
[ExporterHeader(DisplayName = "物料号")] [ExporterHeader(DisplayName = "物料号")]
public string SapMaterialCode { set; get; } public virtual string SapMaterialCode { set; get; }
[ExporterHeader(DisplayName = "物料描述 ")] [ExporterHeader(DisplayName = "物料描述 ")]
public string MaterialDesc { set; get; } public virtual string MaterialDesc { set; get; }
[ExporterHeader(DisplayName = "客户物料 ")] [ExporterHeader(DisplayName = "客户物料 ")]
public string MaterialCode { set; get; } public virtual string MaterialCode { set; get; }
[ExporterHeader(DisplayName = "组件组物料 ")] [ExporterHeader(DisplayName = "组件组物料 ")]
public string ParentSapMaterialCode { set; get; } public virtual string ParentSapMaterialCode { set; get; }
[ExporterHeader(DisplayName = "组件组物料描述 ")] [ExporterHeader(DisplayName = "组件组物料描述 ")]
public string ParentMaterialDesc { set; get; } public virtual string ParentMaterialDesc { set; get; }
[ExporterHeader(DisplayName = "物料组(车型) ")] [ExporterHeader(DisplayName = "物料组(车型) ")]
public string MaterialGroup { set; get; } public virtual string MaterialGroup { set; get; }
[ExporterHeader(DisplayName = "定价 ")] [ExporterHeader(DisplayName = "定价 ")]
public decimal Price { set; get; } public virtual decimal Price { set; get; }
[ExporterHeader(DisplayName = "金额 ")] [ExporterHeader(DisplayName = "金额 ")]
public decimal Amt { set; get; } public virtual decimal Amt { set; get; }
//public virtual string WmsBillNum { set; get; }
//public virtual DateTime CP5Time { set; get; }
//public virtual string KENNCode { set; get; }
//public virtual string ChassisNumber { set; get; }
//public virtual string WmsState { set; get; }
//public virtual string SapMaterialCode { set; get; }
//public virtual string MaterialDesc { set; get; }
//public virtual string MaterialCode { set; get; }
//public virtual string ParentSapMaterialCode { set; get; }
//public virtual string ParentMaterialDesc { set; get; }
//public virtual string MaterialGroup { set; get; }
//public virtual decimal Price { set; get; }
//public virtual decimal Amt { set; get; }
} }

118
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs

@ -15,7 +15,7 @@ using Win.Sfs.SettleAccount.Reports;
namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
{ {
/// <summary> /// <summary>
/// 主数据Dapper表 /// 主数据Dapper表
@ -27,10 +27,10 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
} }
public virtual List<T> GetDiffReport<T>(List<T> childList) where T : ReportDetailBase, new() public virtual List<T> GetSapList<T>(List<T> childList) where T : ReportDetailBase, new()
{ {
List<Material> _materialList = new List<Material>(); List<Material> _materialList = new List<Material>();
List<PriceList> _priceList = new List<PriceList>(); List<ErpPrice> _priceList = new List<ErpPrice>();
if (CacheManager.CacheMaterials != null) if (CacheManager.CacheMaterials != null)
{ {
_materialList = CacheManager.CacheMaterials; _materialList = CacheManager.CacheMaterials;
@ -45,41 +45,91 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
} }
else else
{ {
_priceList = DbConnection.Query<PriceList>("select MaterialCode,Price from Set_PriceList where version=(select max(version) from set_Set_PriceListVersion)").ToList(); _priceList = DbConnection.Query<ErpPrice>("select Price SapPrice, MaterialCode SapErpPartCode from Set_PriceList where version=(select max(version) from Set_PriceListVersion)").ToList();
} }
// List <T> _list = new List<T>();
var query=from itm1 in childList
join itm2 in _priceList on itm1.ParentSapMaterialCode equals itm2.SapErpPartCode into temp1
from tm1 in temp1.DefaultIfEmpty(new ErpPrice())
join itm3 in _materialList on itm1.ParentSapMaterialCode equals itm3.MaterialCode into temp2
from tm2 in temp2.DefaultIfEmpty(new Material())
select new T {
WmsBillNum = itm1.WmsBillNum,
CP5Time = itm1.CP5Time,
KENNCode = itm1.KENNCode,
ChassisNumber = itm1.ChassisNumber,
WmsState = itm1.WmsState,
SapMaterialCode = itm1.ParentSapMaterialCode,
MaterialDesc = itm1.ParentMaterialDesc,
MaterialCode = itm1.ParentSapMaterialCode,
ParentSapMaterialCode = itm1.ParentSapMaterialCode,
ParentMaterialDesc = itm1.ParentMaterialDesc,
Price =tm1.SapPrice,
Amt = tm1.SapPrice,
MaterialGroup = tm2.EstimateTypeDesc
List<T> _list = new List<T>();
foreach (var itm in childList)
{
var parentMaterial = new T();
parentMaterial.WmsBillNum = itm.WmsBillNum;
parentMaterial.CP5Time = itm.CP5Time;
parentMaterial.KENNCode = itm.KENNCode;
parentMaterial.ChassisNumber = itm.ChassisNumber;
parentMaterial.WmsState = itm.WmsState;
parentMaterial.SapMaterialCode = itm.ParentSapMaterialCode;
parentMaterial.MaterialDesc = itm.ParentMaterialDesc;
parentMaterial.MaterialCode = itm.ParentSapMaterialCode;
parentMaterial.ParentSapMaterialCode = itm.ParentSapMaterialCode;
parentMaterial.ParentMaterialDesc = itm.ParentMaterialDesc;
var _price = _priceList.Where(p => p.MaterialCode == itm.ParentSapMaterialCode).FirstOrDefault();
if (_price != null)
{
parentMaterial.Price = _price.Price;
parentMaterial.Amt = _price.Price;
}
var _material = _materialList.Where(p => p.MaterialCode == itm.ParentSapMaterialCode).FirstOrDefault();
if (_material != null)
{
parentMaterial.MaterialGroup = _material.EstimateTypeDesc;
}
_list.Add(parentMaterial);
}
return _list;
};
//foreach (var itm in childList)
//{
// var parentMaterial = new T();
// parentMaterial.WmsBillNum = itm.WmsBillNum;
// parentMaterial.CP5Time = itm.CP5Time;
// parentMaterial.KENNCode = itm.KENNCode;
// parentMaterial.ChassisNumber = itm.ChassisNumber;
// parentMaterial.WmsState = itm.WmsState;
// parentMaterial.SapMaterialCode = itm.ParentSapMaterialCode;
// parentMaterial.MaterialDesc = itm.ParentMaterialDesc;
// parentMaterial.MaterialCode = itm.ParentSapMaterialCode;
// parentMaterial.ParentSapMaterialCode = itm.ParentSapMaterialCode;
// parentMaterial.ParentMaterialDesc = itm.ParentMaterialDesc;
// var _price = _priceList.Where(p => p.SapErpPartCode == itm.ParentSapMaterialCode).FirstOrDefault();
// if (_price != null)
// {
// parentMaterial.Price = _price.SapPrice;
// parentMaterial.Amt = _price.SapPrice;
// }
// var _material = _materialList.Where(p => p.MaterialCode == itm.ParentSapMaterialCode).FirstOrDefault();
// if (_material != null)
// {
// parentMaterial.MaterialGroup = _material.EstimateTypeDesc;
// }
// _list.Add(parentMaterial);
//}
return query.ToList();
}
public virtual List<ErpPrice> GetErpPartCodePriceList(string version)
{
string str = "SELECT\n" +
" ErpMaterialCode SapErpPartCode,\n" +
" SUM( PRICE ) SapPrice \n" +
" FROM \n" +
" Set_MaterialRelationshipDetail A\n" +
" LEFT JOIN ( SELECT SUM( AMT )/ SUM( Qty ) PRICE, MaterialCode FROM Set_Invoice WHERE VERSION = '{0}' GROUP BY MaterialCode ) B ON A.SettleMaterialCode = B.MaterialCode \n" +
"GROUP BY\n" +
" ErpMaterialCode";
var _list = DbConnection.Query<ErpPrice>(string.Format(str, version));
return _list.ToList();
} }
} }
} }

149
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs

@ -1,4 +1,6 @@
using Magicodes.ExporterAndImporter.Core; using Dapper;
using Magicodes.ExporterAndImporter.Core;
using Magicodes.ExporterAndImporter.Excel;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -11,18 +13,53 @@ using Win.Sfs.SettleAccount.Reports;
namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
{ {
public class InvoiceSettledDetilDiff : ReportDetailBase [ExcelExporter(MaxRowNumberOnASheet = 500000)]
public class InvoiceSettledDetailDiff
: ReportDetailBase
{ {
//结算数量
[ExporterHeader(DisplayName = "交货单号 ")]
public override string WmsBillNum { set; get; }
[ExporterHeader(DisplayName = "实际发货日期 ")]
public override DateTime CP5Time { set; get; }
[ExporterHeader(DisplayName = "KENN号")]
public override string KENNCode { set; get; }
[ExporterHeader(DisplayName = "底盘号")]
public override string ChassisNumber { set; get; }
[ExporterHeader(DisplayName = "交货状态 ")]
public override string WmsState { set; get; }
[ExporterHeader(DisplayName = "物料号")]
public override string SapMaterialCode { set; get; }
[ExporterHeader(DisplayName = "物料描述 ")]
public override string MaterialDesc { set; get; }
[ExporterHeader(DisplayName = "客户物料 ")]
public override string MaterialCode { set; get; }
[ExporterHeader(DisplayName = "组件组物料 ")]
public override string ParentSapMaterialCode { set; get; }
[ExporterHeader(DisplayName = "组件组物料描述 ")]
public override string ParentMaterialDesc { set; get; }
[ExporterHeader(DisplayName = "物料组(车型) ")]
public override string MaterialGroup { set; get; }
[ExporterHeader(DisplayName = "定价 ")]
public override decimal Price { set; get; }
[ExporterHeader(DisplayName = "金额 ")]
public override decimal Amt { set; get; }
//发运数量
[ExporterHeader(DisplayName = "M100数量")]
public decimal Qty { set; get; }
//结算数量
[ExporterHeader(DisplayName = "结算数量")] [ExporterHeader(DisplayName = "结算数量")]
public decimal SettleQty { set; get; } public decimal SettledQty { set; get; }
//结算日期 //结算日期
[ExporterHeader(DisplayName = "结算日期")] [ExporterHeader(DisplayName = "结算日期")]
public decimal CP7Time { set; get; } public DateTime CP7Time { set; get; }
//结算与发货差异 //结算与发货差异
[ExporterHeader(DisplayName = "结算与发货差异")] [ExporterHeader(DisplayName = "结算与发货差异")]
public decimal DiffFisQty{ set; get; } public decimal DiffSettleFisQty{ set; get; }
//结算与开票差异 //结算与开票差异
[ExporterHeader(DisplayName = "结算与开票差异")] [ExporterHeader(DisplayName = "结算与开票差异")]
public decimal DiffSettleInvQty { set; get; } public decimal DiffSettleInvQty { set; get; }
@ -42,8 +79,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
[ExporterHeader(DisplayName = "单价差异")] [ExporterHeader(DisplayName = "单价差异")]
public decimal DiffPrice { set; get; } public decimal DiffPrice { set; get; }
//总金额差异 //总金额差异
[ExporterHeader(DisplayName = "交货单号 ")] [ExporterHeader(DisplayName = "总金额差异")]
public decimal AmtDiffPrice { set; get; } public decimal AmtDiffPrice { set; get; }
@ -51,20 +87,107 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
} }
public class InvoiceSettledDetailDiffDapperRepository: DapperRepository<SettleAccountDbContext>, ITransientDependency /// <summary>
/// 2.大众发票与结算核对明细表-准时化
/// </summary>
public class InvoiceSettledDetailDiffDapperRepository : DapperRepository<SettleAccountDbContext>, ITransientDependency
{ {
public InvoiceSettledDetailDiffDapperRepository(IDbContextProvider<SettleAccountDbContext> dbContextProvider) public InvoiceSettledDetailDiffDapperRepository(IDbContextProvider<SettleAccountDbContext> dbContextProvider)
: base(dbContextProvider) : base(dbContextProvider)
{ {
} }
public virtual List<InvoiceSettledDetilDiff> GetInvoiceSettledDetailDiffReportList(string version, string year, string tablename, string materialcode) public virtual List<InvoiceSettledDetailDiff> GetInvoiceSettledDetailDiffReportList(string version, string materialCode, string begin, string end ,string cp7begin,string cp7end,string kennCode,string chassisNumber)
{ {
List<InvoiceSettledDetilDiff> _list = new List<InvoiceSettledDetilDiff>();
List<InvoiceSettledDetailDiff> _list = new List<InvoiceSettledDetailDiff>();
string condition = " where 1=1 ";
if (!string.IsNullOrEmpty(materialCode))
{
condition += string.Format(" d.MaterialCode='{0}' ", materialCode);
}
if (!string.IsNullOrEmpty(begin))
{
condition += string.Format(" a.BeginTime>='{0}' ", begin);
}
if (!string.IsNullOrEmpty(end))
{
condition += string.Format(" a.BeginTime<='{0}' ", end);
}
if (!string.IsNullOrEmpty(cp7begin))
{
condition += string.Format(" B.cp7Time>='{0}' ", cp7begin);
}
if (!string.IsNullOrEmpty(cp7end))
{
condition += string.Format(" B.cp7Time<='{0}' ", cp7end);
}
if (!string.IsNullOrEmpty(kennCode))
{
condition += string.Format(" B.kenncode='{0}' ", kennCode);
}
if (!string.IsNullOrEmpty(chassisNumber))
{
condition += string.Format(" B.chassisNumber='{0}' ", chassisNumber);
}
string str =
"SELECT\n" +
" temp1.*,\n" +
" TEMP2.Price,(\n" +
" Isnull( temp2.Price, 0 ) * isnull( temp1.Qty, 0 )) Amt \n" +
"FROM\n" +
" (\n" +
" SELECT\n" +
" b.YEAR,\n" +
" b.KENNCode,\n" +
" b.MaterialCode,\n" +
" b.Model,\n" +
" b.ChassisNumber,\n" +
" a.Qty,\n" +
" a.BeginTime CP5Time,\n" +
" a.ChassisNumber2,\n" +
" B.CP7 CP7Time,\n" +
" B.QTY SettledQty,\n" +
" a.ErpMaterialCode ParentSapMaterialCode,\n" +
" a.WMSState,\n" +
" a.WMSBillNum,\n" +
" d.MaterialCode SapMaterialCode,\n" +
" d.MaterialDesc MaterialDesc,\n" +
" d.EstimateTypeDesc MaterialGroup,\n" +
" e.MaterialDesc ParentMaterialDesc,\n" +
" c.InvoicePrice,\n" +
" ( c.InvoicePrice * a.qty ) InvoiceAmt,\n" +
" ( c.InvoicePrice * a.Qty ) SettleAmt,\n" +
" a.Qty - IsNull( B.Qty, 0 ) DiffSettleFisQty,\n" +
" 0 DiffSettleInvQty \n" +
" FROM\n" +
" ( SELECT * FROM Set_Settle b WHERE b.Version = '{0}' ) b\n" +
" INNER JOIN Set_fis a ON b.ChassisNumber = a.ChassisNumber2 \n" +
" AND b.KENNCode = a.KENNCode \n" +
" AND b.MaterialCode = a.ItemCode\n" +
" LEFT JOIN ( SELECT SUM( amt )/ SUM( Qty ) InvoicePrice, MaterialCode FROM set_invoice WHERE version = '{0}' GROUP BY materialcode ) c ON a.ItemCode = c.MaterialCode\n" +
" LEFT JOIN set_material d ON a.ItemCode = d.CustomerPartCode\n" +
" LEFT JOIN set_material e ON a.ErpMaterialCode = e.MaterialCode {1} \n" +
" ) TEMP1\n" +
" LEFT JOIN (\n" +
" SELECT\n" +
" Price,\n" +
" MaterialCode \n" +
" FROM\n" +
" Set_PriceList \n" +
"WHERE\n" +
" version = ( SELECT Max( Version ) FROM Set_PriceList )) TEMP2 ON TEMP1.SapMaterialCode = TEMP2.MaterialCode";
var _sql = string.Format(str, version,condition);
var _query = DbConnection.Query<InvoiceSettledDetailDiff>(_sql, null, null, true, 1200, null);
_list=_query.ToList();
string str = string.Empty;
return _list; return _list;
} }
} }

5
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDiffDapperRepository.cs

@ -52,10 +52,11 @@ string.Format(" '{0}' as Version ,", version)+"\n" +
" (\n" + " (\n" +
" b.InvoiceQty - ISnull(\n" + " b.InvoiceQty - ISnull(\n" +
" c.Qty,\n" + " c.Qty,\n" +
" IsNull( d.qty, 0 ))) DiffQty,\n" + " IsNull( d.qty, 0 ))) DiffQty,\n" +
" g.MaterialCode AS SapMaterialCode,\n" + " g.MaterialCode AS SapMaterialCode,\n" +
" g.MaterialDesc AS MaterialDesc \n" + " g.MaterialDesc AS MaterialDesc, \n" +
" g.EstimateTypeDesc as SapMaterialGroup \n " +
" FROM\n" + " FROM\n" +
" (\n" + " (\n" +
" SELECT\n" + " SELECT\n" +

1
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleFisDiffDetailDapperRepository.cs

@ -37,6 +37,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
[ExporterHeader(DisplayName = "M100数量" )] [ExporterHeader(DisplayName = "M100数量" )]
public decimal Qty { set; get; } public decimal Qty { set; get; }
[ExporterHeader(DisplayName = "差异")] [ExporterHeader(DisplayName = "差异")]
public decimal DiffQty { set; get; } public decimal DiffQty { set; get; }
[ExporterHeader(DisplayName = "开票单价" )] [ExporterHeader(DisplayName = "开票单价" )]
public decimal Price{ set; get; } public decimal Price{ set; get; }

40
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettleDiffDapperRepository.cs

@ -14,14 +14,42 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
{ {
public class UnSettleDiff: ReportDetailBase public class UnSettleDiff: ReportDetailBase
{ {
[ExporterHeader(DisplayName = "交货单号 ")]
public override string WmsBillNum { set; get; }
[ExporterHeader(DisplayName = "实际发货日期 ")]
public override DateTime CP5Time { set; get; }
[ExporterHeader(DisplayName = "KENN号")]
public override string KENNCode { set; get; }
[ExporterHeader(DisplayName = "底盘号")]
public override string ChassisNumber { set; get; }
[ExporterHeader(DisplayName = "交货状态 ")]
public override string WmsState { set; get; }
[ExporterHeader(DisplayName = "物料号")]
public override string SapMaterialCode { set; get; }
[ExporterHeader(DisplayName = "物料描述 ")]
public override string MaterialDesc { set; get; }
[ExporterHeader(DisplayName = "客户物料 ")]
public override string MaterialCode { set; get; }
[ExporterHeader(DisplayName = "组件组物料 ")]
public override string ParentSapMaterialCode { set; get; }
[ExporterHeader(DisplayName = "组件组物料描述 ")]
public override string ParentMaterialDesc { set; get; }
[ExporterHeader(DisplayName = "物料组(车型) ")]
public override string MaterialGroup { set; get; }
[ExporterHeader(DisplayName = "定价 ")]
public override decimal Price { set; get; }
[ExporterHeader(DisplayName = "金额 ")]
public override decimal Amt { set; get; }
[ExporterHeader(DisplayName = "结算平台未结数量")] [ExporterHeader(DisplayName = "结算平台未结数量")]
public decimal Qty { set; get; } public decimal Qty { set; get; }
[ExporterHeader(DisplayName = "大众R3未结数量")] [ExporterHeader(DisplayName = "大众R3未结数量")]
public decimal UNSettleQty { set; get; } public decimal UNSettleQty { set; get; }
[ExporterHeader(DisplayName = "定价")]
public decimal Price { set; get; }
[ExporterHeader(DisplayName = "金额")]
public decimal Amt { set; get; }
[ExporterHeader(DisplayName = "差异")] [ExporterHeader(DisplayName = "差异")]
public decimal DiffQty { set; get; } public decimal DiffQty { set; get; }
[ExporterHeader(DisplayName = "差异金额")] [ExporterHeader(DisplayName = "差异金额")]
@ -164,8 +192,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" Price \n" + " Price \n" +
" FROM\n" + " FROM\n" +
" Set_PriceList \n" + " Set_PriceList \n" +
"WHERE\n" + " WHERE\n" +
" version = ( SELECT max( version ) FROM Set_PriceListVersion )) t2 ON t1.MaterialCode = t2.MaterialCode"; " version = ( SELECT max( version ) FROM Set_PriceListVersion )) t2 ON t1.SapMaterialCode = t2.MaterialCode";
string _sql = string.Empty; string _sql = string.Empty;

51
src/Modules/SettleAccount/src/SettleAccount.Job/Services/OutputService.cs

@ -1,8 +1,10 @@
using Magicodes.ExporterAndImporter.Core; using Magicodes.ExporterAndImporter.Core;
using Magicodes.ExporterAndImporter.Excel; using Magicodes.ExporterAndImporter.Excel;
using Microsoft.CSharp;
using SettleAccount.Job.Domain; using SettleAccount.Job.Domain;
using Shouldly; using Shouldly;
using System; using System;
using System.CodeDom.Compiler;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@ -55,23 +57,48 @@ namespace SettleAccount.Job.Services
_fileContainer.SaveAsync(fileName, result.Result, true); _fileContainer.SaveAsync(fileName, result.Result, true);
var _task = new Win.Sfs.SettleAccount.Entities.TaskJob() { DownFileName = fileName }; var _task = new Win.Sfs.SettleAccount.Entities.TaskJob() { DownFileName = fileName };
_taskjobRepository.UpdateTaskJob(Id, _task); _taskjobRepository.UpdateTaskJob(Id, _task);
//保存导出文件到服务器存成二进制
//保存导出文件到服务器存成二进制
} }
public void Export<T1,T2>(Guid Id, string fileName, List<T1> p_list, List<T2> p_list1) where T1 : class, new() public void Export<T>(Guid Id, string fileName,Dictionary<string,List<T>> p_dic) where T : class, new()
where T2: class, new()
{ {
ExcelExporter _exporter = new ExcelExporter();//导出Excel
var result = _exporter //string methodName = (isDesc) ? "OrderByDescendingInternal" : "OrderByInternal";
.Append(p_list, "sheet1")
.SeparateBySheet()
.Append(p_list1)
.ExportAppendDataAsByteArray();
//var memberProp = typeof(T).GetProperty(propertyName);
//var method = typeof(QueryableExtension).GetMethod(methodName)?.MakeGenericMethod(typeof(T), memberProp?.PropertyType);
result.ShouldNotBeNull(); //var result = method?.Invoke(null, new object[] { query, memberProp });
_fileContainer.SaveAsync(fileName, result.Result, true); //return (IOrderedQueryable<T>)result;
foreach (var itm in p_dic)
{
//.Append(p_list, "sheet1")
}
//ExcelExporter _exporter = new ExcelExporter();//导出Excel
//var result = _exporter
//.Append(p_list, "sheet1")
//.SeparateBySheet()
//.Append(p_list1)
//.ExportAppendDataAsByteArray();
//result.ShouldNotBeNull();
//_fileContainer.SaveAsync(fileName, result.Result, true);
var _task = new Win.Sfs.SettleAccount.Entities.TaskJob() { DownFileName = fileName }; var _task = new Win.Sfs.SettleAccount.Entities.TaskJob() { DownFileName = fileName };
_taskjobRepository.UpdateTaskJob(Id, _task); _taskjobRepository.UpdateTaskJob(Id, _task);
//保存导出文件到服务器存成二进制 //保存导出文件到服务器存成二进制

87
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDetailDiffExportService.cs

@ -0,0 +1,87 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TaskJob.EventArgs;
using TaskJob.Interfaces;
using Volo.Abp.DependencyInjection;
using Win.Sfs.SettleAccount.Reports.InvoiceSettledDiffs;
using Win.Sfs.SettleAccount.Repository.SettleAccount;
using Win.Sfs.SettleAccount.Repository.SettleAccountJob;
using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
namespace SettleAccount.Job.Services
{
/// <summary>
/// 2.大众发票与结算核对明细表-准时化
/// </summary>
public class InvoiceSettledDetailDiffExportService : ITransientDependency, IExportJob
{
private readonly InvoiceSettledDetailDiffDapperRepository _dapperRepository;
private readonly ErpPartDapperRepository _erpdapperRepository;
private readonly OutputService _outputService;
private readonly InputService _inputService;
public InvoiceSettledDetailDiffExportService(
ErpPartDapperRepository erpdapperRepository,
InvoiceSettledDetailDiffDapperRepository dapperRepository,
OutputService outputService,
InputService inputService
)
{
_inputService = inputService;
_outputService = outputService;
_erpdapperRepository= erpdapperRepository;
//_repository = repository;
//_versionRepository = versionRepository;
_dapperRepository =dapperRepository;
}
public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> p_list)
{
var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value;
var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value;
var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value;
var cp7begin = p_list.Where(p => p.Name == "Cp7BeginTime").FirstOrDefault().Value;
var cp7end = p_list.Where(p => p.Name == "Cp7EndTime").FirstOrDefault().Value;
var kenncode = p_list.Where(p => p.Name == "KennCode").FirstOrDefault().Value;
var chassisNumber = p_list.Where(p => p.Name == "ChassisNumber").FirstOrDefault().Value;
var _ls = _dapperRepository.GetInvoiceSettledDetailDiffReportList(version, materialCode, begin, end, cp7begin, cp7end, kenncode, chassisNumber);
var _list = _ls.Where(p=>p.ParentSapMaterialCode!=p.SapMaterialCode).GroupBy(p =>new { p.ParentSapMaterialCode,p.ChassisNumber,p.KENNCode }).Select(p => p.FirstOrDefault()).ToList();
var rangeList = _erpdapperRepository.GetSapList<InvoiceSettledDetailDiff>(_list);
var erpPriceList= _erpdapperRepository.GetErpPartCodePriceList(version);
rangeList.ForEach(p => {
p.Qty = 1;
p.InvoiceQty = 1;
p.SettledQty = 1;
p.DiffSettleFisQty = 0;
p.DiffSettleInvQty = 0;
var _first= erpPriceList.FirstOrDefault(itm => itm.SapErpPartCode == p.SapMaterialCode);
if (_first != null)
{
p.InvoicePrice= _first.SapPrice;
}
p.DiffPrice = p.InvoicePrice - p.Price;
});
_ls.AddRange(rangeList);
_ls=_ls.OrderBy(p => p.ChassisNumber).ThenBy(p=>p.KENNCode).ThenBy(p=>p.SapMaterialCode).ToList();
_outputService.Export<InvoiceSettledDetailDiff>(id, string.Format("大众发票与结算核对明细表_{0}.xlsx", Guid.NewGuid().ToString()), _ls);
//_repository.Insert(_list);
//_versionRepository.Insert(_id, version, customerCode, customerCode, string.Empty, string.Empty, projectName);
return id.ToString();
}
}
}

4
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDiffExportService.cs

@ -66,12 +66,12 @@ namespace SettleAccount.Job.Services
SettleQty =itm. SettleQty , SettleQty =itm. SettleQty ,
CP7ScrapQty =itm. CP7ScrapQty , CP7ScrapQty =itm. CP7ScrapQty ,
ClaimQty =itm. ClaimQty , ClaimQty =itm. ClaimQty ,
DiffQty =itm. DiffQty , DiffQty = itm.InvoiceQty-itm.SettleQty-itm.CP7ScrapQty-itm.ClaimQty,//开票数量-结算数量-CP7报废数量-索赔数量
SalePrice =itm. SalePrice , SalePrice =itm. SalePrice ,
DiffPrice =itm. DiffPrice , DiffPrice =itm. DiffPrice ,
SapMaterialCode =itm.SapMaterialCode , SapMaterialCode =itm.SapMaterialCode ,
MaterialDesc=itm.MaterialDesc, MaterialDesc=itm.MaterialDesc,
SapMaterialGroup=itm.SapMaterialGroup,
Factory = itm.Factory, Factory = itm.Factory,

4
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/UnSettleDiffExportService.cs

@ -28,7 +28,7 @@ namespace SettleAccount.Job.Services.Report
var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value; var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value;
var sapCode = p_list.Where(p => p.Name == "SapMaterialCode").FirstOrDefault().Value; var sapCode = p_list.Where(p => p.Name == "SapMaterialCode").FirstOrDefault().Value;
var beginTime = p_list.Where(p => p.Name == "BegingTime").FirstOrDefault().Value; var beginTime = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value;
var endTime = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value; var endTime = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value;
var _first = exportName.FirstOrDefault(); var _first = exportName.FirstOrDefault();
@ -68,7 +68,7 @@ namespace SettleAccount.Job.Services.Report
// _lsExport.Add(dto); // _lsExport.Add(dto);
//} //}
_outputService.Export<UnSettleDiff>(id, _first, _lsExport); _outputService.Export<UnSettleDiff>(id, _first, _ls);
return id.ToString(); return id.ToString();
} }
} }

13
src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs

@ -119,8 +119,21 @@ namespace Win.Sfs.SettleAccount
return implementationFactory.GetService<SettleSparePartExportService>(); return implementationFactory.GetService<SettleSparePartExportService>();
} }
if (key.Equals(typeof(InvoiceSettledDetailDiffExportService).FullName))
{
return implementationFactory.GetService<InvoiceSettledDetailDiffExportService>();
}
if (key.Equals(typeof(UnSettleDiffExportService).FullName))
{
return implementationFactory.GetService<UnSettleDiffExportService>();
}
else else
{ {
throw new ArgumentException($"Not Support key:{key}"); throw new ArgumentException($"Not Support key:{key}");
} }
}; return accesor; }; return accesor;

20
vue/src/router/modules/fis.js

@ -106,16 +106,16 @@ const pgfis = {
icon: '客户零件' icon: '客户零件'
} }
}, },
// { {
// path: '/pg-repeatR100', path: '/pg-repeatR100',
// component: () => import('@/views/pg-fis/basedate/repeatR100'), component: () => import('@/views/pg-fis/basedate/repeatR100'),
// name: 'pg-repeatR100',//命名路由 name: 'pg-repeatR100',//命名路由
// meta: { meta: {
// title: '系统内通知', title: '重复报文',
// roles: ['SettleAccount.Reports'], roles: ['SettleAccount.Reports'],
// icon: '客户零件' icon: '客户零件'
// } }
// } }
] ]
} }

6
vue/src/views/pg-fis/basedate/assemblyCfg/detail.vue

@ -153,7 +153,7 @@ export default {
formTitle: "", formTitle: "",
drawer: false, drawer: false,
showExcelImport: false, showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 260, tableHeight: document.documentElement.clientHeight - 30,
isEdit: false, isEdit: false,
}; };
}, },
@ -161,7 +161,7 @@ export default {
var self = this; var self = this;
window.onresize = function () { window.onresize = function () {
var offsetHei = document.documentElement.clientHeight; var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 190; self.tableHeight = offsetHei - 30;
}; };
}, },
created() { created() {
@ -307,6 +307,6 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../styles/crmtable.scss"; @import "../../../pg-fis/styles/crmtable.scss";
</style> </style>

73
vue/src/views/pg-fis/basedate/assemblyCfg/index.vue

@ -133,12 +133,14 @@
@row-click="handleRowClick" @row-click="handleRowClick"
> >
<el-table-column type="selection" width="44px"></el-table-column> <el-table-column type="selection" width="44px"></el-table-column>
<el-table-column <el-table-column
label="ERP总成编码" label="ERP总成编码"
prop="erpAssemblyCode" prop="erpAssemblyCode"
sortable="custom" sortable="custom"
align="center" align="center"
width="420px"
width="180px"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span class="link-type" @click="handleDrawerOpen(scope.row)">{{ <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
@ -147,34 +149,18 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="ERP总成名称" v-for="(item, index) in getDefaultField"
prop="erpAssemblyName " :key="index"
:prop="item.prop"
:label="item.label"
:min-width="item.width"
:formatter="fieldFormatter"
sortable="custom" sortable="custom"
align="center" show-overflow-tooltip
:gutter="0"
> >
<template slot-scope="scope"> <template slot="header" slot-scope="scope">
<span>{{ scope.row.erpAssemblyName }}</span> {{ scope.column.label }}
</template>
</el-table-column>
<el-table-column
label="ERP总成版本"
prop="erpAssemblyVersion "
sortable="custom"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.erpAssemblyVersion }}</span>
</template>
</el-table-column>
<el-table-column
label="车型"
prop="vehicleModel "
sortable="custom"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.vehicleModel }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -320,7 +306,7 @@
<el-button type="text" @click="dialogFormVisible = false" <el-button type="text" @click="dialogFormVisible = false"
>取消</el-button >取消</el-button
> >
<el-button v-loading="formLoading" type="primary" @click="save" <el-button v-loading="formLoading" type="primary" @click="save()"
>确认</el-button >确认</el-button
> >
</div> </div>
@ -473,6 +459,7 @@ export default {
//console.log(offsetHei); //console.log(offsetHei);
let boxH = this.$refs.box.offsetHeight; let boxH = this.$refs.box.offsetHeight;
this.tableHeight = offsetHei - boxH - 57 - 79;//57footer79 this.tableHeight = offsetHei - boxH - 57 - 79;//57footer79
//this.$refs.form.rendered=true;
//console.log(boxH); //console.log(boxH);
//console.log(this.tableHeight); //console.log(this.tableHeight);
}); });
@ -484,16 +471,21 @@ export default {
computed: { computed: {
getDefaultField() { getDefaultField() {
var tempsTabs = []; var tempsTabs = [];
// tempsTabs.push({ tempsTabs.push({
// label: "ERP", label: "总成名称",
// prop: "erpAssemblyName ", prop: "erpAssemblyName",
// width: 220, width: 180,
// }); });
tempsTabs.push({ tempsTabs.push({
label: "ERP总成版本", label: "ERP总成版本",
prop: "erpAssemblyVersion ", prop: "erpAssemblyVersion",
width: 100, width: 100,
}); });
tempsTabs.push({
label: "车型代码",
prop: "vehicleModel",
width: 120,
});
return tempsTabs; return tempsTabs;
}, },
}, },
@ -512,6 +504,7 @@ export default {
done(); done();
}, },
save() { save() {
//console.log(this.$refs.form);
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
console.log("保存参数:" + JSON.stringify(this.form)); console.log("保存参数:" + JSON.stringify(this.form));
@ -561,7 +554,7 @@ export default {
handleCreate() { handleCreate() {
if (this.$refs["form"] !== undefined) { if (this.$refs["form"] !== undefined) {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs["form"] = []; //this.$refs["form"] = [];
this.$refs["form"].resetFields(); this.$refs["form"].resetFields();
}); });
} }
@ -680,10 +673,10 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery(refName) { resetQuery(refName) {
//this.$refs[refName].resetFields(); this.$refs[refName].resetFields();
this.listQuery.ErpAssemblyName = ""; this.listQuery.ErpAssemblyName = undefined;
this.listQuery.ErpAssemblyCode = ""; this.listQuery.ErpAssemblyCode = undefined;
this.listQuery.vehicleModelCode = ""; // this.listQuery.vehicleModelCode = "";
this.getvehicleModel(); this.getvehicleModel();
this.handleQuery(); this.handleQuery();
@ -885,7 +878,7 @@ export default {
// } // }
.divider1{ .divider1{
margin: 0 ; margin: 0 ;
width: 118%; //width: 100%;
} }
.formitem{ .formitem{
margin-bottom: 0; margin-bottom: 0;

10
vue/src/views/pg-fis/basedate/customerPartCfg/index.vue

@ -682,10 +682,10 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery(refName) { resetQuery(refName) {
this.listQuery.partCode = ""; this.listQuery.partCode = undefined;
this.listQuery.partName = ""; this.listQuery.partName = undefined;
this.listQuery.partType = ""; this.listQuery.partType = undefined;
this.listQuery.partType2 = ""; this.listQuery.partType2 = undefined;
this.$refs[refName].resetFields(); this.$refs[refName].resetFields();
this.getPartType() this.getPartType()
this.handleFilter(); this.handleFilter();
@ -763,7 +763,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../styles/crmtable.scss"; @import "../../../pg-fis/styles/crmtable.scss";
</style> </style>
<style lang="scss"> <style lang="scss">
.el-table .cell.el-tooltip { .el-table .cell.el-tooltip {

14
vue/src/views/pg-fis/basedate/logRemind/index.vue

@ -147,6 +147,7 @@ import Lockr from "lockr";
import moment from "moment"; import moment from "moment";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import { downloadFile } from "@/utils/crmindex.js"; import { downloadFile } from "@/utils/crmindex.js";
import qs from 'qs';
// //
const bomUnit = [ const bomUnit = [
@ -348,6 +349,7 @@ export default {
getList() { getList() {
this.listLoading = true; this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10; this.listQuery.SkipCount = (this.page - 1) * 10;
//this.listQuery.LogType = 1;//1: R100 2: M100
this.$axios this.$axios
.gets("/api/newjit/log-remind/list", this.listQuery) .gets("/api/newjit/log-remind/list", this.listQuery)
.then((response) => { .then((response) => {
@ -405,9 +407,9 @@ export default {
{ {
this.operationQuery.id = row.id; this.operationQuery.id = row.id;
this.$axios this.$axios
.posts("/api/newjit/log-remind/do-process", this.operationQuery) .posts("/api/newjit/log-remind/do-process",qs.stringify(this.operationQuery))
.then((response) => { .then((response) => {
if(response.status === "true") if(response.status === true)
{ {
this.$notify({ this.$notify({
title: "成功", title: "成功",
@ -421,7 +423,7 @@ export default {
this.$notify({ this.$notify({
title: "失败", title: "失败",
message: "处理失败!", message: "处理失败!",
type: "success", type: "warning",
duration: 2000, duration: 2000,
}); });
} }
@ -440,9 +442,9 @@ export default {
{ {
this.operationQuery.id = row.id; this.operationQuery.id = row.id;
this.$axios this.$axios
.posts("/api/newjit/log-remind/do-ignore", this.operationQuery) .posts("/api/newjit/log-remind/do-ignore",qs.stringify(this.operationQuery))
.then((response) => { .then((response) => {
if(response.status === "true") if(response.status === true)
{ {
this.$notify({ this.$notify({
title: "成功", title: "成功",
@ -456,7 +458,7 @@ export default {
this.$notify({ this.$notify({
title: "失败", title: "失败",
message: "忽略失败!", message: "忽略失败!",
type: "success", type: "warning",
duration: 2000, duration: 2000,
}); });
} }

2
vue/src/views/pg-fis/basedate/m100BIll/detail.vue

@ -349,6 +349,6 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../../ux/styles/crmtable.scss"; @import "../../../pg-fis/styles/crmtable.scss";
</style> </style>

30
vue/src/views/pg-fis/basedate/m100BIll/index.vue

@ -1105,22 +1105,22 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery(refName) { resetQuery(refName) {
//this.$refs[refName].resetFields(); this.$refs[refName].resetFields();
this.listQuery.billType = ""; this.listQuery.billType = undefined;
this.listQuery.productLine = ""; this.listQuery.productLine = undefined;
this.listQuery.version = ""; this.listQuery.version = undefined;
this.listQuery.HostSNBegin = ""; this.listQuery.HostSNBegin = undefined;
this.listQuery.HostSNEnd = ""; this.listQuery.HostSNEnd = undefined;
this.listQuery.KNRBegin = ""; this.listQuery.KNRBegin = undefined;
this.listQuery.KNREnd = ""; this.listQuery.KNREnd = undefined;
this.listQuery.VINBegin = ""; this.listQuery.VINBegin = undefined;
this.listQuery.VINEnd = ""; this.listQuery.VINEnd = undefined;
this.listQuery.OnlineTimeValue = []; this.listQuery.OnlineTimeValue = [];
this.listQuery.OnlineTimeBegin = ""; this.listQuery.OnlineTimeBegin = undefined;
this.listQuery.OnlineTimeEnd = ""; this.listQuery.OnlineTimeEnd = undefined;
this.listQuery.ReceiveTimeValue = []; this.listQuery.ReceiveTimeValue = [];
this.listQuery.ReceiveTimeBegin = ""; this.listQuery.ReceiveTimeBegin = undefined;
this.listQuery.ReceiveTimeEnd = ""; this.listQuery.ReceiveTimeEnd = undefined;
this.handleQuery(); this.handleQuery();
this.getProductLine(); this.getProductLine();
}, },
@ -1476,7 +1476,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../../ux/styles/crmtable.scss"; @import "../../../pg-fis/styles/crmtable.scss";
// /**/ // /**/
// .el-table >>> .DisabledSelection .cell .el-checkbox__inner { // .el-table >>> .DisabledSelection .cell .el-checkbox__inner {

6
vue/src/views/pg-fis/basedate/m100Online/detail.vue

@ -184,7 +184,7 @@ export default {
formTitle: "", formTitle: "",
drawer: false, drawer: false,
showExcelImport: false, showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 260, tableHeight: document.documentElement.clientHeight - 30,
isEdit: false, isEdit: false,
}; };
}, },
@ -192,7 +192,7 @@ export default {
var self = this; var self = this;
window.onresize = function () { window.onresize = function () {
var offsetHei = document.documentElement.clientHeight; var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 190; self.tableHeight = offsetHei - 30;
}; };
}, },
created() { created() {
@ -349,6 +349,6 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../../ux/styles/crmtable.scss"; @import "../../../pg-fis/styles/crmtable.scss";
</style> </style>

293
vue/src/views/pg-fis/basedate/m100Online/index.vue

@ -392,6 +392,7 @@ import Lockr from "lockr";
import moment from "moment"; import moment from "moment";
import Detail from "./detail.vue"; import Detail from "./detail.vue";
import { downloadFile } from "@/utils/crmindex.js"; import { downloadFile } from "@/utils/crmindex.js";
import qs from 'qs'
// //
const bomUnit = [ const bomUnit = [
@ -520,6 +521,9 @@ export default {
beginVin: undefined, beginVin: undefined,
endVin: undefined endVin: undefined
}, },
fileQuery:{
dataname:undefined,
},
form:{ form:{
details:[] details:[]
}, },
@ -691,25 +695,25 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery(refName) { resetQuery(refName) {
//this.$refs[refName].resetFields(); //this.$refs[refName].resetFields();
this.listQuery.billType = ""; this.listQuery.billType = undefined;
this.listQuery.productLine = ""; this.listQuery.productLine = undefined;
this.listQuery.Version = ""; this.listQuery.Version = undefined;
this.listQuery.serialNumBegin = ""; this.listQuery.serialNumBegin = undefined;
this.listQuery.serialNumEnd = ""; this.listQuery.serialNumEnd = undefined;
this.listQuery.HostSNBegin = ""; this.listQuery.HostSNBegin = undefined;
this.listQuery.HostSNEnd = ""; this.listQuery.HostSNEnd = undefined;
this.listQuery.KNRBegin = ""; this.listQuery.KNRBegin = undefined;
this.listQuery.KNREnd = ""; this.listQuery.KNREnd = undefined;
this.listQuery.VINBegin = ""; this.listQuery.VINBegin = undefined;
this.listQuery.VINEnd = ""; this.listQuery.VINEnd = undefined;
this.listQuery.OnlineTimeValue = []; this.listQuery.OnlineTimeValue = [];
this.listQuery.OnlineTimeBegin = ""; this.listQuery.OnlineTimeBegin = undefined;
this.listQuery.OnlineTimeEnd = ""; this.listQuery.OnlineTimeEnd = undefined;
this.listQuery.ReceiveTimeValue = []; this.listQuery.ReceiveTimeValue = [];
this.listQuery.ReceiveTimeBegin = ""; this.listQuery.ReceiveTimeBegin = undefined;
this.listQuery.ReceiveTimeEnd = ""; this.listQuery.ReceiveTimeEnd = undefined;
this.listQuery.state = []; this.listQuery.state = [];
this.listQuery.billStatus = ""; this.listQuery.billStatus = undefined;
this.handleQuery(); this.handleQuery();
this.getProductLine(); this.getProductLine();
}, },
@ -1087,6 +1091,7 @@ export default {
.then((response) => { .then((response) => {
console.log("打印门板装箱单"); console.log("打印门板装箱单");
console.log(response); console.log(response);
console.log(response.status);
if(response.status === false) if(response.status === false)
{ {
this.$message({ this.$message({
@ -1097,8 +1102,119 @@ export default {
} }
else else
{ {
//grid++jsonpdfstream //grid++jsonbase64
this.printpdf(pdfstream);// //this.fileQuery.report = "menban";
this.fileQuery.dataname = JSON.stringify(response.item);
this.fileQuery.dataname = `[{
"masters": [{
"id": "1",
"billNum": " 10000000009",
"billSerialNum": "04",
"billLocation": "左",
"providerCode": "0709FAW-VW7XH",
"partType": "C8 DP",
"capacity": "12",
"printDate": "2021-11-27 10:12:04",
"printType": 0,
"productLine": "01",
"beginVin": "LFV2A24K2M3303677",
"endVin": "LFV2A24K2M3303792"
},
{
"id": "2",
"billNum": " 10000000010",
"billSerialNum": "04",
"billLocation": "右",
"providerCode": "0709FAW-VW7XH",
"partType": "C8 DP",
"capacity": "12",
"printDate": "2021-11-27 10:12:04",
"printType": 0,
"productLine": "01",
"beginVin": "LFV2A24K2M3303677",
"endVin": "LFV2A24K2M3303792"
}
]
"details": [{
"id": "1",
"billNum": " 10000000009",
"knr": " 21321501481001",
"vin": "LFV2A24K2M3303677",
"hostSN": 85,
"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
"topBoxPositionNum": "01",
"topSAPMaterialNum": "30052525",
"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ(黑PVC多孔低扬无电镀)",
"belowSAPMaterialNum": "30052524",
"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ(黑PVC多孔低扬无电镀)"
},
{
"id": "1",
"billNum": " 10000000009",
"knr": " 21321501481001",
"vin": "LFV2A24K2M3303680",
"hostSN": 86,
"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
"topBoxPositionNum": "02",
"topSAPMaterialNum": "30052525",
"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ(黑PVC多孔低扬无电镀)",
"belowSAPMaterialNum": "30052524",
"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ(黑PVC多孔低扬无电镀)"
},
{
"id": "1",
"billNum": " 10000000009",
"knr": " 21321501481001",
"vin": "LFV2A24K2M3303694",
"hostSN": 87,
"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
"topBoxPositionNum": "03",
"topSAPMaterialNum": "30052525",
"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ(黑PVC多孔低扬无电镀)",
"belowSAPMaterialNum": "30052524",
"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ(黑PVC多孔低扬无电镀)"
},
{
"id": "2",
"billNum": " 10000000010",
"knr": " 21321501481001",
"vin": "LFV2A24K2M3303713",
"hostSN": 88,
"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
"topBoxPositionNum": "04",
"topSAPMaterialNum": "30052525",
"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ(黑PVC多孔低扬无电镀)",
"belowSAPMaterialNum": "30052524",
"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ(黑PVC多孔低扬无电镀)"
},
{
"id": "2",
"billNum": " 10000000010",
"knr": " 21321502851001",
"vin": "LFV2A24K2M3303727",
"hostSN": 89,
"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
"topBoxPositionNum": "05",
"topSAPMaterialNum": "30052525",
"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ(黑PVC多孔低扬无电镀)",
"belowSAPMaterialNum": "30052524",
"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ(黑PVC多孔低扬无电镀)"
}
]
}]`
//this.fileQuery.dataname = "";
console.log("打印json");
console.log(this.fileQuery.dataname);
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=menban",qs.stringify(this.fileQuery))
.then((response) => {
console.log("获取文件base64编码");
console.log(response);
this.printpdf(response);//
})
} }
}) })
@ -1132,7 +1248,7 @@ export default {
.catch(() => { .catch(() => {
}); });
} }
else else//
{ {
//productType //productType
if(this.listQuery.productType === 1)// if(this.listQuery.productType === 1)//
@ -1155,8 +1271,119 @@ export default {
} }
else else
{ {
//grid++jsonpdfstream //grid++jsonbase64
this.printpdf(pdfstream);// //this.fileQuery.report = "menban";
this.fileQuery.dataname = JSON.stringify(response.item);
this.fileQuery.dataname = `[{
"masters": [{
"id": "1",
"billNum": " 10000000009",
"billSerialNum": "04",
"billLocation": "左",
"providerCode": "0709FAW-VW7XH",
"partType": "C8 DP",
"capacity": "12",
"printDate": "2021-11-27 10:12:04",
"printType": 0,
"productLine": "01",
"beginVin": "LFV2A24K2M3303677",
"endVin": "LFV2A24K2M3303792"
},
{
"id": "2",
"billNum": " 10000000010",
"billSerialNum": "04",
"billLocation": "右",
"providerCode": "0709FAW-VW7XH",
"partType": "C8 DP",
"capacity": "12",
"printDate": "2021-11-27 10:12:04",
"printType": 0,
"productLine": "01",
"beginVin": "LFV2A24K2M3303677",
"endVin": "LFV2A24K2M3303792"
}
]
"details": [{
"id": "1",
"billNum": " 10000000009",
"knr": " 21321501481001",
"vin": "LFV2A24K2M3303677",
"hostSN": 85,
"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
"topBoxPositionNum": "01",
"topSAPMaterialNum": "30052525",
"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ(黑PVC多孔低扬无电镀)",
"belowSAPMaterialNum": "30052524",
"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ(黑PVC多孔低扬无电镀)"
},
{
"id": "1",
"billNum": " 10000000009",
"knr": " 21321501481001",
"vin": "LFV2A24K2M3303680",
"hostSN": 86,
"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
"topBoxPositionNum": "02",
"topSAPMaterialNum": "30052525",
"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ(黑PVC多孔低扬无电镀)",
"belowSAPMaterialNum": "30052524",
"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ(黑PVC多孔低扬无电镀)"
},
{
"id": "1",
"billNum": " 10000000009",
"knr": " 21321501481001",
"vin": "LFV2A24K2M3303694",
"hostSN": 87,
"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
"topBoxPositionNum": "03",
"topSAPMaterialNum": "30052525",
"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ(黑PVC多孔低扬无电镀)",
"belowSAPMaterialNum": "30052524",
"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ(黑PVC多孔低扬无电镀)"
},
{
"id": "2",
"billNum": " 10000000010",
"knr": " 21321501481001",
"vin": "LFV2A24K2M3303713",
"hostSN": 88,
"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
"topBoxPositionNum": "04",
"topSAPMaterialNum": "30052525",
"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ(黑PVC多孔低扬无电镀)",
"belowSAPMaterialNum": "30052524",
"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ(黑PVC多孔低扬无电镀)"
},
{
"id": "2",
"billNum": " 10000000010",
"knr": " 21321502851001",
"vin": "LFV2A24K2M3303727",
"hostSN": 89,
"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
"topBoxPositionNum": "05",
"topSAPMaterialNum": "30052525",
"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ(黑PVC多孔低扬无电镀)",
"belowSAPMaterialNum": "30052524",
"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ(黑PVC多孔低扬无电镀)"
}
]
}]`
//this.fileQuery.dataname = "";
console.log("打印json");
console.log(this.fileQuery.dataname);
this.$axios
.posts(
"/Handlers/Handler1.ashx?report=menban",qs.stringify(this.fileQuery))
.then((response) => {
console.log("获取文件base64编码");
console.log(response);
this.printpdf(response);//
})
} }
}) })
.catch(() => { .catch(() => {
@ -1340,10 +1567,10 @@ export default {
this.pdfLoading = false this.pdfLoading = false
}, 100) }, 100)
}, },
printpdf(blob) printpdf(dataResult)
{ {
//dataResultbase64 //dataResultbase64
//let blob = this.dataURLtoBlob(dataResult); let blob = this.dataURLtoBlob(dataResult);
var date = (new Date()).getTime() var date = (new Date()).getTime()
var ifr = document.createElement('iframe') var ifr = document.createElement('iframe')
ifr.style.frameborder = 'no' ifr.style.frameborder = 'no'
@ -1356,13 +1583,31 @@ export default {
this.doPrint('printPdf' + date) this.doPrint('printPdf' + date)
window.URL.revokeObjectURL(ifr.src) // URL window.URL.revokeObjectURL(ifr.src) // URL
}, },
httpPost(URL, PARAMS) {
var temp = document.createElement("form");
temp.action = URL;
temp.method = "post";
temp.style.display = "none";
for (var x in PARAMS) {
var opt = document.createElement("textarea");
opt.name = x;
opt.value = PARAMS[x];
temp.appendChild(opt);
}
document.body.appendChild(temp);
temp.submit();
return temp;
}
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../../ux/styles/crmtable.scss"; @import "../../../pg-fis/styles/crmtable.scss";
// /**/ // /**/
// .el-table >>> .DisabledSelection .cell .el-checkbox__inner { // .el-table >>> .DisabledSelection .cell .el-checkbox__inner {

2
vue/src/views/pg-fis/basedate/productLine/index.vue

@ -955,7 +955,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../styles/crmtable.scss"; @import "../../../pg-fis/styles/crmtable.scss";
</style> </style>
<style lang="scss"> <style lang="scss">
.el-table .cell.el-tooltip { .el-table .cell.el-tooltip {

6
vue/src/views/pg-fis/basedate/r100Online/detail.vue

@ -184,7 +184,7 @@ export default {
formTitle: "", formTitle: "",
drawer: false, drawer: false,
showExcelImport: false, showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 260, tableHeight: document.documentElement.clientHeight - 30,
isEdit: false, isEdit: false,
}; };
}, },
@ -192,7 +192,7 @@ export default {
var self = this; var self = this;
window.onresize = function () { window.onresize = function () {
var offsetHei = document.documentElement.clientHeight; var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 190; self.tableHeight = offsetHei - 30;
}; };
}, },
created() { created() {
@ -349,6 +349,6 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../../ux/styles/crmtable.scss"; @import "../../../pg-fis/styles/crmtable.scss";
</style> </style>

32
vue/src/views/pg-fis/basedate/r100Online/index.vue

@ -212,7 +212,7 @@
<el-table-column <el-table-column
label="KNR" label="KNR"
prop="knr " prop="knr"
sortable="custom" sortable="custom"
align="center" align="center"
@ -537,23 +537,23 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery(refName) { resetQuery(refName) {
//this.$refs[refName].resetFields(); //this.$refs[refName].resetFields();
this.listQuery.billType = ""; this.listQuery.billType = undefined;
this.listQuery.productLine = ""; this.listQuery.productLine = undefined;
this.listQuery.Version = ""; this.listQuery.Version = undefined;
this.listQuery.HostSNBegin = ""; this.listQuery.HostSNBegin = undefined;
this.listQuery.HostSNEnd = ""; this.listQuery.HostSNEnd = undefined;
this.listQuery.KNRBegin = ""; this.listQuery.KNRBegin = undefined;
this.listQuery.KNREnd = ""; this.listQuery.KNREnd = undefined;
//this.listQuery.VINBegin = ""; this.listQuery.VINBegin = undefined;
this.listQuery.VINEnd = ""; this.listQuery.VINEnd = undefined;
this.listQuery.OnlineTimeValue = []; this.listQuery.OnlineTimeValue = [];
this.listQuery.OnlineTimeBegin = ""; this.listQuery.OnlineTimeBegin = undefined;
this.listQuery.OnlineTimeEnd = ""; this.listQuery.OnlineTimeEnd = undefined;
this.listQuery.ReceiveTimeValue = []; this.listQuery.ReceiveTimeValue = [];
this.listQuery.ReceiveTimeBegin = ""; this.listQuery.ReceiveTimeBegin = undefined;
this.listQuery.ReceiveTimeEnd = ""; this.listQuery.ReceiveTimeEnd = undefined;
this.listQuery.state = []; this.listQuery.state = [];
this.listQuery.billStatus = ""; this.listQuery.billStatus = undefined;
this.handleQuery(); this.handleQuery();
this.getProductLine(); this.getProductLine();
}, },
@ -768,7 +768,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../../ux/styles/crmtable.scss"; @import "../../../pg-fis/styles/crmtable.scss";
// /**/ // /**/
// .el-table >>> .DisabledSelection .cell .el-checkbox__inner { // .el-table >>> .DisabledSelection .cell .el-checkbox__inner {

4
vue/src/views/pg-fis/basedate/repeatR100/detail.vue

@ -122,7 +122,7 @@ export default {
formTitle: "", formTitle: "",
drawer: false, drawer: false,
showExcelImport: false, showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 260, tableHeight: document.documentElement.clientHeight - 30,
isEdit: false, isEdit: false,
}; };
}, },
@ -130,7 +130,7 @@ export default {
var self = this; var self = this;
window.onresize = function () { window.onresize = function () {
var offsetHei = document.documentElement.clientHeight; var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 190; self.tableHeight = offsetHei - 30;
}; };
}, },
created() { created() {

103
vue/src/views/pg-fis/basedate/repeatR100/index.vue

@ -29,20 +29,40 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="KNR" prop="KNR"> <el-form-item label="KNR:" prop="KNRBegin">
<el-input <el-input
v-model="listQuery.KNR" v-model="listQuery.KNRBegin"
placeholder="请输入KNR号" placeholder=""
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="底盘号" prop="VIN"> <el-form-item label="-" prop="KNREnd">
<el-input <el-input
v-model="listQuery.VIN" v-model="listQuery.KNREnd"
placeholder="请输入底盘号" placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="底盘号:" prop="VINBegin">
<el-input
v-model="listQuery.VINBegin"
placeholder=""
clearable
size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="-" prop="VINEnd">
<el-input
v-model="listQuery.VINEnd"
placeholder=""
clearable clearable
size="small" size="small"
style="width: 240px" style="width: 240px"
@ -74,7 +94,7 @@
<el-form-item label="上线日期"> <el-form-item label="上线日期">
<el-date-picker <el-date-picker
v-model="OnlineTimeVale" v-model="OnlineTimeValue"
size="small" size="small"
style="width: 240px" style="width: 240px"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -86,7 +106,7 @@
</el-form-item> </el-form-item>
<el-form-item label="接收日期"> <el-form-item label="接收日期">
<el-date-picker <el-date-picker
v-model="ReceiveTimeVale" v-model="ReceiveTimeValue"
size="small" size="small"
style="width: 240px" style="width: 240px"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -265,8 +285,8 @@ export default {
return { return {
crmType: "bomdatabase", crmType: "bomdatabase",
customerInfos: [], customerInfos: [],
OnlineTimeVale: [], OnlineTimeValue: [],
ReceiveTimeVale: [], ReceiveTimeValue: [],
versionValue: "", versionValue: "",
versionList: [], // versionList: [], //
searchContent: "", // searchContent: "", //
@ -381,29 +401,29 @@ export default {
/** 导出功能 */ /** 导出功能 */
handleDownload() { handleDownload() {
this.listLoading = true; this.listLoading = true;
// if (this.OnlineTimeVale != []) { // if (this.OnlineTimeValue != []) {
// this.listQuery.OnlineTimeBegin = this.OnlineTimeVale[0]; // this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0];
// this.listQuery.OnlineTimeEnd = this.OnlineTimeVale[1]; // this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1];
// } // }
// if (this.ReceiveTimeVale != []) { // if (this.ReceiveTimeValue != []) {
// this.listQuery.ReceiveTimeBegin = this.ReceiveTimeVale[0]; // this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue[0];
// this.listQuery.ReceiveTimeEnd = this.ReceiveTimeVale[1]; // this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1];
// } // }
if (this.OnlineTimeVale != []) { if (this.OnlineTimeValue != []) {
this.listQuery.OnlineTimeBegin = this.OnlineTimeVale this.listQuery.OnlineTimeBegin = this.OnlineTimeValue
? this.OnlineTimeVale[0] || undefined ? this.OnlineTimeValue[0] || undefined
: undefined; : undefined;
this.listQuery.OnlineTimeEnd = this.OnlineTimeVale this.listQuery.OnlineTimeEnd = this.OnlineTimeValue
? this.OnlineTimeVale[1] || undefined ? this.OnlineTimeValue[1] || undefined
: undefined; : undefined;
} }
if (this.ReceiveTimeVale != []) { if (this.ReceiveTimeValue != []) {
this.listQuery.ReceiveTimeBegin = this.ReceiveTimeVale this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue
? this.ReceiveTimeVale[0] || undefined ? this.ReceiveTimeValue[0] || undefined
: undefined; : undefined;
this.listQuery.ReceiveTimeEnd = this.ReceiveTimeVale this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue
? this.ReceiveTimeVale[1] || undefined ? this.ReceiveTimeValue[1] || undefined
: undefined; : undefined;
} }
console.log("重复报文导出条件:" + JSON.stringify(this.listQuery)); console.log("重复报文导出条件:" + JSON.stringify(this.listQuery));
@ -443,8 +463,23 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery(refName) { resetQuery(refName) {
this.OnlineTimeVale = []; this.OnlineTimeValue = [];
this.ReceiveTimeVale = []; this.ReceiveTimeValue = [];
//this.listQuery.billType = "";
this.listQuery.productLine = undefined;
this.listQuery.Version = undefined;
this.listQuery.HostSNBegin = undefined;
this.listQuery.HostSNEnd = undefined;
this.listQuery.KNRBegin = undefined;
this.listQuery.KNREnd = undefined;
this.listQuery.VINBegin = undefined;
this.listQuery.VINEnd = undefined;
this.listQuery.OnlineTimeBegin = undefined;
this.listQuery.OnlineTimeEnd = undefined;
this.listQuery.ReceiveTimeBegin = undefined;
this.listQuery.ReceiveTimeEnd = undefined;
//this.listQuery.billStatus = "";
this.listQuery.VehicleModelCode = undefined;
this.$refs[refName].resetFields(); this.$refs[refName].resetFields();
this.handleQuery(); this.handleQuery();
}, },
@ -496,13 +531,13 @@ export default {
getList() { getList() {
this.listLoading = true; this.listLoading = true;
this.listQuery.SkipCount = (this.page - 1) * 10; this.listQuery.SkipCount = (this.page - 1) * 10;
if (this.OnlineTimeVale != []) { if (this.OnlineTimeValue != []) {
this.listQuery.OnlineTimeBegin = this.OnlineTimeVale[0]; this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0];
this.listQuery.OnlineTimeEnd = this.OnlineTimeVale[1]; this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1];
} }
if (this.ReceiveTimeVale != []) { if (this.ReceiveTimeValue != []) {
this.listQuery.ReceiveTimeBegin = this.ReceiveTimeVale[0]; this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue[0];
this.listQuery.ReceiveTimeEnd = this.ReceiveTimeVale[1]; this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1];
} }
this.$axios this.$axios
.gets("/api/newjit/repeat-m100/list", this.listQuery) .gets("/api/newjit/repeat-m100/list", this.listQuery)

6
vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue

@ -139,7 +139,7 @@ export default {
formTitle: "", formTitle: "",
drawer: false, drawer: false,
showExcelImport: false, showExcelImport: false,
tableHeight: document.documentElement.clientHeight - 260, tableHeight: document.documentElement.clientHeight - 30,
isEdit: false, isEdit: false,
}; };
}, },
@ -147,7 +147,7 @@ export default {
var self = this; var self = this;
window.onresize = function () { window.onresize = function () {
var offsetHei = document.documentElement.clientHeight; var offsetHei = document.documentElement.clientHeight;
self.tableHeight = offsetHei - 190; self.tableHeight = offsetHei - 30;
}; };
}, },
created() { created() {
@ -261,7 +261,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../styles/crmtable.scss"; @import "../../../pg-fis/styles/crmtable.scss";
</style> </style>
<style lang="scss"> <style lang="scss">

24
vue/src/views/pg-fis/basedate/unknownAssembly/index.vue

@ -30,14 +30,20 @@
</el-form-item> </el-form-item>
<el-form-item label="车型代码" prop="VehicleModelCode"> <el-form-item label="车型代码" prop="VehicleModelCode">
<el-input <el-select
v-model="listQuery.VehicleModelCode" v-model="listQuery.vehicleModelCode"
placeholder="请输入车型代码"
clearable clearable
size="small" placeholder="请选择"
style="width: 240px" size="medium"
@keyup.enter.native="handleQuery" style="margin-right: 15px"
/> @change="valueselectChange"
>
<el-option
v-for="item in vehicleModelList"
:key="item.id"
:label="item.dicItemName"
:value="item.dicItemCode"/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="版本" prop="Version"> <el-form-item label="版本" prop="Version">
@ -532,6 +538,7 @@ export default {
}; };
}, },
created() { created() {
this.getvehicleModel();
this.getList(); this.getList();
}, },
computed: { computed: {
@ -1480,12 +1487,13 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
valueselectChange(){},
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../../ux/styles/crmtable.scss"; @import "../../../pg-fis/styles/crmtable.scss";
</style> </style>

36
vue/src/views/pg-fis/basedate/weldingAssembly/index.vue

@ -605,24 +605,24 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery(refName) { resetQuery(refName) {
//this.$refs[refName].resetFields(); this.$refs[refName].resetFields();
this.listQuery.billType = ""; this.listQuery.billType = undefined;
this.listQuery.productLine = ""; this.listQuery.productLine = undefined;
this.listQuery.Version = ""; this.listQuery.Version = undefined;
this.listQuery.serialNumBegin = ""; this.listQuery.serialNumBegin = undefined;
this.listQuery.serialNumEnd = ""; this.listQuery.serialNumEnd = undefined;
this.listQuery.HostSNBegin = ""; this.listQuery.HostSNBegin = undefined;
this.listQuery.HostSNEnd = ""; this.listQuery.HostSNEnd = undefined;
this.listQuery.KNRBegin = ""; this.listQuery.KNRBegin = undefined;
this.listQuery.KNREnd = ""; this.listQuery.KNREnd = undefined;
this.listQuery.VINBegin = ""; this.listQuery.VINBegin = undefined;
this.listQuery.VINEnd = ""; this.listQuery.VINEnd = undefined;
this.listQuery.OnlineTimeValue = ""; this.listQuery.OnlineTimeValue = [];
this.listQuery.OnlineTimeBegin = ""; this.listQuery.OnlineTimeBegin = undefined;
this.listQuery.OnlineTimeEnd = ""; this.listQuery.OnlineTimeEnd = undefined;
this.listQuery.ReceiveTimeValue = ""; this.listQuery.ReceiveTimeValue = [];
this.listQuery.ReceiveTimeBegin = ""; this.listQuery.ReceiveTimeBegin = undefined;
this.listQuery.ReceiveTimeEnd = ""; this.listQuery.ReceiveTimeEnd = undefined;
this.listQuery.cstate = []; this.listQuery.cstate = [];
this.handleQuery(); this.handleQuery();
this.getProductLine(); this.getProductLine();

57
vue/src/views/pg-fis/components/mixins/message_table.js

@ -0,0 +1,57 @@
export default {
components: {},
data() {
return {
loading: false, // 加载动画
tableHeight: document.documentElement.clientHeight - 300, // 表的高度
total: 0
}
},
computed: {
// 展示options下拉选择
showOptions() {
if (this.infoType == 'putInPoolRemind') {
return false
}
return true
}
},
mounted() {
this.$bus.on('message-scroll', tableHeight => {
this.tableHeight = tableHeight
})
this.$bus.on('examine-handle-bus', () => {
})
/** 控制table的高度 */
window.onresize = () => {
this.updateTableHeight()
}
},
beforeDestroy() {
this.$bus.off('message-scroll')
this.$bus.off('examine-handle-bus')
if (document.getElementById('crm-table')) {
document.getElementById('crm-table').removeEventListener('click', e => {
e.stopPropagation()
})
}
},
methods: {
/**
* 更新表高
*/
updateTableHeight() {
var offsetHei = document.documentElement.clientHeight
var removeHeight = Object.keys(this.filterObj).length > 0 ? 360 : 300
this.tableHeight = offsetHei - removeHeight
}
}
}

59
vue/src/views/pg-fis/styles/crmtable.scss

@ -38,8 +38,8 @@
.right-more-item { .right-more-item {
cursor: pointer; cursor: pointer;
border: 1px solid #dcdfe6; border: 1px solid #e6e1dc;
background-color: white; background-color: rgb(255, 255, 255);
font-size: 13px; font-size: 13px;
color: #777; color: #777;
padding: 0 12px; padding: 0 12px;
@ -48,40 +48,29 @@
} }
} }
.el-input {
display: inline-block;
width: 50%;
input {
background: transparent;
border: 0px;
-webkit-appearance: none;
border-radius: 0px;
padding: 12px;
height: 47px;
caret-color: #1a1818;
&:-webkit-autofill {
box-shadow: 0 0 0px 1000px #e5e5e5 inset !important;
-webkit-text-fill-color: #454545 !important;
color:#454545 !important;
}
}
}
//表尾 上一页按钮 //表尾 上一页按钮
.table-footer { .table-footer {
padding: 1px 20px; padding: 1px 20px;
} }
// .el-table /deep/ thead th {
// font-weight: 400;
// font-size: 12px;
// }
.el-table /deep/ thead th { .el-table /deep/ thead th {
background-color: #fafdff;
font-weight: 400; font-weight: 400;
border-color: #E6E6E6;
color: #475059;
font-size: 12px; font-size: 12px;
} }
.el-table /deep/ tbody tr td { .el-table /deep/ tbody tr td {
font-size: 12px; border-top-color: transparent;
border-left-color: transparent;
border-right-color: transparent;
border-bottom-color: #E6E6E6;
font-size: 13px;
} }
.el-table /deep/ thead .el-checkbox { .el-table /deep/ thead .el-checkbox {
@ -96,6 +85,16 @@ body .el-table th.gutter {
height: calc(100% - 58px) !important; height: calc(100% - 58px) !important;
} }
.n-table--border {
border-color: #e6e6e6;
border-left-color: transparent;
border-right-color: transparent;
}
.n-table--border::after {
display: none;
}
.el-dropdown-link { .el-dropdown-link {
cursor: pointer; cursor: pointer;
color: #409EFF; color: #409EFF;
@ -108,4 +107,14 @@ body .el-table th.gutter {
color: #8492a6; color: #8492a6;
font-size: 14px; font-size: 14px;
margin-bottom: 20px; margin-bottom: 20px;
}
.link-type,
.link-type:focus {
color: #337ab7;
cursor: pointer;
&:hover {
color: rgb(32, 160, 255);
}
} }
Loading…
Cancel
Save