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

Merge branch 'master' of http://dev.ccwin-in.com:3000/zhibinlv/QRAPI

master
me 2 weeks ago
parent
18b258ac71 19a941bf79
commit
6799eb6892
4 changed files with 79 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      API/TaskManager.Entity/11-18/SUPPLIER_CON_MMRP.cs
  2. 48
      API/TaskManager.Entity/Entity.cs
  3. 3
      API/Wood.Service/Controllers/CherySupplierConDateService.cs
  4. 53
      API/Wood.Service/Controllers/CherySupplierMrpMonthService.cs

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

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary> /// <summary>
/// M+6月物料需求计划风险确认 /// M+6月物料需求计划风险确认
/// </summary> /// </summary>
public class SUPPLIER_CON_MMRP : BaseEntity public class SUPPLIER_CON_MMRP : BaseEntity
{ {
/// <summary> /// <summary>
/// 供应商代码 /// 供应商代码

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

@ -464,7 +464,7 @@ namespace TaskManager.Entity
/// </summary> /// </summary>
[JsonPropertyName("version")] [JsonPropertyName("version")]
[ExporterHeader(DisplayName = "版本号")] [ExporterHeader(DisplayName = "版本号")]
public int Version { get; set; } = 1; public int Version { get; set; } =0;
[JsonProperty("omterior")] [JsonProperty("omterior")]
[ExporterHeader(DisplayName = "内外饰")] // 推测拼写错误并自定义显示名 [ExporterHeader(DisplayName = "内外饰")] // 推测拼写错误并自定义显示名
@ -537,84 +537,84 @@ namespace TaskManager.Entity
/// </summary> /// </summary>
[JsonPropertyName("quantityDemand1")] [JsonPropertyName("quantityDemand1")]
[ExporterHeader(DisplayName = "需求数量1")] [ExporterHeader(DisplayName = "需求数量1")]
public decimal QuantityDemand1 { get; set; } = 1; public decimal QuantityDemand1 { get; set; } = 0;
/// <summary> /// <summary>
/// 需求数量2 /// 需求数量2
/// </summary> /// </summary>
[JsonPropertyName("quantityDemand2")] [JsonPropertyName("quantityDemand2")]
[ExporterHeader(DisplayName = "需求数量2")] [ExporterHeader(DisplayName = "需求数量2")]
public decimal QuantityDemand2 { get; set; } = 1; public decimal QuantityDemand2 { get; set; } = 0;
/// <summary> /// <summary>
/// 需求数量3 /// 需求数量3
/// </summary> /// </summary>
[JsonPropertyName("quantityDemand3")] [JsonPropertyName("quantityDemand3")]
[ExporterHeader(DisplayName = "需求数量3")] [ExporterHeader(DisplayName = "需求数量3")]
public decimal QuantityDemand3 { get; set; } = 1; public decimal QuantityDemand3 { get; set; } = 0;
/// <summary> /// <summary>
/// 需求数量4 /// 需求数量4
/// </summary> /// </summary>
[JsonPropertyName("quantityDemand4")] [JsonPropertyName("quantityDemand4")]
[ExporterHeader(DisplayName = "需求数量4")] [ExporterHeader(DisplayName = "需求数量4")]
public decimal QuantityDemand4 { get; set; } = 1; public decimal QuantityDemand4 { get; set; } = 0;
/// <summary> /// <summary>
/// 需求数量5 /// 需求数量5
/// </summary> /// </summary>
[JsonPropertyName("quantityDemand5")] [JsonPropertyName("quantityDemand5")]
[ExporterHeader(DisplayName = "需求数量5")] [ExporterHeader(DisplayName = "需求数量5")]
public decimal QuantityDemand5 { get; set; } = 1; public decimal QuantityDemand5 { get; set; } = 0;
/// <summary> /// <summary>
/// 需求数量6 /// 需求数量6
/// </summary> /// </summary>
[JsonPropertyName("quantityDemand6")] [JsonPropertyName("quantityDemand6")]
[ExporterHeader(DisplayName = "需求数量6")] [ExporterHeader(DisplayName = "需求数量6")]
public decimal QuantityDemand6 { get; set; } = 1; public decimal QuantityDemand6 { get; set; } = 0;
/// <summary> /// <summary>
/// 需求数量7 /// 需求数量7
/// </summary> /// </summary>
[JsonPropertyName("quantityDemand7")] [JsonPropertyName("quantityDemand7")]
[ExporterHeader(DisplayName = "需求数量7")] [ExporterHeader(DisplayName = "需求数量7")]
public decimal QuantityDemand7 { get; set; } = 1; public decimal QuantityDemand7 { get; set; } = 0;
/// <summary> /// <summary>
/// 需求数量8 /// 需求数量8
/// </summary> /// </summary>
[JsonPropertyName("quantityDemand8")] [JsonPropertyName("quantityDemand8")]
[ExporterHeader(DisplayName = "需求数量8")] [ExporterHeader(DisplayName = "需求数量8")]
public decimal QuantityDemand8 { get; set; } = 1; public decimal QuantityDemand8 { get; set; } = 0;
/// <summary> /// <summary>
/// 需求数量9 /// 需求数量9
/// </summary> /// </summary>
[JsonPropertyName("quantityDemand9")] [JsonPropertyName("quantityDemand9")]
[ExporterHeader(DisplayName = "需求数量9")] [ExporterHeader(DisplayName = "需求数量9")]
public decimal QuantityDemand9 { get; set; } = 1; public decimal QuantityDemand9 { get; set; } =0;
/// <summary> /// <summary>
/// 需求数量10 /// 需求数量10
/// </summary> /// </summary>
[JsonPropertyName("quantityDemand10")] [JsonPropertyName("quantityDemand10")]
[ExporterHeader(DisplayName = "需求数量10")] [ExporterHeader(DisplayName = "需求数量10")]
public decimal QuantityDemand10 { get; set; } = 1; public decimal QuantityDemand10 { get; set; } =0;
/// <summary> /// <summary>
/// 需求数量11 /// 需求数量11
/// </summary> /// </summary>
[JsonPropertyName("quantityDemand11")] [JsonPropertyName("quantityDemand11")]
[ExporterHeader(DisplayName = "需求数量11")] [ExporterHeader(DisplayName = "需求数量11")]
public decimal QuantityDemand11 { get; set; } = 1; public decimal QuantityDemand11 { get; set; } =0;
/// <summary> /// <summary>
/// 需求数量12 /// 需求数量12
/// </summary> /// </summary>
[JsonPropertyName("quantityDemand12")] [JsonPropertyName("quantityDemand12")]
[ExporterHeader(DisplayName = "需求数量12")] [ExporterHeader(DisplayName = "需求数量12")]
public int QuantityDemand12 { get; set; } = 1; public int QuantityDemand12 { get; set; } =0;
/// <summary> /// <summary>
/// 当文件夹数据发生变更时(更新需求=1/否则=0) /// 当文件夹数据发生变更时(更新需求=1/否则=0)
@ -730,13 +730,13 @@ namespace TaskManager.Entity
/// 需求起始日期的需求数量 /// 需求起始日期的需求数量
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "第1天需求数量")] [ExporterHeader(DisplayName = "第1天需求数量")]
public int QuantityDemand1 { get; set; } = 1; public int QuantityDemand1 { get; set; } =0;
/// <summary> /// <summary>
/// 起始日期+1天的需求数量 /// 起始日期+1天的需求数量
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "第2天需求数量")] [ExporterHeader(DisplayName = "第2天需求数量")]
public int QuantityDemand2 { get; set; } = 1; public int QuantityDemand2 { get; set; } =0;
/// <summary> /// <summary>
/// 起始日期+2天的需求数量（以此类推） /// 起始日期+2天的需求数量（以此类推）
@ -864,13 +864,13 @@ namespace TaskManager.Entity
/// 删除标识（0=未删除，1=已删除） /// 删除标识（0=未删除，1=已删除）
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "删除标识")] [ExporterHeader(DisplayName = "删除标识")]
public int IsDelete { get; set; } = 1; // 默认已删除（根据原始数据默认值） public int IsDelete { get; set; } =0; // 默认已删除（根据原始数据默认值）
/// <summary> /// <summary>
/// 数据版本号（乐观锁控制） /// 数据版本号（乐观锁控制）
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "数据版本号")] [ExporterHeader(DisplayName = "数据版本号")]
public int Version { get; set; } = 1; public int Version { get; set; } =0;
@ -1133,7 +1133,7 @@ namespace TaskManager.Entity
/// 到货数量 /// 到货数量
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "到货数量")] [ExporterHeader(DisplayName = "到货数量")]
public int QuantityDelivery { get; set; } = 1; public int QuantityDelivery { get; set; } =0;
/// <summary> /// <summary>
/// 备注:含批次号信息 /// 备注:含批次号信息
@ -1322,13 +1322,13 @@ namespace TaskManager.Entity
/// 是否删除(0:否,1是) /// 是否删除(0:否,1是)
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "删除标记")] [ExporterHeader(DisplayName = "删除标记")]
public int IsDelete { get; set; } = 1; public int IsDelete { get; set; } =0;
/// <summary> /// <summary>
/// 版本号 /// 版本号
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "版本号")] [ExporterHeader(DisplayName = "版本号")]
public int Version { get; set; } = 1; public int Version { get; set; } =0;
@ -1433,13 +1433,13 @@ namespace TaskManager.Entity
/// 是否删除(0:否,1是) /// 是否删除(0:否,1是)
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "删除标记")] [ExporterHeader(DisplayName = "删除标记")]
public int IsDelete { get; set; } = 1; public int IsDelete { get; set; } =0;
/// <summary> /// <summary>
/// 版本号 /// 版本号
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "版本号")] [ExporterHeader(DisplayName = "版本号")]
public int Version { get; set; } = 1; public int Version { get; set; } =0;
@ -1649,7 +1649,7 @@ namespace TaskManager.Entity
/// 数量 /// 数量
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "数量")] [ExporterHeader(DisplayName = "数量")]
public int QuantityDelivery { get; set; } = 1; public int QuantityDelivery { get; set; } =0;
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
@ -2081,7 +2081,7 @@ namespace TaskManager.Entity
/// 在途数量 /// 在途数量
/// </summary> /// </summary>
[ExporterHeader(DisplayName = "在途数量")] [ExporterHeader(DisplayName = "在途数量")]
public decimal? QuantityInTransit { get; set; } = 1; public decimal? QuantityInTransit { get; set; } =0;
/// <summary> /// <summary>
/// 按时到货比（百分比，如：95表示95%） /// 按时到货比（百分比，如：95表示95%）

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

