From ccb52b157d5ecb11cf179800ff6a4cb057031af8 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Tue, 21 May 2024 14:48:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs | 8 +++++--- WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs b/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs index de236d63..175bade1 100644 --- a/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs @@ -98,12 +98,14 @@ namespace Tnb.ProductionMgr { BasFactoryConfig config = await _repository.AsSugarClient().Queryable().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DOMAIN); HttpUtils.RequestGet($"{config.value}/api/production/time-work/empty-carry-out-stk-left"); + // HttpUtils.RequestGet($"http://localhost:9232/api/production/time-work/empty-carry-out-stk-left"); } if (cs03==true && !cs03Flag) { BasFactoryConfig config = await _repository.AsSugarClient().Queryable().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DOMAIN); HttpUtils.RequestGet($"{config.value}/api/production/time-work/empty-carry-out-stk-right"); + // HttpUtils.RequestGet($"http://localhost:9232/api/production/time-work/empty-carry-out-stk-right"); } return Task.CompletedTask; @@ -155,8 +157,8 @@ namespace Tnb.ProductionMgr [AllowAnonymous] public async Task FixedPointDelivery() { - bool? value = await _redisData.TryGetValueByKeyField("hxjA", "DB100.132.0"); - bool valueFlag = _redisData.Get("hxjA_DB100.132.0_flag"); + bool? value = await _redisData.TryGetValueByKeyField("hxjC", "DB100.132.3"); + bool valueFlag = _redisData.Get("hxjC_DB100.132.3_flag"); if (value==true && !valueFlag) { bool? cs01 = await _redisData.TryGetValueByKeyField("YTCS", "CallCtuEmptyIn_CS01"); @@ -189,7 +191,7 @@ namespace Tnb.ProductionMgr if(authResponse.code == 200 && authResponse.data.ObjToBool()) { Log.Information("【FixedPointDelivery】注塑定点配送成功"); - //_redisData.Set("hxjA_DB100.132.0_flag", true, TimeSpan.FromMinutes(20)); + //_redisData.Set("hxjC_DB100.132.3_flag", true, TimeSpan.FromMinutes(20)); } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs index 4c94dcde..0b61aad7 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs @@ -103,7 +103,7 @@ namespace Tnb.WarehouseMgr // await _runService.Create(templateEntity, input); input.data["create_time"] = DateTime.Now; - input.data["create_id"] = _userManager!=null ? _userManager.UserId : WmsWareHouseConst.AdministratorUserId; + input.data["create_id"] = _userManager?.UserId!=null ? _userManager.UserId : WmsWareHouseConst.AdministratorUserId; if (input.data.TryGetValue("bill_code", out Object value)) { if (value == null || value.ToString().IsEmpty())