From 3feb48169b9fd1f6b470fb6b395f7d4023ead0fd Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Wed, 25 Sep 2024 10:07:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=96=B7=E7=A0=81=E8=B4=B4=E6=A0=87=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E5=A4=B1=E6=95=88=E6=97=A5=E6=9C=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IPrdMoTaskService.cs | 24 +-- .../Tnb.ProductionMgr/PrdMoTaskService.cs | 162 +++++++++--------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs index b8a5df43..e5090870 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs @@ -37,20 +37,20 @@ namespace Tnb.ProductionMgr.Interfaces /// Task> GetPrdMoTaskListByStationId(Dictionary dic); - /// - /// 外包装根据工位id获取喷码数据 - /// - /// - /// - Task GetMarkingInfoByStationId(MarkingLabelInput input); + // /// + // /// 外包装根据工位id获取喷码数据 + // /// + // /// + // /// + // Task GetMarkingInfoByStationId(MarkingLabelInput input); - /// - /// 外包装根据工位id获取贴标数据 - /// - /// - /// - Task GetLabelInfoByStationId(MarkingLabelInput input); + // /// + // /// 外包装根据工位id获取贴标数据 + // /// + // /// + // /// + // Task GetLabelInfoByStationId(MarkingLabelInput input); Task PrdReport(PrdReportCrInput input); diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index 966dce0f..aef226b5 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -1606,8 +1606,8 @@ namespace Tnb.ProductionMgr BasMbom basMbom = await _db.Queryable().SingleAsync(x => x.id == item.bom_id); //string code = $"(01){basMaterial.di ?? ""}(11){DateTime.Now.ToString("yyMMdd")}(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}(10){batch}#{basMaterial.material_specification}*{batch}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}"; - string code1 = $"(01){basMaterial.di ?? ""}*(11){DateTime.Now.ToString("yyMMdd")}*(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}"; - string code2 = $"{basMaterial.material_specification}*{batch}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}"; + string code1 = $"(01){basMaterial.di ?? ""}*(11){item.act_start_date.Value.ToString("yyMMdd")}*(17){item.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}"; + string code2 = $"{basMaterial.material_specification}*{batch}*{item.act_start_date.Value.ToString("yyyyMMdd")}*{item.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.container_no}"; Dictionary dicCommand1 = new(StringComparer.OrdinalIgnoreCase) { ["DevName"] = "外包装箱码垛线", @@ -3921,90 +3921,90 @@ namespace Tnb.ProductionMgr /// /// /// - [HttpPost] - public async Task GetMarkingInfoByStationId(MarkingLabelInput input) - { - PrdMoTask prdMoTask = await GetPrdMoTaskInfoByStationId(new Dictionary() - { - { "station_id", input.station_id } - }); - if (prdMoTask == null) throw Oops.Bah("没找到对应任务单"); - - if (await _db.Queryable().Where(x => - x.mo_task_code == prdMoTask.mo_task_code && x.status == "0" && x.is_label == 0 && x.is_mark==null).AnyAsync()) - { - await _db.Updateable() - .SetColumns(x => x.is_mark == 0) - .Where(x => x.mo_task_code == prdMoTask.mo_task_code && x.status == "0" && x.is_label == 0 && - x.is_mark == null) - .ExecuteCommandAsync(); - } - else - { - PrdOutPackMarkLabel prdOutPackMarkLabel = new PrdOutPackMarkLabel() - { - is_mark = 0, - is_label = null, - mo_task_code = prdMoTask.mo_task_code, - material_code = prdMoTask.material_code, - create_time = DateTime.Now, - }; - - await _db.Insertable(prdOutPackMarkLabel).ExecuteCommandAsync(); - } - - PrdMoTask parent = await _db.Queryable().SingleAsync(x => x.id == prdMoTask.parent_id); - BasMaterial basMaterial = await _db.Queryable().SingleAsync(x=>x.id==parent.material_id); - - string code = $"(01){basMaterial.di ?? ""}\\n(11){DateTime.Now.ToString("yyMMdd")}\\n(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}\\n(10){parent.batch??""}"; - - return code; - } + // [HttpPost] + // public async Task GetMarkingInfoByStationId(MarkingLabelInput input) + // { + // PrdMoTask prdMoTask = await GetPrdMoTaskInfoByStationId(new Dictionary() + // { + // { "station_id", input.station_id } + // }); + // if (prdMoTask == null) throw Oops.Bah("没找到对应任务单"); + // + // if (await _db.Queryable().Where(x => + // x.mo_task_code == prdMoTask.mo_task_code && x.status == "0" && x.is_label == 0 && x.is_mark==null).AnyAsync()) + // { + // await _db.Updateable() + // .SetColumns(x => x.is_mark == 0) + // .Where(x => x.mo_task_code == prdMoTask.mo_task_code && x.status == "0" && x.is_label == 0 && + // x.is_mark == null) + // .ExecuteCommandAsync(); + // } + // else + // { + // PrdOutPackMarkLabel prdOutPackMarkLabel = new PrdOutPackMarkLabel() + // { + // is_mark = 0, + // is_label = null, + // mo_task_code = prdMoTask.mo_task_code, + // material_code = prdMoTask.material_code, + // create_time = DateTime.Now, + // }; + // + // await _db.Insertable(prdOutPackMarkLabel).ExecuteCommandAsync(); + // } + // + // PrdMoTask parent = await _db.Queryable().SingleAsync(x => x.id == prdMoTask.parent_id); + // BasMaterial basMaterial = await _db.Queryable().SingleAsync(x=>x.id==parent.material_id); + // + // string code = $"(01){basMaterial.di ?? ""}\\n(11){DateTime.Now.ToString("yyMMdd")}\\n(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}\\n(10){parent.batch??""}"; + // + // return code; + // } /// /// 外包装根据工位id获取贴标数据 /// /// /// - [HttpPost] - public async Task GetLabelInfoByStationId(MarkingLabelInput input) - { - PrdMoTask prdMoTask = await GetPrdMoTaskInfoByStationId(new Dictionary() - { - { "station_id", input.station_id } - }); - if (prdMoTask == null) throw Oops.Bah("没找到对应任务单"); - - if (await _db.Queryable().Where(x => - x.mo_task_code == prdMoTask.mo_task_code && x.status == "0" && x.is_label == null && x.is_mark==0).AnyAsync()) - { - await _db.Updateable() - .SetColumns(x => x.is_label == 0) - .Where(x => x.mo_task_code == prdMoTask.mo_task_code && x.status == "0" && x.is_label == null && - x.is_mark == 0) - .ExecuteCommandAsync(); - } - else - { - PrdOutPackMarkLabel prdOutPackMarkLabel = new PrdOutPackMarkLabel() - { - is_mark = null, - is_label = 0, - mo_task_code = prdMoTask.mo_task_code, - material_code = prdMoTask.material_code, - create_time = DateTime.Now, - }; - - await _db.Insertable(prdOutPackMarkLabel).ExecuteCommandAsync(); - } - - PrdMoTask parent = await _db.Queryable().SingleAsync(x => x.id == prdMoTask.parent_id); - BasMaterial basMaterial = await _db.Queryable().SingleAsync(x=>x.id==parent.material_id); - - string code = $"(01){basMaterial.di ?? ""}\\n(11){DateTime.Now.ToString("yyMMdd")}\\n(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}\\n(10){parent.batch??""}"; - - return code; - } + // [HttpPost] + // public async Task GetLabelInfoByStationId(MarkingLabelInput input) + // { + // PrdMoTask prdMoTask = await GetPrdMoTaskInfoByStationId(new Dictionary() + // { + // { "station_id", input.station_id } + // }); + // if (prdMoTask == null) throw Oops.Bah("没找到对应任务单"); + // + // if (await _db.Queryable().Where(x => + // x.mo_task_code == prdMoTask.mo_task_code && x.status == "0" && x.is_label == null && x.is_mark==0).AnyAsync()) + // { + // await _db.Updateable() + // .SetColumns(x => x.is_label == 0) + // .Where(x => x.mo_task_code == prdMoTask.mo_task_code && x.status == "0" && x.is_label == null && + // x.is_mark == 0) + // .ExecuteCommandAsync(); + // } + // else + // { + // PrdOutPackMarkLabel prdOutPackMarkLabel = new PrdOutPackMarkLabel() + // { + // is_mark = null, + // is_label = 0, + // mo_task_code = prdMoTask.mo_task_code, + // material_code = prdMoTask.material_code, + // create_time = DateTime.Now, + // }; + // + // await _db.Insertable(prdOutPackMarkLabel).ExecuteCommandAsync(); + // } + // + // PrdMoTask parent = await _db.Queryable().SingleAsync(x => x.id == prdMoTask.parent_id); + // BasMaterial basMaterial = await _db.Queryable().SingleAsync(x=>x.id==parent.material_id); + // + // string code = $"(01){basMaterial.di ?? ""}\\n(11){DateTime.Now.ToString("yyMMdd")}\\n(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}\\n(10){parent.batch??""}"; + // + // return code; + // } /// /// 获取喷码贴标信息 @@ -4104,7 +4104,7 @@ namespace Tnb.ProductionMgr batch = $"{organizeEntity.EnCode.Substring(organizeEntity.EnCode.Length - 2, 2)}{DateTime.Now.ToString("yyMMdd")}"; } - string code = $"(01){basMaterial.di ?? ""}*(11){DateTime.Now.ToString("yyMMdd")}*(17){DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}#{basMaterial.material_specification}*{batch}*{DateTime.Now.ToString("yyyyMMdd")}*{DateTime.Now.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.material_standard}"; + string code = $"(01){basMaterial.di ?? ""}*(11){prdMoTask.act_start_date.Value.ToString("yyMMdd")}*(17){prdMoTask.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyMMdd")}*(10){batch}#{basMaterial.material_specification}*{batch}*{prdMoTask.act_start_date.Value.ToString("yyyyMMdd")}*{prdMoTask.first_start_date.Value.AddMonths(basMaterial.quality_guarantee_period ?? 0).ToString("yyyyMMdd")}*{basMaterial.material_standard}"; return code; } }