From 805192163dc8af9fa5486ae0faced50ab88e9745 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Thu, 23 Nov 2023 16:29:38 +0800 Subject: [PATCH] 1 --- .../Tnb.ProductionMgr/PrdMaterialReceiptService.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs index b6141638..e8e31547 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs @@ -80,7 +80,7 @@ namespace Tnb.ProductionMgr .AnyAsync(x => x.member_carry_code == qrCode && x.is_all_feeding == 0)) { FeedingDetailOutput result = await db.Queryable() - .LeftJoin((a, b) => a.carry_id == b.id) + .LeftJoin((a, b) => b.carry_code==qrCode) .Where((a) => a.member_carry_code == qrCode && a.is_all_feeding == 0) .Select((a, b) => new FeedingDetailOutput { @@ -106,7 +106,7 @@ namespace Tnb.ProductionMgr else { FeedingDetailOutput result = await db.Queryable() - .LeftJoin((a, b) => a.carry_id == b.id) + .LeftJoin((a, b) => b.carry_code==qrCode) .Where((a) => a.carry_code == qrCode) .Select((a, b) => new FeedingDetailOutput { @@ -344,10 +344,11 @@ namespace Tnb.ProductionMgr carry_code = input.carry_code ?? "", }; - string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + // 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.Request.Headers["Authorization"] }; string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CARRY_SIGN, JsonConvert.SerializeObject(mesCarrySignInput), header); Log.Information(sendResult);