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-05-30 09:44:30 +08:00
parent 7bcb2f63eb da4f8322bc
commit 745599875d
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BasicData/Tnb.BasicData.Entities/Entity/BasMbom.cs
View File

@@ -99,4 +99,9 @@ public partial class BasMbom : BaseEntity<string>
/// </summary>
public string? query_info { get; set; }
/// <summary>
/// 整托数
/// </summary>
public int full_qty { get; set; }
}

14
EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs
View File

@@ -214,4 +214,18 @@ public partial class EqpEquipment : BaseEntity<string>
public string? as_location_id { get; set; }
/// <summary>
/// 上料库位id
/// </summary>
public string? upmat_location_id { get; set; }
/// <summary>
/// 下料库位id
/// </summary>
public string? downmat_location_id { get; set; }
/// <summary>
/// 入库仓库id
/// </summary>
public string? instock_warehouse_id { get; set; }
}

8
ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs
View File

@@ -145,7 +145,7 @@ namespace Tnb.ProductionMgr
{
msg = "ctu1空箱入呼叫成功";
Log.Information("【EmptyCarryOutStk】ctu1空箱入呼叫成功");
//_redisData.Set("YTCS_CallCtuEmptyIn_CS01_flag", true, TimeSpan.FromMinutes(20));
_redisData.Set("YTCS_CallCtuEmptyIn_CS01_flag", true, TimeSpan.FromMinutes(20));
}
else
{
@@ -173,7 +173,7 @@ namespace Tnb.ProductionMgr
{
msg = "ctu3空箱入呼叫成功";
Log.Information("【EmptyCarryOutStk】ctu3空箱入呼叫成功");
//_redisData.Set("YTCS_CallCtuEmptyIn_CS03_flag", true, TimeSpan.FromMinutes(20));
_redisData.Set("YTCS_CallCtuEmptyIn_CS03_flag", true, TimeSpan.FromMinutes(20));
}
else
{
@@ -201,7 +201,7 @@ namespace Tnb.ProductionMgr
{
msg = "ctu6空箱入呼叫成功";
Log.Information("【EmptyCarryOutStk】ctu6空箱入呼叫成功");
//_redisData.Set("YTCS_CallCtuEmptyIn_CS03_flag", true, TimeSpan.FromMinutes(20));
_redisData.Set("YTCS_CallCtuEmptyIn_CS03_flag", true, TimeSpan.FromMinutes(20));
}
else
{
@@ -252,7 +252,7 @@ namespace Tnb.ProductionMgr
{
msg = "注塑定点配送成功";
Log.Information("【FixedPointDelivery】注塑定点配送成功");
//_redisData.Set("hxjC_DB100.132.3_flag", true, TimeSpan.FromMinutes(20));
_redisData.Set("hxjC_DB100.132.3_flag", true, TimeSpan.FromMinutes(20));
}
else
{