From e2f7309903627ebdaa1316d664c7a8d6c8378811 Mon Sep 17 00:00:00 2001 From: "yang.lee" Date: Wed, 22 Nov 2023 10:59:31 +0800 Subject: [PATCH 01/11] 1 --- .../Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs | 5 +++++ WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs index abc29c92..4a5c092c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryCode.part.cs @@ -43,5 +43,10 @@ public partial class WmsCarryCode /// [SugarColumn(IsIgnore = true)] public decimal pr_qty { get; set; } + /// + /// 载具编码 + /// + [SugarColumn(IsIgnore = true)] + public string carry_code { get; set; } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs index d919a626..479fbeca 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs @@ -146,7 +146,7 @@ namespace Tnb.WarehouseMgr var carryCodes = await _db.Queryable().InnerJoin((a, b) => a.id == b.location_id) .InnerJoin((a, b, c) => b.carry_id == c.id) .Where(filterExpable.ToExpression()) - .Select() + .Select((a,b,c)=>new WmsCarryCode { carry_code = c.carry_code},true) .ToListAsync(); carryCodes ??= Enumerable.Empty().ToList(); @@ -380,7 +380,7 @@ namespace Tnb.WarehouseMgr var carryCodes = await _db.Queryable().InnerJoin((a, b) => a.id == b.location_id) .InnerJoin((a, b, c) => b.carry_id == c.id) .Where(filterExp) - .Select() + .Select((a, b, c) =>new WmsCarryCode { carry_code=c.carry_code },true) .ToListAsync(); List outputs = carryCodes.GroupBy(g => new { g.material_code, g.code_batch, g.location_code, g.carry_id }).Select(x => new WmsCheckstockD From f84883811b523bbc2de76a98eb406146436ba3a1 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Wed, 22 Nov 2023 14:31:08 +0800 Subject: [PATCH 02/11] 1 --- ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs index 334e96a3..6bce7c2f 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs @@ -264,12 +264,12 @@ namespace Tnb.ProductionMgr string equip_code = input.equip_code; string label_code = input.label_code; string warehouse_id = "2"; - if (!string.IsNullOrEmpty(equip_code)) + if (string.IsNullOrEmpty(equip_code)) { throw Oops.Bah("请传机台号"); } - if (!string.IsNullOrEmpty(label_code)) + if (string.IsNullOrEmpty(label_code)) { throw Oops.Bah("请传标签号"); } From e35811b36d1b6953aa45ae9e855ba0a7577139a6 Mon Sep 17 00:00:00 2001 From: qianjiawei <1184704771@qq.com> Date: Wed, 22 Nov 2023 14:33:16 +0800 Subject: [PATCH 03/11] =?UTF-8?q?redis=E5=AE=9A=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs | 2 +- apihost/Tnb.API.Entry/Startup.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs index d675772a..1db8c335 100644 --- a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs +++ b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs @@ -220,7 +220,7 @@ namespace Tnb.ProductionMgr } public Task StartAsync(CancellationToken cancellationToken) { - Readtimer = new Timer(GetRedisData, null, TimeSpan.Zero, TimeSpan.FromSeconds(5)); + Readtimer = new Timer(GetRedisData, null, TimeSpan.Zero, TimeSpan.FromMinutes(5)); return Task.CompletedTask; } public Task StopAsync(CancellationToken cancellationToken) diff --git a/apihost/Tnb.API.Entry/Startup.cs b/apihost/Tnb.API.Entry/Startup.cs index 1efe0fb4..3dbfefd2 100644 --- a/apihost/Tnb.API.Entry/Startup.cs +++ b/apihost/Tnb.API.Entry/Startup.cs @@ -57,7 +57,7 @@ public class Startup : AppStartup //定时任务 services.AddHostedService(); - //services.AddHostedService(); + services.AddHostedService(); } From 41064d17ba68a1c98609ec7aba7b9950b3695e71 Mon Sep 17 00:00:00 2001 From: hlb <894797954@qq.com> Date: Wed, 22 Nov 2023 15:22:36 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=9A=84=E9=A2=84=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0=E7=82=B9?= =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs index 479fbeca..db6d3362 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs @@ -237,6 +237,10 @@ namespace Tnb.WarehouseMgr startlocation_code = sPoint?.location_code!, endlocation_id = ePoint?.location_id!, endlocation_code = ePoint?.location_code!, + startpoint_id = sPoint?.id!, + startpoint_code = sPoint?.point_code!, + endpoint_id = ePoint?.id!, + endpoint_code = ePoint?.point_code!, start_floor = sPoint?.floor.ToString(), end_floor = ePoint?.floor.ToString(), bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(), From 9cfc0a0e8acd80b1628bf30c10e3fd4c5d956d1e Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Wed, 22 Nov 2023 16:02:09 +0800 Subject: [PATCH 05/11] 1 --- .../Tnb.ProductionMgr/PrdInstockService.cs | 45 ++++++++++++------- .../Tnb.ProductionMgr/RedisBackGround.cs | 2 +- .../Tnb.WarehouseMgr/WmsInStockService.cs | 3 ++ .../Tnb.WarehouseMgr/WmsOutStockService.cs | 2 + .../WmsSignForDeliveryService.cs | 2 + .../Tnb.WarehouseMgr/WmskittingOutService.cs | 2 + 6 files changed, 40 insertions(+), 16 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs index 6bce7c2f..94e4ef29 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs @@ -198,7 +198,8 @@ 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 = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + string domain = "http://tnb.tuotong-tech.com"; Dictionary header = new() { ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] @@ -275,11 +276,20 @@ namespace Tnb.ProductionMgr } ISqlSugarClient db = _repository.AsSugarClient(); - EqpEquipment equipment = await db.Queryable() - .LeftJoin((x,y)=>x.id==y.equip_id) - .Where((x,y) => y.equip_code==equip_code && y.label_name==label_code && y.label_point=="提报装箱称重点位") - .Select((x,y)=>x) - .FirstAsync(); + EqpEquipment equipment = null; + try + { + equipment = await db.Queryable() + .LeftJoin((x,y)=>x.id==y.equip_id) + .Where((x,y) => y.equip_code==equip_code && y.label_name==label_code && y.label_point=="提报装箱称重点位") + .Select((x,y)=>x) + .FirstAsync(); + } + catch (Exception e) + { + Console.WriteLine(e); + throw; + } if (equipment == null) { throw Oops.Bah("未找到机台"); @@ -299,6 +309,7 @@ namespace Tnb.ProductionMgr PrdReport prdReport = await db.Queryable() .Where(x => x.equip_id == equipment.id && x.status == 0).OrderByDescending(x => x.create_time) .FirstAsync(); + string create_id = prdReport.create_id; if (prdReport == null) { throw Oops.Bah("未找到提报记录"); @@ -317,14 +328,14 @@ namespace Tnb.ProductionMgr { bill_type = DictConst.CHANCHENGPINRUKUDAN, bill_date = DateTime.Now, - create_id = _userManager.UserId, + create_id = create_id, location_code = basLocation.location_code, carry_code = prdReport.material_box_code, is_check = 1, station_id = prdReport.station, workline_id = workline?.Id ?? "", workshop_id = workshop?.Id ?? "", - org_id = _userManager.GetUserInfo().Result.organizeId, + // org_id = _userManager.GetUserInfo().Result.organizeId, // warehouse_id = basLocation?.wh_id, warehouse_id = warehouse_id, status = 0, @@ -349,13 +360,13 @@ namespace Tnb.ProductionMgr { instock = new MESWmsInstockHInput() { - org_id = _userManager.GetUserInfo().Result.organizeId, + // org_id = _userManager.GetUserInfo().Result.organizeId, bill_date = DateTime.Now, bill_type = DictConst.CHANCHENGPINRUKUDAN, // warehouse_id = basLocation?.wh_id, warehouse_id = warehouse_id, source_id = prdInstockH.id, - create_id = _userManager.UserId, + create_id = create_id, carry_code = prdReport.material_box_code, location_code = basLocation.location_code, is_check = 1, @@ -381,10 +392,11 @@ namespace Tnb.ProductionMgr code_batch = prdReport.barcode + "0001", codeqty = (int)prdReport.reported_qty, }); - 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 = "http://tnb.tuotong-tech.com"; Dictionary header = new() { - ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] + // ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] }; string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CREATE_INSTOCK, JsonConvert.SerializeObject(mesCreateInstockInput), header); Log.Information(sendResult); @@ -488,7 +500,8 @@ namespace Tnb.ProductionMgr code_batch = prdReport.barcode + "0001", codeqty = (int)prdReport.reported_qty, }); - 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 = "http://tnb.tuotong-tech.com"; Dictionary header = new() { ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] @@ -598,7 +611,8 @@ namespace Tnb.ProductionMgr code_batch = prdReport.barcode + "0001", codeqty = (int)prdReport.reported_qty, }); - 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 = "http://tnb.tuotong-tech.com"; Dictionary header = new() { ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] @@ -782,7 +796,8 @@ namespace Tnb.ProductionMgr }); } - 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 = "http://tnb.tuotong-tech.com"; Dictionary header = new() { ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] diff --git a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs index 1db8c335..c1147aa9 100644 --- a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs +++ b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs @@ -220,7 +220,7 @@ namespace Tnb.ProductionMgr } public Task StartAsync(CancellationToken cancellationToken) { - Readtimer = new Timer(GetRedisData, null, TimeSpan.Zero, TimeSpan.FromMinutes(5)); + Readtimer = new Timer(GetRedisData, null, TimeSpan.Zero, TimeSpan.FromSeconds(60)); return Task.CompletedTask; } public Task StopAsync(CancellationToken cancellationToken) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs index ce05775b..8f7d7e26 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs @@ -6,6 +6,7 @@ using JNPF.EventBus; using JNPF.FriendlyException; using JNPF.Systems.Interfaces.System; using Mapster; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using SqlSugar; using Tnb.BasicData.Entities; @@ -267,6 +268,7 @@ namespace Tnb.WarehouseMgr /// /// [HttpPost] + [AllowAnonymous] public async Task MESCreateInstock(MESCreateInstockInput input) { bool isSuccessFul = false; @@ -498,6 +500,7 @@ namespace Tnb.WarehouseMgr /// /// [HttpPost] + [AllowAnonymous] public async Task MesFetchInOutStockInfoByBarCode(MaterialLabelQuery input) { if (input.IsNull()) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs index 1ef4e5e4..69587709 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs @@ -13,6 +13,7 @@ using JNPF.VisualDev; using JNPF.VisualDev.Entitys; using JNPF.VisualDev.Interfaces; using Mapster; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; using SqlSugar; @@ -551,6 +552,7 @@ namespace Tnb.WarehouseMgr /// [HttpPost] //[NonUnify] + [AllowAnonymous] public async Task MESCreateOutstock(MESCreateOutstockInput input) { bool isSuccessful = true; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs index c24b1456..e49d74db 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs @@ -2,6 +2,7 @@ using JNPF.Common.Extension; using JNPF.Systems.Interfaces.System; using Mapster; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using SqlSugar; using Tnb.BasicData.Entities; @@ -114,6 +115,7 @@ namespace Tnb.WarehouseMgr /// /// [HttpPost] + [AllowAnonymous] public async Task MESCarrySign(MESCarrySignInput input) { if (input.IsNull()) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs index 4345e405..c0c22bc8 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs @@ -12,6 +12,7 @@ using JNPF.LinqBuilder; using JNPF.Logging; using JNPF.Systems.Interfaces.System; using Mapster; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using SqlSugar; using Tnb.BasicData.Entities; @@ -391,6 +392,7 @@ namespace Tnb.WarehouseMgr /// /// [HttpPost] + [AllowAnonymous] public async Task MESKittingOutStk(List input) { bool isSuccessFul = false; From 9af56baece44f759a3b28b4eef6fba1c4c13e45d Mon Sep 17 00:00:00 2001 From: hlb <894797954@qq.com> Date: Wed, 22 Nov 2023 16:50:51 +0800 Subject: [PATCH 06/11] =?UTF-8?q?MES=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=85=88=E4=B8=8D=E5=9B=9E=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs index ce05775b..74d140a9 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs @@ -308,8 +308,8 @@ namespace Tnb.WarehouseMgr instock.location_id = loc.id; instock.biz_type = WmsWareHouseConst.BIZTYPE_WMSINSTOCK_ID; instock.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_INSTOCK_ENCODE).GetAwaiter().GetResult(); - instock.generate_type = "1";// 自动 - instock.sync_status = WmsWareHouseConst.SYNC_STATUS__NOTSYNC;//未同步 + instock.generate_type = "0";// 自动 + instock.sync_status = WmsWareHouseConst.SYNC_STATUS_NONEEDSYNC;//未同步 instock.print_status = WmsWareHouseConst.PRINT_STATUS_PRINTCOMPLETE;//已打印 instock.status = WmsWareHouseConst.BILLSTATUS_ADD_ID;// 新增 instock.create_time = DateTime.Now; From fb9e44e46a88fb5a44b3e7c08e3816fb485b2e76 Mon Sep 17 00:00:00 2001 From: hlb <894797954@qq.com> Date: Wed, 22 Nov 2023 16:53:30 +0800 Subject: [PATCH 07/11] =?UTF-8?q?MES=E5=87=BA=E5=BA=93=E5=85=88=E4=B8=8D?= =?UTF-8?q?=E7=94=A8=E5=9B=9E=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs index 69587709..804bdde7 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs @@ -576,8 +576,8 @@ namespace Tnb.WarehouseMgr outstock.location_id = location.id; outstock.biz_type = WmsWareHouseConst.BIZTYPE_WMSOUTSTOCK_ID; outstock.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_OUTSTOCK_ENCODE).GetAwaiter().GetResult(); - outstock.generate_type = "1";// 自动 - outstock.sync_status = WmsWareHouseConst.SYNC_STATUS__NOTSYNC;//未同步 + outstock.generate_type = "0";// 自动 + outstock.sync_status = WmsWareHouseConst.SYNC_STATUS_NONEEDSYNC;//未同步 outstock.status = WmsWareHouseConst.BILLSTATUS_ADD_ID;// 新增 outstock.create_id = _userManager.UserId; outstock.create_time = DateTime.Now; From 88e6fb700e6b12a0911be263f6bf4aa1c17b9e55 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Wed, 22 Nov 2023 17:33:12 +0800 Subject: [PATCH 08/11] 1 --- .../Tnb.ProductionMgr/PrdInstockService.cs | 15 +++++++++------ .../Tnb.ProductionMgr/PrdMoTaskService.cs | 3 ++- .../Tnb.ProductionMgr/RedisBackGround.cs | 2 +- .../Tnb.WarehouseMgr/WmsInStockService.cs | 12 ++++++------ 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs index 94e4ef29..047513d0 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs @@ -310,6 +310,8 @@ namespace Tnb.ProductionMgr .Where(x => x.equip_id == equipment.id && x.status == 0).OrderByDescending(x => x.create_time) .FirstAsync(); string create_id = prdReport.create_id; + UserEntity user = await db.Queryable().SingleAsync(x => x.Id == create_id); + string org_id = user.OrganizeId; if (prdReport == null) { throw Oops.Bah("未找到提报记录"); @@ -335,7 +337,7 @@ namespace Tnb.ProductionMgr station_id = prdReport.station, workline_id = workline?.Id ?? "", workshop_id = workshop?.Id ?? "", - // org_id = _userManager.GetUserInfo().Result.organizeId, + org_id = org_id, // warehouse_id = basLocation?.wh_id, warehouse_id = warehouse_id, status = 0, @@ -349,7 +351,7 @@ namespace Tnb.ProductionMgr material_code = basMaterial.code, unit_id = prdReport.unit_id, barcode = prdReport.barcode, - code_batch = prdReport.barcode + "0001", + code_batch = prdReport.mo_task_code, quantity = (int)prdReport.reported_qty, }); }); @@ -360,7 +362,7 @@ namespace Tnb.ProductionMgr { instock = new MESWmsInstockHInput() { - // org_id = _userManager.GetUserInfo().Result.organizeId, + org_id = org_id, bill_date = DateTime.Now, bill_type = DictConst.CHANCHENGPINRUKUDAN, // warehouse_id = basLocation?.wh_id, @@ -379,7 +381,7 @@ namespace Tnb.ProductionMgr material_id = prdReport.material_id, material_code = basMaterial.code, unit_id = prdReport.unit_id, - code_batch = prdReport.barcode, + code_batch = prdReport.mo_task_code, pr_qty = (int)prdReport.reported_qty, }); @@ -389,10 +391,11 @@ namespace Tnb.ProductionMgr material_code = basMaterial.code, unit_id = prdReport.unit_id, barcode = prdReport.barcode, - code_batch = prdReport.barcode + "0001", + 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 = "http://localhost:9232"; string domain = "http://tnb.tuotong-tech.com"; Dictionary header = new() { @@ -401,7 +404,7 @@ namespace Tnb.ProductionMgr string sendResult = HttpUtils.RequestPost(domain + WebApiConst.MES_CREATE_INSTOCK, JsonConvert.SerializeObject(mesCreateInstockInput), header); Log.Information(sendResult); AuthResponse authResponse = JsonConvert.DeserializeObject(sendResult); - result2 = authResponse.code != 200 || !authResponse.data.ObjToBool() + result2 = authResponse.code != 200 || !(bool)authResponse.data ? throw Oops.Bah(authResponse.msg) : await db.Ado.UseTranAsync(async () => { diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index e066aff7..54907b70 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -1503,7 +1503,8 @@ namespace Tnb.ProductionMgr report.create_id = _userManager.UserId; report.create_time = DateTime.Now; // report.batch = input.mo_task_code + DateTimeOffset.Now.ToUnixTimeSeconds().ToString(); - report.barcode = input.mo_task_code + DateTimeOffset.Now.ToUnixTimeSeconds().ToString(); + // report.barcode = input.mo_task_code + DateTimeOffset.Now.ToUnixTimeSeconds().ToString(); + report.barcode = input.mo_task_code+"0001"; report.equip_id = prdMoTask.eqp_id; report.mbom_process_id = prdMoTask.mbom_process_id; report.station = input.station; diff --git a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs index c1147aa9..26f84823 100644 --- a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs +++ b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs @@ -220,7 +220,7 @@ namespace Tnb.ProductionMgr } public Task StartAsync(CancellationToken cancellationToken) { - Readtimer = new Timer(GetRedisData, null, TimeSpan.Zero, TimeSpan.FromSeconds(60)); + Readtimer = new Timer(GetRedisData, null, TimeSpan.Zero, TimeSpan.FromSeconds(300)); return Task.CompletedTask; } public Task StopAsync(CancellationToken cancellationToken) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs index 8f7d7e26..3572aee8 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs @@ -349,7 +349,7 @@ namespace Tnb.WarehouseMgr instockCOdes.Add(c); } } - string orgId = _userManager.User.OrganizeId; + string orgId = _userManager.User?.OrganizeId ?? input.instock.org_id; _ = await _db.Insertable(instockCOdes).CallEntityMethod(it => it.Create(orgId)).ExecuteCommandAsync(); //生成预任务申请 @@ -372,7 +372,7 @@ namespace Tnb.WarehouseMgr WmsPretaskH preTask = new() { - org_id = _userManager.User.OrganizeId, + org_id = orgId, startlocation_id = sPoint?.location_id ?? string.Empty, startlocation_code = sPoint?.location_code ?? string.Empty, endlocation_id = ePoint?.location_id ?? string.Empty, @@ -389,7 +389,7 @@ namespace Tnb.WarehouseMgr area_code = it.Key, require_id = instock?.id ?? string.Empty, require_code = instock?.bill_code ?? string.Empty, - create_id = _userManager.UserId, + create_id = instock.create_id, create_time = DateTime.Now }; return preTask; @@ -448,16 +448,16 @@ namespace Tnb.WarehouseMgr { WmsHandleCode handleCode = jo.Adapt(); handleCode.id = SnowflakeIdHelper.NextId(); - handleCode.org_id = _userManager.User.OrganizeId; + handleCode.org_id = orgId; handleCode.bill_id = operBillId; - handleCode.create_id = _userManager.UserId; + handleCode.create_id = instock.create_id; handleCode.create_time = DateTime.Now; preTaskUpInput.PreTaskHandleCodes.Add(handleCode); } } //生成载具条码记录 List carryCodes = preTaskUpInput.PreTaskHandleCodes.Adapt>(); - + carryCodes.ForEach(x => { x.id = SnowflakeIdHelper.NextId(); From e002f164c2e4e664d7d209273f2182ea34fc4da0 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Wed, 22 Nov 2023 18:08:07 +0800 Subject: [PATCH 09/11] 1 --- ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index 54907b70..68c9993b 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -1500,11 +1500,12 @@ namespace Tnb.ProductionMgr report = input.Adapt(); report.id = SnowflakeIdHelper.NextId(); report.reported_qty = input.reported_qty; + report.material_box_code = input.material_box_qrcode; report.create_id = _userManager.UserId; report.create_time = DateTime.Now; // report.batch = input.mo_task_code + DateTimeOffset.Now.ToUnixTimeSeconds().ToString(); - // report.barcode = input.mo_task_code + DateTimeOffset.Now.ToUnixTimeSeconds().ToString(); - report.barcode = input.mo_task_code+"0001"; + report.barcode = input.mo_task_code + DateTimeOffset.Now.ToUnixTimeSeconds().ToString(); + // report.barcode = input.mo_task_code+"0001"; report.equip_id = prdMoTask.eqp_id; report.mbom_process_id = prdMoTask.mbom_process_id; report.station = input.station; From 0f266e05cad47e9a4fda1c990ac9f7a67355b500 Mon Sep 17 00:00:00 2001 From: hlb <894797954@qq.com> Date: Wed, 22 Nov 2023 23:19:20 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=A4=9A=E4=BB=BB=E5=8A=A1=E6=97=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=B8=E7=AD=89=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 2 +- WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index fcf87c52..1e68aef0 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -318,7 +318,7 @@ namespace Tnb.WarehouseMgr x.bill_code = $"{groupCode}-1"; } } - else if ((moveNum >= areaPreTasks.Count && areaPreTasks.Count > 1) || moveNum < areaPreTasks.Count) + else if ((moveNum >= areaPreTasks.Count && areaPreTasks.Count > 1) || moveNum <= areaPreTasks.Count) { string groupCode = await _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE); items.ForEach(x => x.is_chain = 1); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs index 0d2b35a1..6e52bfdb 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs @@ -310,8 +310,8 @@ namespace Tnb.WarehouseMgr instock.location_id = loc.id; instock.biz_type = WmsWareHouseConst.BIZTYPE_WMSINSTOCK_ID; instock.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_INSTOCK_ENCODE).GetAwaiter().GetResult(); - instock.generate_type = "0";// 自动 - instock.sync_status = WmsWareHouseConst.SYNC_STATUS_NONEEDSYNC;//未同步 + instock.generate_type = "0";// 人工 + instock.sync_status = WmsWareHouseConst.SYNC_STATUS_NONEEDSYNC;//无需同步 instock.print_status = WmsWareHouseConst.PRINT_STATUS_PRINTCOMPLETE;//已打印 instock.status = WmsWareHouseConst.BILLSTATUS_ADD_ID;// 新增 instock.create_time = DateTime.Now; From 10ae6ad6425b9ac22d4900f2fba8dd00945ad96f Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Thu, 23 Nov 2023 09:18:52 +0800 Subject: [PATCH 11/11] 1 --- ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs index 28c0ada2..98fd2342 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs @@ -421,7 +421,7 @@ namespace Tnb.ProductionMgr .LeftJoin((a, b, c, d, e, f, g, h, i, j) => a.mo_id == j.id) .LeftJoin((a, b, c, d, e, f, g, h, i, j, k) => a.material_id == k.material_id && k.auxiliary_unit_id == "kg") .LeftJoin((a, b, c, d, e, f, g, h, i, j, k, l) => a.eqp_id == l.equip_id && l.enabled == 1 && l.label_point == "提报装箱称重点位") - .Where((a, b) => a.workstation_id == input.stationId && (a.mo_task_status == DictConst.ToBeStartedEnCode || a.mo_task_status == DictConst.MoStatusPauseCode || a.mo_task_status == DictConst.ComplatedEnCode || a.mo_task_status == DictConst.InProgressEnCode)) + .Where((a, b) => a.workstation_id == input.stationId) .WhereIF(!string.IsNullOrEmpty(mo_task_code), a => a.mo_task_code.Contains(mo_task_code)) //.WhereIF(!string.IsNullOrEmpty(mo_task_status),a=>a.mo_task_status==mo_task_status) .WhereIF(statusList.Count > 0, a => statusList.Contains(a.mo_task_status))