zhibinlv
/
QRAPI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更新版本

master
赵新宇 2 weeks ago
parent
c26367e838
commit
b9a69412c3
16 changed files with 212 additions and 102 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 162
      API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_SINV_DATA_DTO.cs
  2. 97
      API/TaskManager.Contracts/Dtos/Dtos.cs
  3. 3
      API/Wood.Service/Controllers/CherySupplierConDateService.cs
  4. 3
      API/Wood.Service/Controllers/CherySupplierConMmrpService.cs
  5. 3
      API/Wood.Service/Controllers/CherySupplierConPoService.cs
  6. 4
      API/Wood.Service/Controllers/CherySupplierDelStateService.cs
  7. 5
      API/Wood.Service/Controllers/CherySupplierInvDataService.cs
  8. 5
      API/Wood.Service/Controllers/CherySupplierMrpDataService.cs
  9. 5
      API/Wood.Service/Controllers/CherySupplierMrpService.cs
  10. 4
      API/Wood.Service/Controllers/CherySupplierMrpWarningService.cs
  11. 5
      API/Wood.Service/Controllers/CherySupplierPorHSCHEDULService.cs
  12. 3
      API/Wood.Service/Controllers/CherySupplierProCSCHEDULService.cs
  13. 3
      API/Wood.Service/Controllers/CherySupplierProPlanService.cs
  14. 5
      API/Wood.Service/Controllers/CherySupplierProTSCHEDULService.cs
  15. 5
      API/Wood.Service/Controllers/CherySupplierReturnService.cs
  16. 2
      API/Wood.Service/Controllers/CherySupplierSinvDataService.cs

162
API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_SINV_DATA_DTO.cs
View File

