diff --git a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs index 93da9279..1bffebbf 100644 --- a/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs +++ b/ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs @@ -136,7 +136,7 @@ namespace Tnb.ProductionMgr string codedata = _redisData.GetHash(strs[0], strs[2]).Result; JObject? coderes = JsonConvert.DeserializeObject(codedata); string coderesult = coderes != null && coderes["Value"] != null ? coderes.Value("Value")! : ""; - var DistaskH = _repository.AsSugarClient().Queryable().Where(p => p.carry_code == coderesult && p.status == WmsWareHouseConst.TASK_BILL_STATUS_RUNING_ID).First(); + var DistaskH = _repository.AsSugarClient().Queryable().Where(p => p.carry_code == coderesult && p.status == WmsWareHouseConst.TASK_BILL_STATUS_YXD_ID).First(); if (DistaskH != null) { dynamic reqBody = new ExpandoObject(); diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsEmptyOutstockD.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsEmptyOutstockD.cs index 16246d7b..74b94791 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsEmptyOutstockD.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsEmptyOutstockD.cs @@ -17,7 +17,7 @@ public partial class WmsEmptyOutstockD : BaseEntity /// /// 行号 /// - public int? no { get; set; } + public string? no { get; set; } /// /// 所属组织ID diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 7d247735..56d9785e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -249,7 +249,7 @@ namespace Tnb.WarehouseMgr { Dictionary putdic = new Dictionary(); - putdic.Add("SSX-021-006", new string[] { "YTCS", "AllowEmptyIn_CS06" }); + putdic.Add("SSX-011-006", new string[] { "YTCS", "AllowEmptyIn_CS06" }); var strs = new string[] { }; @@ -308,7 +308,7 @@ namespace Tnb.WarehouseMgr Dictionary putdic = new Dictionary(); Dictionary getdic = new Dictionary(); getdic.Add("SSX-021-005", new string[] { "YTCS", "FullOut_CS05Done", "true" }); - putdic.Add("SSX-021-006", new string[] { "YTCS", "EmptyIn_CS06Done", "true" }); + putdic.Add("SSX-011-006", new string[] { "YTCS", "EmptyIn_CS06Done", "true" }); if (action == "LOAD")//取货 { if (getdic.Keys.Contains(disTask.startlocation_code)) @@ -321,7 +321,8 @@ namespace Tnb.WarehouseMgr ["TagName"] = strarr[1], ["Value"] = strarr[2], }; - await HttpClientHelper.GetAsync(_eleCtlCfg.WriteTagUrl, pars: dicCommand); + var str= await HttpClientHelper.GetAsync(_eleCtlCfg.WriteTagUrl, pars: dicCommand); + Logger.Information($"SsxControlLOAD:{str}"); } } else if (action == "UNLOAD")//放货 @@ -336,7 +337,8 @@ namespace Tnb.WarehouseMgr ["TagName"] = strarr[1], ["Value"] = strarr[2], }; - await HttpClientHelper.GetAsync(_eleCtlCfg.WriteTagUrl, pars: dicCommand); + var str = await HttpClientHelper.GetAsync(_eleCtlCfg.WriteTagUrl, pars: dicCommand); + Logger.Information($"SsxControlUNLOAD:{str}"); } }