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

更新

master
赵新宇 2 months ago
parent
b4a36328d5
commit
90571dd387
6 changed files with 1741 additions and 314 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. 619
      API/TaskManager.Contracts/Dtos/Dtos.cs
  2. 2
      API/TaskManager.Contracts/TaskManager.Contracts.csproj
  3. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_ENVIRONMENT.cs
  4. 4
      API/TaskManager.Entity/11-18/SUPPLIER_SINV_DATA.cs
  5. 1427
      API/TaskManager.Entity/Entity.cs
  6. 1
      API/Wood.Service/Controllers/SupplierSinvDataService.cs

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

@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Globalization;
using System.Text.Json;
using System.Text.Json.Serialization;
using Magicodes.ExporterAndImporter.Core;
namespace TaskManager.Contracts.Dtos
@ -374,21 +375,91 @@ namespace TaskManager.Contracts.Dtos
public class SUPPLIER_SA_WEEK_DETAIL_DTO : CherryReadBaseEntityDto
{
public string ScheduleAgreement { get; set; }
public string SerialNumber { get; set; }
public string MaterialCode { get; set; }
public string MaterialDescription { get; set; }
public string PurchasingGroup { get; set; }
public string PlantId { get; set; }
public int QuantityDemand { get; set; }
public string DateReceived { get; set; }
public string CreateByUser { get; set; }
public DateTime CreateTime { get; set; }
public string UpdateByUser { get; set; }
public DateTime UpdateTime { get; set; }
public int IsDelete { get; set; }
public int Version { get; set; }
/// <summary>
/// 计划协议号
/// </summary>
[MaxLength(50)]
public string ScheduleAgreement { get; set; } = "";
/// <summary>
/// 行项目号
/// </summary>
[MaxLength(50)]
public string SerialNumber { get; set; } = "";
/// <summary>
/// 零件号:奇瑞零件号
/// </summary>
[MaxLength(50)]
public string MaterialCode { get; set; } = "";
/// <summary>
/// 零件名称
/// </summary>
[MaxLength(50)]
public string MaterialDescription { get; set; } = "";
/// <summary>
/// 采购组
/// </summary>
[MaxLength(50)]
public string PurchasingGroup { get; set; } = "";
/// <summary>
/// 工厂代码
/// </summary>
[MaxLength(50)]
public string PlantId { get; set; } = "";
/// <summary>
/// 需求数量
/// </summary>
public int QuantityDemand { get; set; } = 1;
/// <summary>
/// 交货日期-格式：yyyy-MM-dd
/// </summary>
[MaxLength(50)]
public DateTime? DateReceived { get; set; }
/// <summary>
/// 创建人
/// </summary>
[MaxLength(50)]
public string CreateByUser { get; set; } = "";
/// <summary>
/// 创建时间
/// </summary>
[MaxLength(50)]
public DateTime? CreateTime { get; set; }
/// <summary>
/// 修改人
/// </summary>
[MaxLength(50)]
public string UpdateByUser { get; set; } = "";
/// <summary>
/// 修改时间
/// </summary>
[MaxLength(50)]
public DateTime? UpdateTime { get; set; }
/// <summary>
/// 是否删除(0:否,1是)
/// </summary>
public int IsDelete { get; set; } = 1;
/// <summary>
/// 版本号
/// </summary>
public int Version { get; set; } = 1;
}
public class SUPPLIER_SA_WEEK_DTO : PAGE_OUT_DTO
@ -410,32 +481,173 @@ namespace TaskManager.Contracts.Dtos
public class SUPPLIER_PO_DETAIL_DTO:CherryReadBaseEntityDto
{
/// <summary>
/// 采购订单号
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "采购订单号")]
public string PurchaseOrder { get; set; }
/// <summary>
/// 行项目号
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "行项目号")]
public string SerialNumber { get; set; }
/// <summary>
/// 工厂代码
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "工厂代码")]
public string PlantId { get; set; }
/// <summary>
/// 工厂名称
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "工厂名称")]
public string PlantName { get; set; }
public string VoucherDate { get; set; }
/// <summary>
/// 凭证日期-格式：yyyy-MM-dd
/// </summary>
[ExporterHeader(DisplayName = "凭证日期", Format = "yyyy-MM-dd")]
public DateTime? VoucherDate { get; set; }
/// <summary>
/// 需方联系人
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "需方联系人")]
public string Purchaser { get; set; }
/// <summary>
/// 供方联系人
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "供方联系人")]
public string Supplier { get; set; }
/// <summary>
/// 物料编码
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "物料编码")]
public string MaterialCode { get; set; }
/// <summary>
/// 物料描述
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "物料描述")]
public string MaterialDescription { get; set; }
public decimal? QuantityDemand { get; set; }
/// <summary>
/// 需求数量
/// </summary>
[ExporterHeader(DisplayName = "需求数量")]
public decimal? QuantityDemand { get; set; }=0;
/// <summary>
/// 物料单位
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "物料单位")]
public string MaterialUnit { get; set; }
public string DeliveryDate { get; set; }
/// <summary>
/// 交货日期-格式：yyyy-MM-dd
/// </summary>
[ExporterHeader(DisplayName = "交货日期", Format = "yyyy-MM-dd")]
public DateTime? DeliveryDate { get; set; }
/// <summary>
/// 交货地点
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "交货地点")]
public string DeliveryPlace { get; set; }
public decimal? QuantityDelivery { get; set; }
/// <summary>
/// 到货数量
/// </summary>
[ExporterHeader(DisplayName = "到货数量")]
public decimal? QuantityDelivery { get; set; } = 0;
/// <summary>
/// 备注:含批次号信息
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "备注")]
public string Note { get; set; }
/// <summary>
/// 项目类别文本
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "项目类别")]
public string ItemType { get; set; }
/// <summary>
/// 国际贸易条件
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "贸易条件")]
public string TradeTerms { get; set; }
/// <summary>
/// 出口国家
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "出口国家")]
public string Country { get; set; }
/// <summary>
/// 批次
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "批次")]
public string Batch { get; set; }
/// <summary>
/// 创建人
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "创建人")]
public string CreateByUser { get; set; }
public string CreateTime { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[ExporterHeader(DisplayName = "创建时间", Format = "yyyy-MM-dd HH:mm:ss")]
public DateTime CreateTime { get; set; } = DateTime.Now;
/// <summary>
/// 修改人
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "修改人")]
public string UpdateByUser { get; set; }
public string UpdateTime { get; set; }
public int IsDelete { get; set; }
public int Version { get; set; }
/// <summary>
/// 修改时间
/// </summary>
[ExporterHeader(DisplayName = "修改时间", Format = "yyyy-MM-dd HH:mm:ss")]
public DateTime UpdateTime { get; set; } = DateTime.Now;
/// <summary>
/// 是否删除(0:否,1是)
/// </summary>
[ExporterHeader(DisplayName = "删除标记")]
public int IsDelete { get; set; } = 0;
/// <summary>
/// 版本号
/// </summary>
[ExporterHeader(DisplayName = "版本号")]
public int Version { get; set; } = 0;
}
@ -499,21 +711,102 @@ namespace TaskManager.Contracts.Dtos
public class SUPPLIER_PRO_HSCHEDUL_DETAIL_DTO : CherryReadBaseEntityDto
{
/// <summary>
/// 车型
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "车型")]
public string Models { get; set; }
/// <summary>
/// VIN
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "VIN")]
public string Vin { get; set; }
/// <summary>
/// 产线代码
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "产线代码")]
public string ProductionLineId { get; set; }
/// <summary>
/// 产线名称
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "产线名称")]
public string ProductionLineName { get; set; }
/// <summary>
/// 物料编码
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "物料编码")]
public string MaterialCode { get; set; }
/// <summary>
/// 物料描述
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "物料描述")]
public string MaterialDescription { get; set; }
/// <summary>
/// 生产备注(报工类型)
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "报工类型")]
public string ProductionType { get; set; }
public string OnLineTime { get; set; }
/// <summary>
/// 上线日期时间-格式：yyyy-MM-dd HH:mm:ss
/// </summary>
[ExporterHeader(DisplayName = "上线时间", Format = "yyyy-MM-dd HH:mm:ss")]
public DateTime? OnLineTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "创建人")]
public string CreateByUser { get; set; }
public DateTime CreateTime { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[ExporterHeader(DisplayName = "创建时间", Format = "yyyy-MM-dd HH:mm:ss")]
public DateTime CreateTime { get; set; } = DateTime.Now;
/// <summary>
/// 修改人
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "修改人")]
public string UpdateByUser { get; set; }
public DateTime UpdateTime { get; set; }
public int IsDelete { get; set; }
public int Version { get; set; }
/// <summary>
/// 修改时间
/// </summary>
[ExporterHeader(DisplayName = "修改时间", Format = "yyyy-MM-dd HH:mm:ss")]
public DateTime UpdateTime { get; set; } = DateTime.Now;
/// <summary>
/// 是否删除(0:否,1是)
/// </summary>
[ExporterHeader(DisplayName = "删除标记")]
public int IsDelete { get; set; } = 0;
/// <summary>
/// 版本号
/// </summary>
[ExporterHeader(DisplayName = "版本号")]
public int Version { get; set; } = 0;
}
public class SUPPLIER_PRO_HSCHEDUL_DTO : PAGE_OUT_DTO
@ -527,27 +820,110 @@ namespace TaskManager.Contracts.Dtos
#endregion
#region 过涂装未过总装(输出)
public class SUPPLIER_PRO_TSCHEDUL_DETAIL_DTO : CherryReadBaseEntityDto
{
/// <summary>
/// 车型
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "车型")]
public string Models { get; set; }
/// <summary>
/// VIN
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "VIN")]
public string Vin { get; set; }
/// <summary>
/// 产线代码
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "产线代码")]
public string ProductionLineId { get; set; }
/// <summary>
/// 产线名称
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "产线名称")]
public string ProductionLineName { get; set; }
/// <summary>
/// 物料编码
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "物料编码")]
public string MaterialCode { get; set; }
/// <summary>
/// 物料描述
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "物料描述")]
public string MaterialDescription { get; set; }
public string OnLineTime { get; set; }
/// <summary>
/// 上线日期时间-格式：yyyy-MM-dd HH:mm:ss
/// </summary>
[ExporterHeader(DisplayName = "上线时间", Format = "yyyy-MM-dd HH:mm:ss")]
public DateTime? OnLineTime { get; set; }
/// <summary>
/// 总装车间
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "总装车间")]
public string FinalWorkshop { get; set; }
public string FinalOnLineTime { get; set; }
/// <summary>
/// 总装上线日期时间-格式：yyyy-MM-dd HH:mm:ss
/// </summary>
[ExporterHeader(DisplayName = "总装上线时间", Format = "yyyy-MM-dd HH:mm:ss")]
public DateTime? FinalOnLineTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "创建人")]
public string CreateByUser { get; set; }
public DateTime CreateTime { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[ExporterHeader(DisplayName = "创建时间", Format = "yyyy-MM-dd HH:mm:ss")]
public DateTime? CreateTime { get; set; }
/// <summary>
/// 修改人
/// </summary>
[MaxLength(50)]
[ExporterHeader(DisplayName = "修改人")]
public string UpdateByUser { get; set; }
public DateTime UpdateTime { get; set; }
public int IsDelete { get; set; }
public int Version { get; set; }
/// <summary>
/// 修改时间
/// </summary>
[ExporterHeader(DisplayName = "修改时间", Format = "yyyy-MM-dd HH:mm:ss")]
public DateTime UpdateTime { get; set; }
/// <summary>
/// 是否删除(0:否,1是)
/// </summary>
[ExporterHeader(DisplayName = "删除标记")]
public int IsDelete { get; set; } = 0;
/// <summary>
/// 版本号
/// </summary>
[ExporterHeader(DisplayName = "版本号")]
public int Version { get; set; } = 0;
}
public class SUPPLIER_PRO_TSCHEDUL_DTO : PAGE_OUT_DTO
@ -564,6 +940,7 @@ namespace TaskManager.Contracts.Dtos
public class SUPPLIER_PRO_CSCHEDUL_DETAIL_DTO : CherryReadBaseEntityDto
{
public string Models { get; set; }
public string Vin { get; set; }
public string ProductionLineId { get; set; }
@ -842,53 +1219,127 @@ public class SUPPLIER_MRP_WARNING_DETAIL_DTO : CherryReadBaseEntityDto
public class SUPPLIER_MRP_DATE_DETAIL_DTO : CherryReadBaseEntityDto
{
/// <summary>
/// 需求发布版次（用于接口反馈数据的唯一标识）
/// 字符串长度限制：50 字节
/// </summary>
[StringLength(50)] // 使用数据注解限制长度（需引用 System.ComponentModel.DataAnnotations）
public string ReleaseEdition { get; set; } = string.Empty;
public string ReleaseEdition { get; set; }
public string MaterialCode { get; set; }
public string MaterialDescription { get; set; }
public string PlantId { get; set; }
public string PlantName { get; set; }
public string StartDate { get; set; }
/// <summary>
/// 奇瑞零件号
/// 字符串长度限制：50 字节
/// </summary>
[StringLength(50)]
public string MaterialCode { get; set; } = string.Empty;
public decimal? QuantityDemand1 { get; set; }
public decimal? QuantityDemand2 { get; set; }
public decimal? QuantityDemand3 { get; set; }
public decimal? QuantityDemand4 { get; set; }
public decimal? QuantityDemand5 { get; set; }
public decimal? QuantityDemand6 { get; set; }
public decimal? QuantityDemand7 { get; set; }
public decimal? QuantityDemand8 { get; set; }
public decimal? QuantityDemand9 { get; set; }
public decimal? QuantityDemand10 { get; set; }
public decimal? QuantityDemand11 { get; set; }
public decimal? QuantityDemand12 { get; set; }
public decimal? QuantityDemand13 { get; set; }
public decimal? QuantityDemand14 { get; set; }
public decimal? QuantityDemand15 { get; set; }
public decimal? QuantityDemand16 { get; set; }
public decimal? QuantityDemand17 { get; set; }
public decimal? QuantityDemand18 { get; set; }
public decimal? QuantityDemand19 { get; set; }
public decimal? QuantityDemand20 { get; set; }
public decimal? QuantityDemand21 { get; set; }
public decimal? QuantityDemand22 { get; set; }
public decimal? QuantityDemand23 { get; set; }
public decimal? QuantityDemand24 { get; set; }
public decimal? QuantityDemand25 { get; set; }
public decimal? QuantityDemand26 { get; set; }
public decimal? QuantityDemand27 { get; set; }
public decimal? QuantityDemand28 { get; set; }
public decimal? QuantityDemand29 { get; set; }
public decimal? QuantityDemand30 { get; set; }
public decimal? QuantityDemand31 { get; set; }
/// <summary>
/// 零件名称
/// 字符串长度限制：50 字节
/// </summary>
[StringLength(50)]
public string MaterialDescription { get; set; } = string.Empty;
public string IsUpdate { get; set; }
public string CreateByUser { get; set; }
public string CreateTime { get; set; }
public string UpdateByUser { get; set; }
public string UpdateTime { get; set; }
public int IsDelete { get; set; }
public int Version { get; set; }
/// <summary>
/// 工厂代码
/// 字符串长度限制：50 字节
/// </summary>
[StringLength(50)]
public string PlantId { get; set; } = string.Empty;
/// <summary>
/// 工厂名称
/// 字符串长度限制：50 字节
/// </summary>
[StringLength(50)]
public string PlantName { get; set; } = string.Empty;
/// <summary>
/// 需求起始日期（格式：yyyy-MM-dd）
/// </summary>
public DateTime StartDate { get; set; }
/// <summary>
/// 需求起始日期的需求数量
/// </summary>
public int QuantityDemand1 { get; set; } = 1;
/// <summary>
/// 起始日期+1天的需求数量
/// </summary>
public int QuantityDemand2 { get; set; } = 1;
/// <summary>
/// 起始日期+2天的需求数量（以此类推）
/// </summary>
public int QuantityDemand3 { get; set; } = 1;
// 省略 QuantityDemand4 至 QuantityDemand31 的重复注释（格式与上述一致）
public decimal QuantityDemand4 { get; set; } = 0;
public decimal QuantityDemand5 { get; set; } = 0;
public decimal QuantityDemand6 { get; set; } = 0;
public decimal QuantityDemand7 { get; set; } = 0;
public decimal QuantityDemand8 { get; set; } = 0;
public decimal QuantityDemand9 { get; set; } = 0;
public decimal QuantityDemand10 { get; set; } = 0;
public decimal QuantityDemand11 { get; set; } = 0;
public decimal QuantityDemand12 { get; set; } = 0;
public decimal QuantityDemand13 { get; set; } = 0;
public decimal QuantityDemand14 { get; set; } = 0;
public decimal QuantityDemand15 { get; set; } = 0;
public decimal QuantityDemand16 { get; set; } = 0;
public decimal QuantityDemand17 { get; set; } = 0;
public decimal QuantityDemand18 { get; set; } = 0;
public decimal QuantityDemand19 { get; set; } = 0;
public decimal QuantityDemand20 { get; set; } = 0;
public decimal QuantityDemand21 { get; set; } = 0;
public decimal QuantityDemand22 { get; set; } = 0;
public decimal QuantityDemand23 { get; set; } = 0;
public decimal QuantityDemand24 { get; set; } = 0;
public decimal QuantityDemand25 { get; set; } = 0;
public decimal QuantityDemand26 { get; set; } = 0;
public decimal QuantityDemand27 { get; set; } = 0;
public decimal QuantityDemand28 { get; set; } = 0;
public decimal QuantityDemand29 { get; set; } = 0;
public decimal QuantityDemand30 { get; set; } = 0;
public decimal QuantityDemand31 { get; set; } = 0;
/// <summary>
/// 数据变更标识（1=更新需求，0=未变更）
/// </summary>
public string IsUpdate { get; set; } = string.Empty;
/// <summary>
/// 创建人（字符串长度默认 50 字节）
/// </summary>
[StringLength(50)]
public string CreateByUser { get; set; } = string.Empty;
/// <summary>
/// 创建时间（自动填充当前时间）
/// </summary>
public DateTime CreateTime { get; set; } = DateTime.Now;
/// <summary>
/// 修改人（字符串长度默认 50 字节）
/// </summary>
[StringLength(50)]
public string UpdateByUser { get; set; } = string.Empty;
/// <summary>
/// 修改时间（自动更新为最后修改时间）
/// </summary>
public DateTime UpdateTime { get; set; } = DateTime.Now;
/// <summary>
/// 删除标识（0=未删除，1=已删除）
/// </summary>
public int IsDelete { get; set; } = 0; // 默认已删除（根据原始数据默认值）
/// <summary>
/// 数据版本号（乐观锁控制）
/// </summary>
public int Version { get; set; } = 0;
}

2
API/TaskManager.Contracts/TaskManager.Contracts.csproj
View File

@ -7,6 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Magicodes.IE.Core" Version="2.7.5.2" />
<PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_ENVIRONMENT.cs
View File

@ -30,7 +30,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 车间代码
/// </summary>
[ExporterHeader(DisplayName = "车间代码)]
[ExporterHeader(DisplayName = "车间代码")]
public string WorkshopId { get; set; }
/// <summary>
/// 车间名称

4
API/TaskManager.Entity/11-18/SUPPLIER_SINV_DATA.cs
View File

@ -1,11 +1,11 @@
using Magicodes.ExporterAndImporter.Core;
namespace TaskManager.Entity.Entitys
namespace TaskManager.Entity
{
/// <summary>
/// 供应商共享库存
/// </summary>
public class SUPPLIER_SINV_DATA : BaseEntity
public class SUPPLIER_SINV_DATA : CherryReadBaseEntity
{
/// <summary>
/// 供应商代码

1427
API/TaskManager.Entity/Entity.cs
View File

File diff suppressed because it is too large

1
API/Wood.Service/Controllers/SupplierSinvDataService.cs
View File

@ -1,6 +1,7 @@
using TaskManager.Contracts.Dtos;
using TaskManager.Controllers;
using TaskManager.Entity;
using TaskManager.Entity.Entitys;
using TaskManager.EntityFramework;
namespace TaskManager.Controllers

Write Preview
Loading…
Cancel
Save