@ -5,86 +5,86 @@ namespace TaskManager.Entity
/// <summary>
/// 供应商共享库存
/// </summary>
public class SUPPLIER_SINV_DATA_DTO
{
/// <summary>
/// 供应商代码
/// </summary>
[ExporterHeader(DisplayName = "供应商代码")]
[ImporterHeader(Name = "供应商代码")]
public string SupplierCode { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
[ExporterHeader(DisplayName = "供应商名称")]
[ImporterHeader(Name = "供应商名称")]
public string SupplierName { get; set; }
/// <summary>
/// 零件号
/// </summary>
[ExporterHeader(DisplayName = "零件号")]
[ImporterHeader(Name = "零件号")]
public string MaterialCode { get; set; }
/// <summary>
/// 零件名称
/// </summary>
[ExporterHeader(DisplayName = "零件名称")]
[ImporterHeader(Name = "零件名称")]
public string MaterialDescription { get; set; }
/// <summary>
/// 物料类型(成品,半成品,原材料)
/// </summary>
[ExporterHeader(DisplayName = "物料类型")]
[ImporterHeader(Name = "物料类型")]
public string MaterialType { get; set; }
/// <summary>
/// 当前库存数量
/// </summary>
[ExporterHeader(DisplayName = "当前库存数量")]
[ImporterHeader(Name = "当前库存数量")]
public decimal QuantityCurrent { get; set; }
/// <summary>
/// 原材料在途数量
/// </summary>
[ExporterHeader(DisplayName = "原材料在途数量")]
[ImporterHeader(Name = "原材料在途数量")]
public decimal QuantityPlan { get; set; }
/// <summary>
/// 库存状态(生产件,呆滞件,备件,KD件)
/// </summary>
[ExporterHeader(DisplayName = "库存状态")]
[ImporterHeader(Name = "库存状态")]
public string InventoryStatus { get; set; }
/// <summary>
/// 安全库存
/// </summary>
[ExporterHeader(DisplayName = "安全库存")]
[ImporterHeader(Name = "安全库存")]
public decimal SafetyStock { get; set; }
/// <summary>
/// 生产/采购周期:成品即半成品为生产周期（天），原材料为采购周期（天）
/// </summary>
[ExporterHeader(DisplayName = "生产/采购周期")]
[ImporterHeader(Name = "生产/采购周期")]
public string ProductionCycle { get; set; }
/// <summary>
/// 库存更新时间-格式：yyyy-MM-ddHH:mm:ss
/// </summary>
[ExporterHeader(DisplayName = "库存更新时间")]
[ImporterHeader(Name = "库存更新时间")]
public string DataUpdateTime { get; set; }
/// <summary>
/// 批次
/// </summary>
[ExporterHeader(DisplayName = "批次")]
[ImporterHeader(Name = "批次")]
public string? SupplierBatch { get; set; }
/// <summary>
/// 有效期截止日期 非必填
/// </summary>
[ExporterHeader(DisplayName = "有效期截止日期")]
[ImporterHeader(Name = "有效期截止日期")]
public string? SupplieryxqDate { get; set; }
}
//public class SUPPLIER_SINV_DATA_DTO
//{
// /// <summary>
// /// 供应商代码
// /// </summary>
// [ExporterHeader(DisplayName = "供应商代码")]
// [ImporterHeader(Name = "供应商代码")]
// public string SupplierCode { get; set; }
// /// <summary>
// /// 供应商名称
// /// </summary>
// [ExporterHeader(DisplayName = "供应商名称")]
// [ImporterHeader(Name = "供应商名称")]
// public string SupplierName { get; set; }
// /// <summary>
// /// 零件号
// /// </summary>
// [ExporterHeader(DisplayName = "零件号")]
// [ImporterHeader(Name = "零件号")]
// public string MaterialCode { get; set; }
// /// <summary>
// /// 零件名称
// /// </summary>
// [ExporterHeader(DisplayName = "零件名称")]
// [ImporterHeader(Name = "零件名称")]
// public string MaterialDescription { get; set; }
// /// <summary>
// /// 物料类型(成品,半成品,原材料)
// /// </summary>
// [ExporterHeader(DisplayName = "物料类型")]
// [ImporterHeader(Name = "物料类型")]
// public string MaterialType { get; set; }
// /// <summary>
// /// 当前库存数量
// /// </summary>
// [ExporterHeader(DisplayName = "当前库存数量")]
// [ImporterHeader(Name = "当前库存数量")]
// public decimal QuantityCurrent { get; set; }
// /// <summary>
// /// 原材料在途数量
// /// </summary>
// [ExporterHeader(DisplayName = "原材料在途数量")]
// [ImporterHeader(Name = "原材料在途数量")]
// public decimal QuantityPlan { get; set; }
// /// <summary>
// /// 库存状态(生产件,呆滞件,备件,KD件)
// /// </summary>
// [ExporterHeader(DisplayName = "库存状态")]
// [ImporterHeader(Name = "库存状态")]
// public string InventoryStatus { get; set; }
// /// <summary>
// /// 安全库存
// /// </summary>
// [ExporterHeader(DisplayName = "安全库存")]
// [ImporterHeader(Name = "安全库存")]
// public decimal SafetyStock { get; set; }
// /// <summary>
// /// 生产/采购周期:成品即半成品为生产周期（天），原材料为采购周期（天）
// /// </summary>
// [ExporterHeader(DisplayName = "生产/采购周期")]
// [ImporterHeader(Name = "生产/采购周期")]
// public string ProductionCycle { get; set; }
// /// <summary>
// /// 库存更新时间-格式：yyyy-MM-ddHH:mm:ss
// /// </summary>
// [ExporterHeader(DisplayName = "库存更新时间")]
// [ImporterHeader(Name = "库存更新时间")]
// public string DataUpdateTime { get; set; }
// /// <summary>
// /// 批次
// /// </summary>
// [ExporterHeader(DisplayName = "批次")]
// [ImporterHeader(Name = "批次")]
// public string? SupplierBatch { get; set; }
// /// <summary>
// /// 有效期截止日期 非必填
// /// </summary>
// [ExporterHeader(DisplayName = "有效期截止日期")]
// [ImporterHeader(Name = "有效期截止日期")]
// public string? SupplieryxqDate { get; set; }
//}
}

97
API/TaskManager.Contracts/Dtos/Dtos.cs
View File

