From 8af12b30136d755e3fb6c9c44c2ddae85c75c54a Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Fri, 24 Nov 2023 11:43:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E9=A2=86=E6=96=99=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Consts/DictConst.cs | 31 ++++ .../Dto/PrdManage/OutstockRecordListOutput.cs | 50 +++++++ .../Entity/PrdOutstockH.cs | 5 + .../Tnb.ProductionMgr/PrdFeedingService.cs | 4 +- .../Tnb.ProductionMgr/PrdInstockService.cs | 24 ++-- .../PrdKittingOutRecordDownService.cs | 104 ++++++++++++++ .../PrdKittingOutRecordService.cs | 135 ++++++++++++++++++ .../Tnb.ProductionMgr/PrdKittingOutService.cs | 12 +- .../PrdMaterialReceiptService.cs | 8 +- .../Tnb.ProductionMgr/PrdMoService.cs | 8 +- .../Tnb.ProductionMgr/PrdOutstockService.cs | 14 +- 11 files changed, 361 insertions(+), 34 deletions(-) create mode 100644 ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/OutstockRecordListOutput.cs create mode 100644 ProductionMgr/Tnb.ProductionMgr/PrdKittingOutRecordDownService.cs create mode 100644 ProductionMgr/Tnb.ProductionMgr/PrdKittingOutRecordService.cs diff --git a/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs b/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs index c5872aa9..c2e5a7df 100644 --- a/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs +++ b/BasicData/Tnb.BasicData.Entities/Consts/DictConst.cs @@ -226,6 +226,37 @@ public static class DictConst /// 出库单据状态完成 /// public const string OUTSTOCKSTATUSCOMPLETED = "8"; + + /// + /// 出库单据状态新增id + /// + public const string OUTSTOCKSTATUSADDID = "25065138925589"; + + /// + /// 出库单据状态作业中id + /// + public const string OUTSTOCKSTATUSWORKINGID = "25065143245845"; + + /// + /// 出库单据状态已呼叫id + /// + public const string OUTSTOCKSTATUSCALLEDID = "26169430480933"; + + /// + /// 出库单据状态待配送id + /// + public const string OUTSTOCKSTATUSTOBEDELIVEREDID = "26169434213669"; + + /// + /// 出库单据状态取消id + /// + public const string OUTSTOCKSTATUSCANCELID = "25065146252309"; + + /// + /// 出库单据状态完成id + /// + public const string OUTSTOCKSTATUSCOMPLETEDID = "25065149810453"; + #endregion diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/OutstockRecordListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/OutstockRecordListOutput.cs new file mode 100644 index 00000000..227ee4fc --- /dev/null +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/OutstockRecordListOutput.cs @@ -0,0 +1,50 @@ +namespace Tnb.ProductionMgr.Entities.Dto +{ + public class OutstockRecordListOutput + { + public string id { get; set; } + public string mo_task_code { get; set; } + public string mo_id { get; set; } + public string material_id { get; set; } + public string material_id_id { get; set; } + public string process_id { get; set; } + public string process_id_id { get; set; } + public string workstation_id { get; set; } + public string workstation_id_id { get; set; } + public string act_start_date { get; set; } + public List tablefield105 { get; set; } = new List(); + public List tablefield134 { get; set; } = new List(); + } + + public class OutstockRecordListChildOutput + { + public string id { get; set; } + public string code { get; set; } + public string bill_code { get; set; } + public string warehouse_id { get; set; } + public string warehouse_id_id { get; set; } + public string location_code { get; set; } + public string create_id { get; set; } + public string create_time { get; set; } + /// + /// 1 齐套 2 一般/物料出库 + /// + public string type { get; set; } + } + public class PrdKittingOutRecordListChildOutput : OutstockRecordListChildOutput + { + public string collocation_scheme_id { get; set; } + public string collocation_scheme_id_id { get; set; } + } + + public class OutstockRecordListDownOutput + { + public string id { get; set; } + public string material_id { get; set; } + public string material_id_id { get; set; } + public string unit_id { get; set; } + public string code_batch { get; set; } + public string pr_qty { get; set; } + public string box { get; set; } + } +} \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs index 5d31f9a8..101b39b8 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutstockH.cs @@ -84,5 +84,10 @@ public partial class PrdOutstockH : BaseEntity /// 流程引擎Id /// public string? f_flowid { get; set; } + + /// + /// 生产任务单id + /// + public string? mo_task_id { get; set; } } \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs index 4507a7f1..d437363a 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs @@ -306,10 +306,10 @@ namespace Tnb.ProductionMgr // carry_code = input.carry_code ?? "", // }; // - // string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + // string domain = _userManager.Domain; // Dictionary header = new Dictionary() // { - // ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + // ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" // }; // var sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CARRY_SIGN,JsonConvert.SerializeObject(mesCarrySignInput),header); // Log.Information(sendResult); diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs index 7a241b19..c2e89f24 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs @@ -198,11 +198,11 @@ namespace Tnb.ProductionMgr codeqty = Convert.ToInt32(item.ContainsKey("quantity") ? item["quantity"] : "0"), }); } - // string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + // string domain = _userManager.Domain; string domain = _userManager.Domain; Dictionary header = new() { - ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" }; string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CREATE_INSTOCK, JsonConvert.SerializeObject(mesCreateInstockInput), header); Log.Information(sendResult); @@ -395,12 +395,12 @@ namespace Tnb.ProductionMgr code_batch = prdReport.mo_task_code, codeqty = (int)prdReport.reported_qty, }); - // string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + // string domain = _userManager.Domain; // string domain = "http://localhost:9232"; string domain = _userManager.Domain; Dictionary header = new() { - // ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + // ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" }; string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CREATE_INSTOCK, JsonConvert.SerializeObject(mesCreateInstockInput), header); Log.Information(sendResult); @@ -507,11 +507,11 @@ namespace Tnb.ProductionMgr // code_batch = prdReport.mo_task_code, // codeqty = (int)prdReport.reported_qty, // }); - // // string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + // // string domain = _userManager.Domain; // string domain = _userManager.Domain; // Dictionary header = new() // { - // // ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + // // ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" // }; // string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CREATE_INSTOCK, JsonConvert.SerializeObject(mesCreateInstockInput), header); // Log.Information(sendResult); @@ -667,13 +667,13 @@ namespace Tnb.ProductionMgr code_batch = prdReport.mo_task_code, codeqty = (int)prdReport.reported_qty, }); - // string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + // string domain = _userManager.Domain; // string domain = _userManager.Domain; // string domain = "http://localhost:9232"; string domain = _userManager.Domain; Dictionary header = new() { - // ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + // ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" }; string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CREATE_INSTOCK, JsonConvert.SerializeObject(mesCreateInstockInput), header); Log.Information(sendResult); @@ -783,12 +783,12 @@ namespace Tnb.ProductionMgr code_batch = prdReport.mo_task_code, codeqty = (int)prdReport.reported_qty, }); - // string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + // string domain = _userManager.Domain; string domain = _userManager.Domain; // string domain = "http://localhost:9232"; Dictionary header = new() { - // ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + // ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" }; string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CREATE_INSTOCK, JsonConvert.SerializeObject(mesCreateInstockInput), header); Log.Information(sendResult); @@ -973,11 +973,11 @@ namespace Tnb.ProductionMgr }); } - // string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + // string domain = _userManager.Domain; string domain = _userManager.Domain; Dictionary header = new() { - // ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + // ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" }; string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CREATE_INSTOCK, JsonConvert.SerializeObject(mesCreateInstockInput), header); Log.Information(sendResult); diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdKittingOutRecordDownService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdKittingOutRecordDownService.cs new file mode 100644 index 00000000..5c77e386 --- /dev/null +++ b/ProductionMgr/Tnb.ProductionMgr/PrdKittingOutRecordDownService.cs @@ -0,0 +1,104 @@ +using JNPF.Common.Core.Manager; +using JNPF.Common.Filter; +using JNPF.DependencyInjection; +using JNPF.DynamicApiController; +using JNPF.Systems.Entitys.Permission; +using JNPF.Systems.Entitys.System; +using JNPF.Systems.Interfaces.Permission; +using JNPF.VisualDev; +using JNPF.VisualDev.Entitys.Dto.VisualDevModelData; +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; +using SqlSugar; +using Tnb.BasicData; +using Tnb.BasicData.Entities; +using Tnb.EquipMgr.Entities; +using Tnb.ProductionMgr.Entities; +using Tnb.ProductionMgr.Entities.Dto; +using Tnb.WarehouseMgr.Entities; + +namespace Tnb.ProductionMgr +{ + /// + /// 齐套出库领料记录pc端 + /// + [ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 700)] + [Route("api/[area]/[controller]/[action]")] + [OverideVisualDev(ModuleId)] + public class PrdKittingOutRecordDownService : IDynamicApiController, ITransient, IOverideVisualDevService + { + private readonly ISqlSugarRepository _repository; + private readonly IUserManager _userManager; + private readonly IOrganizeService _organizeService; + private const string ModuleId = "30305671171605"; + public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); + + public PrdKittingOutRecordDownService( + ISqlSugarRepository repository, + IOrganizeService organizeService, + IUserManager userManager + ) + { + _repository = repository; + _organizeService = organizeService; + _userManager = userManager; + OverideFuncs.GetListAsync = GetList; + } + + private async Task GetList(VisualDevModelListQueryInput input) + { + var db = _repository.AsSugarClient(); + Dictionary? queryJson = !string.IsNullOrEmpty(input.queryJson) ? JsonConvert.DeserializeObject>(input.queryJson) : new Dictionary(); + string kitting_out_id = queryJson.ContainsKey("kitting_out_id") ? queryJson["kitting_out_id"].ToString() : ""; + string type = queryJson.ContainsKey("type") ? queryJson["type"].ToString() : ""; + + if (string.IsNullOrEmpty(kitting_out_id)) + { + return new + { + pagination = new PageResult(), + list = Array.Empty() + }; + } + + if (type == "1") + { + var result = await db.Queryable() + .LeftJoin((a, b) => a.material_id == b.id) + .LeftJoin((a,b,c)=>a.unit_id==c.Id) + .WhereIF(!string.IsNullOrEmpty(kitting_out_id),a=>a.kitting_out_id==kitting_out_id) + .Select((a, b, c) => new OutstockRecordListDownOutput + { + id = a.id, + material_id = b.name, + material_id_id = a.material_id, + unit_id = c.FullName, + code_batch = a.code_batch, + pr_qty = a.pr_qty.ToString(), + box = a.box.ToString(), + }).ToPagedListAsync(input.currentPage, input.pageSize); + return PageResult.SqlSugarPageResult(result); + } + else + { + var result = await db.Queryable() + .LeftJoin((a, b) => a.material_id == b.id) + .LeftJoin((a,b,c)=>a.unit_id==c.Id) + .WhereIF(!string.IsNullOrEmpty(kitting_out_id),a=>a.outstock_id==kitting_out_id) + .Select((a, b, c) => new OutstockRecordListDownOutput + { + id = a.id, + material_id = b.name, + material_id_id = a.material_id, + unit_id = c.FullName, + code_batch = a.code_batch, + pr_qty = "", + box = a.pr_qty.ToString(), + }).ToPagedListAsync(input.currentPage, input.pageSize); + return PageResult.SqlSugarPageResult(result); + } + + + } + } +} \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdKittingOutRecordService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdKittingOutRecordService.cs new file mode 100644 index 00000000..9abb6b6d --- /dev/null +++ b/ProductionMgr/Tnb.ProductionMgr/PrdKittingOutRecordService.cs @@ -0,0 +1,135 @@ +using JNPF.Common.Core.Manager; +using JNPF.Common.Filter; +using JNPF.DependencyInjection; +using JNPF.DynamicApiController; +using JNPF.Systems.Entitys.Permission; +using JNPF.Systems.Interfaces.Permission; +using JNPF.VisualDev; +using JNPF.VisualDev.Entitys.Dto.VisualDevModelData; +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; +using SqlSugar; +using Tnb.BasicData; +using Tnb.BasicData.Entities; +using Tnb.EquipMgr.Entities; +using Tnb.ProductionMgr.Entities; +using Tnb.ProductionMgr.Entities.Dto; +using Tnb.WarehouseMgr.Entities; + +namespace Tnb.ProductionMgr +{ + /// + /// 齐套出库领料记录pc端 + /// + [ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 700)] + [Route("api/[area]/[controller]/[action]")] + [OverideVisualDev(ModuleId)] + public class PrdKittingOutRecordService : IDynamicApiController, ITransient, IOverideVisualDevService + { + private readonly ISqlSugarRepository _repository; + private readonly IUserManager _userManager; + private readonly IOrganizeService _organizeService; + private const string ModuleId = "30303202245397"; + public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); + + public PrdKittingOutRecordService( + ISqlSugarRepository repository, + IOrganizeService organizeService, + IUserManager userManager + ) + { + _repository = repository; + _organizeService = organizeService; + _userManager = userManager; + OverideFuncs.GetListAsync = GetList; + } + + private async Task GetList(VisualDevModelListQueryInput input) + { + var db = _repository.AsSugarClient(); + Dictionary? queryJson = !string.IsNullOrEmpty(input.queryJson) ? JsonConvert.DeserializeObject>(input.queryJson) : new Dictionary(); + string mo_task_code = queryJson.ContainsKey("mo_task_code") ? queryJson["mo_task_code"].ToString() : ""; + string mo_code = queryJson.ContainsKey("mo_id.mo_code") ? queryJson["mo_id.mo_code"].ToString() : ""; + string workstation_id_str = queryJson.ContainsKey("workstation_id") ? queryJson["workstation_id"].ToString() : ""; + string workstation_id = ""; + if (!string.IsNullOrEmpty(workstation_id_str)) + { + string[] workstation_arr = JsonConvert.DeserializeObject(workstation_id_str); + if (workstation_arr != null && workstation_arr.Length > 0) + { + workstation_id = workstation_arr[workstation_arr.Length - 1]; + } + } + + if (string.IsNullOrEmpty(input.sidx)) + { + input.sidx = "a.create_time"; + input.sort = "desc"; + } + else + { + input.sidx = "a." + input.sidx; + } + + + var result = await db.Queryable() + .LeftJoin((a, b) => a.material_id == b.id) + .LeftJoin((a,b,c)=>a.workstation_id==c.Id) + .LeftJoin((a,b,c,d)=>a.process_id==d.id) + .LeftJoin((a,b,c,d,e)=>a.mo_id==e.id) + .WhereIF(!string.IsNullOrEmpty(mo_task_code),a=>a.mo_task_code.Contains(mo_task_code)) + .WhereIF(!string.IsNullOrEmpty(mo_code),(a,b,c,d,e)=>e.mo_code.Contains(mo_code)) + .WhereIF(!string.IsNullOrEmpty(workstation_id),(a,b,c,d,e)=>a.workstation_id==workstation_id) + .Where(a=>a.act_start_date!=null) + .OrderBy($"{input.sidx} {input.sort}") + .Select((a, b, c, d,e) => new OutstockRecordListOutput + { + id = a.id, + mo_task_code = a.mo_task_code, + mo_id = e.mo_code, + material_id = b.name, + material_id_id = a.material_id, + workstation_id = c.FullName, + workstation_id_id = a.workstation_id, + process_id = d.process_name, + process_id_id = a.process_id, + act_start_date = a.act_start_date==null ? "" : a.act_start_date.Value.ToString(DbTimeFormat.SS), + tablefield105 = SqlFunc.Subqueryable() + .LeftJoin((x,y)=>x.warehouse_id==y.id) + .LeftJoin((x,y,z)=>x.create_id==z.Id) + .LeftJoin((x,y,z,cs)=>x.collocation_scheme_id==cs.id) + .Where(x=>x.mo_task_id==a.id).ToList((x,y,z,cs)=>new PrdKittingOutRecordListChildOutput() + { + id = x.id, + code = x.code, + bill_code = x.code, + warehouse_id = y.whname, + warehouse_id_id = x.warehouse_id, + location_code = x.location_code, + create_id = z.RealName, + create_time = x.create_time==null ? "" : x.create_time.Value.ToString(DbTimeFormat.SS), + collocation_scheme_id = cs.bill_name, + collocation_scheme_id_id = x.collocation_scheme_id, + type="1" + + }), + tablefield134 = SqlFunc.Subqueryable() + .LeftJoin((x,y)=>x.warehouse_id==y.id) + .LeftJoin((x,y,z)=>x.create_id==z.Id) + .Where(x=>x.mo_task_id==a.id).ToList((x,y,z)=>new OutstockRecordListChildOutput() + { + id = x.id, + code = x.bill_code, + bill_code = x.bill_code, + warehouse_id = y.whname, + warehouse_id_id = x.warehouse_id, + location_code = x.location_code, + create_id = z.RealName, + create_time = x.create_time==null ? "" : x.create_time.Value.ToString(DbTimeFormat.SS), + type="2" + }), + }).ToPagedListAsync(input.currentPage, input.pageSize); + return PageResult.SqlSugarPageResult(result); + } + } +} \ No newline at end of file diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdKittingOutService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdKittingOutService.cs index 7bc067f5..60b80d52 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdKittingOutService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdKittingOutService.cs @@ -82,10 +82,10 @@ namespace Tnb.ProductionMgr // }); // // input[0].wmsKittingoutDs = JsonConvert.DeserializeObject>(JsonConvert.SerializeObject(visualDevModelDataCrInput.data["tableField115"])); - // string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + // string domain = _userManager.Domain; // Dictionary header = new Dictionary() // { - // ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + // ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" // }; // var sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_KITTING_OUT_STK,JsonConvert.SerializeObject(input),header); // Log.Information(sendResult); @@ -192,10 +192,10 @@ namespace Tnb.ProductionMgr }; input[0].wmsKittingoutDs = JsonConvert.DeserializeObject>(JsonConvert.SerializeObject(kittingOutInput.tableField115)); - string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + string domain = _userManager.Domain; Dictionary header = new() { - ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" }; string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_KITTING_OUT_STK, JsonConvert.SerializeObject(input), header); Log.Information(sendResult); @@ -332,10 +332,10 @@ namespace Tnb.ProductionMgr }); } - string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + string domain = _userManager.Domain; Dictionary header = new() { - ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" }; string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_KITTING_OUT_STK, JsonConvert.SerializeObject(input), header); Log.Information(sendResult); diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs index ec0aef19..76878d99 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs @@ -225,10 +225,10 @@ namespace Tnb.ProductionMgr carry_code = input.carry_code ?? "", }; - string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + string domain = _userManager.Domain; Dictionary header = new() { - ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" }; string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CARRY_SIGN, JsonConvert.SerializeObject(mesCarrySignInput), header); Log.Information(sendResult); @@ -344,11 +344,11 @@ namespace Tnb.ProductionMgr carry_code = input.carry_code ?? "", }; - // string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + // string domain = _userManager.Domain; string domain = _userManager.Domain; Dictionary header = new() { - // ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + // ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" }; string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CARRY_SIGN, JsonConvert.SerializeObject(mesCarrySignInput), header); Log.Information(sendResult); diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs index 3bf1c98a..ec998219 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs @@ -914,10 +914,10 @@ namespace Tnb.ProductionMgr public async Task PrdMoReverseFromMaterialInfo(PrdMoReverseFromQueryInput prdMoReverseFromQueryInput) { string barcode = prdMoReverseFromQueryInput.barcode ?? ""; - string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + string domain = _userManager.Domain; Dictionary header = new() { - ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" }; Dictionary postData = new() { @@ -1222,10 +1222,10 @@ namespace Tnb.ProductionMgr List barCodes = await _db.Queryable().Where(x => reportIds.Contains(x.id)).Select(x => x.barcode).ToListAsync(); - string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + string domain = _userManager.Domain; Dictionary header = new() { - ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" }; Dictionary postData = new() { diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs index d677dcf0..41c2048d 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdOutstockService.cs @@ -95,10 +95,10 @@ namespace Tnb.ProductionMgr // } input.outstockDs = JsonConvert.DeserializeObject>(JsonConvert.SerializeObject(visualDevModelDataCrInput.data["tablefield107"])); - string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + string domain = _userManager.Domain; Dictionary header = new() { - ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" }; string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CREATE_OUTSTOCK, JsonConvert.SerializeObject(input), header); Log.Information(sendResult); @@ -187,10 +187,10 @@ namespace Tnb.ProductionMgr }); } - string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + string domain = _userManager.Domain; Dictionary header = new() { - ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" }; string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CREATE_OUTSTOCK, JsonConvert.SerializeObject(input), header); Log.Information(sendResult); @@ -213,6 +213,7 @@ namespace Tnb.ProductionMgr prdOutstockH.workstation_id = generalOutstockInput.workstation_id; prdOutstockH.workline = workline?.Id ?? ""; prdOutstockH.status = DictConst.OUTSTOCKSTATUSADD; + prdOutstockH.mo_task_id = prdMoTask.id; List prdOutstockDs = new(); foreach (GeneralOutstockDInput item in generalOutstockInput.details) @@ -311,10 +312,10 @@ namespace Tnb.ProductionMgr }); } - string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + string domain = _userManager.Domain; Dictionary header = new Dictionary() { - ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + ["Authorization"] = App.HttpContext!=null ? App.HttpContext.Request.Headers["Authorization"] : "" }; var sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CREATE_OUTSTOCK,JsonConvert.SerializeObject(input),header); Log.Information(sendResult); @@ -337,6 +338,7 @@ namespace Tnb.ProductionMgr prdOutstockH.workstation_id = materialOutstockInput.workstation_id; prdOutstockH.workline = workline?.Id ?? ""; prdOutstockH.status = DictConst.OUTSTOCKSTATUSADD; + prdOutstockH.mo_task_id = prdMoTask.id; List prdOutstockDs = new List(); foreach (var item in materialOutstockInput.details)