@ -9,5 +9,8 @@ namespace TaskManager.Controllers
public SupplierConDateService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_CON_DATE> repository) : base(httpClient, jobDbContext, log, repository) public SupplierConDateService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_CON_DATE> repository) : base(httpClient, jobDbContext, log, repository)
{ {
} }
} }
} }

53
API/Wood.Service/Controllers/CherySupplierMrpMonthService.cs
View File

@ -1,15 +1,64 @@
using TaskManager.Contracts.Dtos; using Magicodes.ExporterAndImporter.Core;
using TaskManager.Contracts.Dtos;
using TaskManager.Controllers; using TaskManager.Controllers;
using TaskManager.Entity; using TaskManager.Entity;
using TaskManager.Entity.Entitys;
using TaskManager.EntityFramework; using TaskManager.EntityFramework;
using TaskManager.EntityFramework; using Z.BulkOperations;
namespace TaskManager.Controllers namespace TaskManager.Controllers
{ {
/// <summary>
/// M+6月物料需求计划风险确认
/// </summary>
public class CherySupplierMrpMonthService : CheryRecurringJobOutPageController<SUPPLIER_MRP_MONTH, SUPPLIER_MRP_MONTH_DETAIL_DTO> public class CherySupplierMrpMonthService : CheryRecurringJobOutPageController<SUPPLIER_MRP_MONTH, SUPPLIER_MRP_MONTH_DETAIL_DTO>
{ {
public CherySupplierMrpMonthService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_MRP_MONTH> repository) : base(httpClient, jobDbContext, log, repository) public CherySupplierMrpMonthService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_MRP_MONTH> repository) : base(httpClient, jobDbContext, log, repository)
{ {
}
protected override async Task CreateTaskAsync(List<SUPPLIER_MRP_MONTH> plist, JobDbContext dbContext)
{
var taskId = Guid.NewGuid();
var task = new TaskSub();
task.TaskId = taskId;
task.TaskName = TaskName;
task.Subscriber = Client;
task.TableName = "SUPPLIER_CON_MMRP";
if (plist.Count > 0)
{
List<SUPPLIER_CON_MMRP> list = new List<SUPPLIER_CON_MMRP>();
plist.ForEach(p =>
{
var con = new SUPPLIER_CON_MMRP();
con.SupplierCode = "8EG";
con.ReleaseEdition = p.ReleaseEdition;
con.MaterialCode = p.MaterialCode;
con.PlantId = p.PlantId;
con.FeedbackResults = "0";
con.VentureType = "1";
con.VentureSpecific = "1";
con.Measures = "1";
con.StartMonth = p.StartMonth;
con.QuantityMeet1 = p.QuantityDemand1;
con.QuantityMeet2 = p.QuantityDemand2;
con.QuantityMeet3 = p.QuantityDemand3;
con.QuantityMeet4 = p.QuantityDemand4;
con.QuantityMeet5 = p.QuantityDemand5;
con.QuantityMeet6 = p.QuantityDemand6;
con.QuantityMeet7 = p.QuantityDemand7;
con.QuantityMeet8 = p.QuantityDemand8;
con.QuantityMeet9 = p.QuantityDemand9;
con.QuantityMeet10 = p.QuantityDemand10;
con.QuantityMeet11 = p.QuantityDemand11;
con.QuantityMeet12 = p.QuantityDemand12;
list.Add(con);
});
dbContext.BulkInsert(list, new BulkOperationOptions<SUPPLIER_CON_MMRP>() { UseTableLock = false });
}
return;
} }
} }
} }

Write Preview
Loading…
Cancel
Save