@ -1493,19 +1493,90 @@ public class SUPPLIER_MRP_WARNING_DETAIL_DTO : CherryReadBaseEntityDto
public class SUPPLIER_SINV_DATA_DETAIL_DTO:CherryReadBaseEntityDto
{
public string SupplierCode { get; set; }
public string SupplierName { get; set; }
public string MaterialCode { get; set; }
public string MaterialDescription { get; set; }
public string MaterialType { get; set; }
public int QuantityCurrent { get; set; }
public int QuantityPlan { get; set; }
public string InventoryStatus { get; set; }
public int SafetyStock { get; set; }
public string ProductionCycle { get; set; }
public string DataUpdateTime { get; set; }
public string SupplierBatch { get; set; }
public string SupplieryxqDate { get; set; }
/// <summary>
/// 供应商共享库存
/// </summary>
public class SUPPLIER_SINV_DATA_DTO
{
/// <summary>
/// 供应商代码
/// </summary>
[ExporterHeader(DisplayName = "供应商代码")]
[ImporterHeader(Name = "供应商代码")]
public string SupplierCode { get; set; }
/// <summary>
/// 供应商名称
/// </summary>
[ExporterHeader(DisplayName = "供应商名称")]
[ImporterHeader(Name = "供应商名称")]
public string SupplierName { get; set; }
/// <summary>
/// 零件号
/// </summary>
[ExporterHeader(DisplayName = "零件号")]
[ImporterHeader(Name = "零件号")]
public string MaterialCode { get; set; }
/// <summary>
/// 零件名称
/// </summary>
[ExporterHeader(DisplayName = "零件名称")]
[ImporterHeader(Name = "零件名称")]
public string MaterialDescription { get; set; }
/// <summary>
/// 物料类型(成品,半成品,原材料)
/// </summary>
[ExporterHeader(DisplayName = "物料类型")]
[ImporterHeader(Name = "物料类型")]
public string MaterialType { get; set; }
/// <summary>
/// 当前库存数量
/// </summary>
[ExporterHeader(DisplayName = "当前库存数量")]
[ImporterHeader(Name = "当前库存数量")]
public decimal QuantityCurrent { get; set; }
/// <summary>
/// 原材料在途数量
/// </summary>
[ExporterHeader(DisplayName = "原材料在途数量")]
[ImporterHeader(Name = "原材料在途数量")]
public decimal QuantityPlan { get; set; }
/// <summary>
/// 库存状态(生产件,呆滞件,备件,KD件)
/// </summary>
[ExporterHeader(DisplayName = "库存状态")]
[ImporterHeader(Name = "库存状态")]
public string InventoryStatus { get; set; }
/// <summary>
/// 安全库存
/// </summary>
[ExporterHeader(DisplayName = "安全库存")]
[ImporterHeader(Name = "安全库存")]
public decimal SafetyStock { get; set; }
/// <summary>
/// 生产/采购周期:成品即半成品为生产周期（天），原材料为采购周期（天）
/// </summary>
[ExporterHeader(DisplayName = "生产/采购周期")]
[ImporterHeader(Name = "生产/采购周期")]
public string ProductionCycle { get; set; }
/// <summary>
/// 库存更新时间-格式：yyyy-MM-ddHH:mm:ss
/// </summary>
[ExporterHeader(DisplayName = "库存更新时间")]
[ImporterHeader(Name = "库存更新时间")]
public string DataUpdateTime { get; set; }
/// <summary>
/// 批次
/// </summary>
[ExporterHeader(DisplayName = "批次")]
[ImporterHeader(Name = "批次")]
public string? SupplierBatch { get; set; }
/// <summary>
/// 有效期截止日期 非必填
/// </summary>
[ExporterHeader(DisplayName = "有效期截止日期")]
[ImporterHeader(Name = "有效期截止日期")]
public string? SupplieryxqDate { get; set; }
}
}
public class SUPPLIER_SINV_DATA_DTO

3
API/Wood.Service/Controllers/CherySupplierConDateService.cs
View File

@ -7,6 +7,9 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
/// <summary>
/// 日物料需求计划风险确认
/// </summary>
public class CherySupplierConDateService : CheryRecurringJobInputPageController<SUPPLIER_CON_DATE, SUPPLIER_CON_DATE_DETAIL_DTO>
{
public CherySupplierConDateService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_CON_DATE> repository) : base(httpClient, jobDbContext, log, repository)

3
API/Wood.Service/Controllers/CherySupplierConMmrpService.cs
View File

@ -11,6 +11,9 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
/// <summary>
/// M+6月物料需求计划风险确认
/// </summary>
public class CherySupplierConMmrpService : CheryRecurringJobInputPageController<SUPPLIER_CON_MMRP, SUPPLIER_CON_MMRP_DTO>
{
public CherySupplierConMmrpService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_CON_MMRP> repository) : base(httpClient, jobDbContext, log, repository)

3
API/Wood.Service/Controllers/CherySupplierConPoService.cs
View File

@ -7,6 +7,9 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
/// <summary>
/// 采购订单风险确认
/// </summary>
public class CherySupplierConPoService : CheryRecurringJobInputPageController<SUPPLIER_CON_PO, SUPPLIER_CON_PO_DETAIL_DTO>
{
public CherySupplierConPoService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_CON_PO> repository) : base(httpClient, jobDbContext, log, repository)

4
API/Wood.Service/Controllers/CherySupplierDelStateService.cs
View File

@ -6,7 +6,9 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
//看板配送单
/// <summary>
/// 看板送货单
/// </summary>
public class CherySupplierDelStateService : CheryRecurringJobOutPageController<SUPPLIER_DEL_STATE, SUPPLIER_DEL_STATE_DETAIL_DTO>
{
public CherySupplierDelStateService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_DEL_STATE> repository) : base(httpClient, jobDbContext, log, repository)

5
API/Wood.Service/Controllers/CherySupplierInvDataService.cs
View File

@ -6,7 +6,10 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
//奇瑞RDC共享库存
/// <summary>
/// 奇瑞RDC共享库存
/// </summary>
public class SupplierInvDataService : CheryRecurringJobOutPageController<SUPPLIER_INV_DATA, SUPPLIER_INV_DATA_DETAIL_DTO>
{
public SupplierInvDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_INV_DATA> repository) : base(httpClient, jobDbContext, log, repository)

