wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
骆康
2024-03-18 10:01:26 +08:00
parent db4ce06d92 a405703a32
commit 12f41162d5
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ProductionMgr/Tnb.ProductionMgr/RedisBackGround.cs
View File

@@ -197,7 +197,7 @@ namespace Tnb.ProductionMgr
private void ScanInStock(object state) private void ScanInStock(object state)
{ {
Dictionary<string, string[]> getdic = new Dictionary<string, string[]>(); Dictionary<string, string[]> getdic = new Dictionary<string, string[]>();
getdic.Add("BGWRKYCL02", new string[] { "CP8", "AllowGetFullBox1", "code1", "PutDoneEmptyBox","false" }); getdic.Add("BGWRKYCL02", new string[] { "CP8", "AllowGetFullBox1", "code1", "PutDoneEmptyBox", "false" });
getdic.Add("BGWRKYCL01", new string[] { "CP8", "AllowGetFullBox2", "code2", "PutDoneEmptyBox", "false" }); getdic.Add("BGWRKYCL01", new string[] { "CP8", "AllowGetFullBox2", "code2", "PutDoneEmptyBox", "false" });
foreach (var key in getdic.Keys) foreach (var key in getdic.Keys)
{ {
@@ -244,7 +244,7 @@ namespace Tnb.ProductionMgr
input.data.Add("container_no", WmsCarryCode.container_no!);//箱号 input.data.Add("container_no", WmsCarryCode.container_no!);//箱号
input.data.Add("material_id", WmsCarryCode.material_id); input.data.Add("material_id", WmsCarryCode.material_id);
input.data.Add("id", null); input.data.Add("id", null);
_wmsPDAScanInStock.ScanInStockByRedis(input); _wmsPDAScanInStock.ScanInStockByRedis(input).Wait();
} }
} }
} }
@@ -339,7 +339,7 @@ namespace Tnb.ProductionMgr
{ {
Readtimer = new Timer(GetRedisData, null, TimeSpan.Zero, TimeSpan.FromSeconds(300)); Readtimer = new Timer(GetRedisData, null, TimeSpan.Zero, TimeSpan.FromSeconds(300));
CheckGettimer = new Timer(CheckGet, null, TimeSpan.Zero, TimeSpan.FromSeconds(10)); CheckGettimer = new Timer(CheckGet, null, TimeSpan.Zero, TimeSpan.FromSeconds(10));
Scantimer = new Timer(ScanInStock, null, TimeSpan.Zero, TimeSpan.FromSeconds(30)); Scantimer = new Timer(ScanInStock, null, TimeSpan.Zero, TimeSpan.FromSeconds(60));
SSXcodetimer= new Timer(SSXcode, null, TimeSpan.Zero, TimeSpan.FromSeconds(10)); SSXcodetimer= new Timer(SSXcode, null, TimeSpan.Zero, TimeSpan.FromSeconds(10));
return Task.CompletedTask; return Task.CompletedTask;
} }

2
WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
View File

@@ -101,10 +101,12 @@ namespace Tnb.WarehouseMgr
if (flag) if (flag)
{ {
await _wareHouseService.SsxControl(dis, "LOAD"); await _wareHouseService.SsxControl(dis, "LOAD");
Logger.Information(dis.startlocation_code+"取货确认..................成功");
return await ToApiResult(HttpStatusCode.OK, "成功"); return await ToApiResult(HttpStatusCode.OK, "成功");
} }
else else
{ {
Logger.Information(dis.startlocation_code + "取货确认..................失败");
return await ToApiResult(HttpStatusCode.InternalServerError, "失败"); return await ToApiResult(HttpStatusCode.InternalServerError, "失败");
} }
} }

7
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -255,8 +255,8 @@ namespace Tnb.WarehouseMgr
putdic.Add("SSX-121-010", new string[] { "东面提升机输送线", "上升降机10允许入箱" }); putdic.Add("SSX-121-010", new string[] { "东面提升机输送线", "上升降机10允许入箱" });
putdic.Add("SSX-021-003", new string[] { "YTCS", "AllowCtuEmptyIn_CS03" }); putdic.Add("SSX-021-003", new string[] { "YTCS", "AllowCtuEmptyIn_CS03" });
putdic.Add("SSX-021-001", new string[] { "YTCS", "AllowCtuEmptyIn_CS01" }); putdic.Add("SSX-021-001", new string[] { "YTCS", "AllowCtuEmptyIn_CS01" });
putdic.Add("ZSSSXCTU02", new string[] { "YTCS", "AllowAgvFullIn_CS04", }); putdic.Add("ZSSSXCTU02", new string[] { "YTCS", "AllowCtuFullOut_CS04", });
putdic.Add("ZSSSXCTU01", new string[] { "YTCS", "AllowAgvFullIn_CS02", }); putdic.Add("ZSSSXCTU01", new string[] { "YTCS", "AllowCtuFullOut_CS02", });
var strs = new string[] { }; var strs = new string[] { };
if (!putdic.ContainsKey(input.targetName)) if (!putdic.ContainsKey(input.targetName))
@@ -284,6 +284,9 @@ namespace Tnb.WarehouseMgr
{ {
Dictionary<string, string[]> putdic = new Dictionary<string, string[]>(); Dictionary<string, string[]> putdic = new Dictionary<string, string[]>();
Dictionary<string, string[]> getdic = new Dictionary<string, string[]>(); Dictionary<string, string[]> getdic = new Dictionary<string, string[]>();
putdic.Add("ZSSSXCTU02", new string[] { "YTCS", "AllowCtuFullOut_CS04", });
putdic.Add("ZSSSXCTU01", new string[] { "YTCS", "AllowCtuFullOut_CS02", });
putdic.Add("ZS-C01-1", new string[] { "hxjC", "A2允许入空箱", }); putdic.Add("ZS-C01-1", new string[] { "hxjC", "A2允许入空箱", });
getdic.Add("ZS-C01-2", new string[] { "hxjC", "A2允许取满箱" }); getdic.Add("ZS-C01-2", new string[] { "hxjC", "A2允许取满箱" });