5
API/Wood.Service/Controllers/CherySupplierMrpDataService.cs
View File

@ -8,7 +8,10 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
//日物料需求计划
/// <summary>
/// 日物料需求计划
/// </summary>
public class CherySupplierMrpDataService : CheryRecurringJobOutPageController<SUPPLIER_MRP_DATE, SUPPLIER_MRP_DATE_DETAIL_DTO>
{
public CherySupplierMrpDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_MRP_DATE> repository) : base(httpClient, jobDbContext, log, repository)

5
API/Wood.Service/Controllers/CherySupplierMrpService.cs
View File

@ -6,7 +6,10 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
//日MRP状态监控
/// <summary>
/// 日MRP状态监控
/// </summary>
public class CherySupplierMrpService : CheryRecurringJobOutPageController<SUPPLIER_MRP_STATE, SUPPLIER_MRP_STATE_DETIAL_DTO>
{
public CherySupplierMrpService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_MRP_STATE> repository) : base(httpClient, jobDbContext, log, repository)

4
API/Wood.Service/Controllers/CherySupplierMrpWarningService.cs
View File

@ -7,6 +7,10 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
//日MRP预警推移
/// <summary>
/// 日MRP预警推移
/// </summary>
public class CherySupplierMrpWarningService : CheryRecurringJobOutPageController<SUPPLIER_MRP_WARNING, SUPPLIER_MRP_WARNING_DETAIL_DTO>
{
public CherySupplierMrpWarningService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_MRP_WARNING> repository) : base(httpClient, jobDbContext, log, repository)

5
API/Wood.Service/Controllers/CherySupplierPorHSCHEDULService.cs
View File

@ -5,7 +5,10 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
//过焊装未过总装
/// <summary>
/// 过焊装未过总装
/// </summary>
public class CherySupplierPorHSCHEDULService : CheryRecurringJobOutPageController<SUPPLIER_PRO_HSCHEDUL, SUPPLIER_PRO_HSCHEDUL_DETAIL_DTO>
{
public CherySupplierPorHSCHEDULService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_HSCHEDUL> repository) : base(httpClient, jobDbContext, log, repository)

3
API/Wood.Service/Controllers/CherySupplierProCSCHEDULService.cs
View File

@ -6,6 +6,9 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
/// <summary>
/// 排序供货
/// </summary>
public class CherySupplierProCSCHEDULService : CheryRecurringJobOutPageController<SUPPLIER_PRO_CSCHEDUL, SUPPLIER_PRO_CSCHEDUL_DETAIL_DTO>
{
public CherySupplierProCSCHEDULService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_CSCHEDUL> repository) : base(httpClient, jobDbContext, log, repository)

3
API/Wood.Service/Controllers/CherySupplierProPlanService.cs
View File

@ -6,6 +6,9 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
//整车月度生产计划
/// <summary>
/// 整车月度生产计划
/// </summary>
public class SupplierProPlaningService : CheryRecurringJobOutPageController<SUPPLIER_PRO_PLANING, SUPPLIER_PRO_PLANING_DETIAL_DTO>
{
public SupplierProPlaningService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_PLANING> repository) : base(httpClient, jobDbContext, log, repository)

5
API/Wood.Service/Controllers/CherySupplierProTSCHEDULService.cs
View File

@ -5,7 +5,10 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
//过涂装未过总装
/// <summary>
/// 过涂装未过总装
/// </summary>
public class CherySupplierProTSCHEDULService : CheryRecurringJobOutPageController<SUPPLIER_PRO_TSCHEDUL, SUPPLIER_PRO_TSCHEDUL_DETAIL_DTO>
{
public CherySupplierProTSCHEDULService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_TSCHEDUL> repository) : base(httpClient, jobDbContext, log, repository)

5
API/Wood.Service/Controllers/CherySupplierReturnService.cs
View File

@ -5,7 +5,10 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
//退货单
/// <summary>
/// 退货单
/// </summary>
public class CherySupplierReturnService : CheryRecurringJobOutPageController<SUPPLIER_RETURN, SUPPLIER_RETURN_DETAIL_DTO>
{
public CherySupplierReturnService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_RETURN> repository) : base(httpClient, jobDbContext, log, repository)

2
API/Wood.Service/Controllers/CherySupplierSinvDataService.cs
View File

@ -6,7 +6,7 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
public class CherySupplierSinvDataService : CheryRecurringJobOutPageController<SUPPLIER_SINV_DATA, SUPPLIER_SINV_DATA_DETAIL_DTO>
public class CherySupplierSinvDataService : CheryRecurringJobInputPageController<SUPPLIER_SINV_DATA, SUPPLIER_SINV_DATA_DTO>
{
public CherySupplierSinvDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_SINV_DATA> repository) : base(httpClient, jobDbContext, log, repository)
{

Write Preview
Loading…
Cancel
Save