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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
周科达
2024-07-23 13:55:43 +08:00
parent 3b5da917f4 5059ae3e55
commit a0408b2e9d
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -732,7 +732,7 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
LoggerTimer.LogInformation($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} 开始执行YCLWXDPJInstock"); LoggerTimer.LogInformation($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} 开始执行YCLWXDPJInstock");
Dictionary<string, string[]> getdic = new Dictionary<string, string[]>(); Dictionary<string, string[]> getdic = new Dictionary<string, string[]>();
getdic.Add("未定", new string[] { "CP3-3", "AllowGetFullBox" }); getdic.Add("SCW-YCL", new string[] { "CP3-3", "AllowGetFullBox" });
await db_YCLWXDPJInstocktimer.Ado.BeginTranAsync(); await db_YCLWXDPJInstocktimer.Ado.BeginTranAsync();
foreach (var key in getdic.Keys) foreach (var key in getdic.Keys)
@@ -2172,8 +2172,9 @@ where carry_code = '{coderesult}' and status = '{WmsWareHouseConst.TASK_BILL_STA
return; return;
} }
DateTime now = DateTime.Now;
List<WmsSterilizationInstockH> wmsSterilizationInstockHs = db_Floor4DMC2CPK.Queryable<WmsSterilizationInstockH>() List<WmsSterilizationInstockH> wmsSterilizationInstockHs = db_Floor4DMC2CPK.Queryable<WmsSterilizationInstockH>()
.Where(r => DateTime.Now.Subtract(r.instock_time.Value).TotalHours > hours && r.status == WmsWareHouseConst.BILLSTATUS_ON_ID).ToList(); .Where(r => (DateTime.Now - r.instock_time.Value).TotalHours > hours && r.status == WmsWareHouseConst.BILLSTATUS_ON_ID).ToList();
foreach (WmsSterilizationInstockH wmsSterilizationInstockH in wmsSterilizationInstockHs) foreach (WmsSterilizationInstockH wmsSterilizationInstockH in wmsSterilizationInstockHs)
{ {

12
WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
View File

@@ -446,17 +446,17 @@
/// </summary> /// </summary>
public const string Floor1GLSGWOutstockStation5 = "34863907485461"; public const string Floor1GLSGWOutstockStation5 = "34863907485461";
/// <summary> /// <summary>
/// todo 一楼外协三工位库位 /// 一楼外协三工位库位
/// </summary> /// </summary>
public const string Floor1WXSGWOutstockStation1 = "111"; public const string Floor1WXSGWOutstockStation1 = "35704220754709";
/// <summary> /// <summary>
/// todo 一楼外协三工位库位 /// 一楼外协三工位库位
/// </summary> /// </summary>
public const string Floor1WXSGWOutstockStation2 = "222"; public const string Floor1WXSGWOutstockStation2 = "35704226358805";
/// <summary> /// <summary>
/// todo 一楼外协三工位库位 /// 一楼外协三工位库位
/// </summary> /// </summary>
public const string Floor1WXSGWOutstockStation3 = "333"; public const string Floor1WXSGWOutstockStation3 = "35704230368021";
/// <summary> /// <summary>
/// 分拣任务生成Encode /// 分拣任务生成Encode
/// </summary> /// </summary>

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

@@ -180,7 +180,7 @@ namespace Tnb.WarehouseMgr
{ {
Logger.LogError(ex.Message); Logger.LogError(ex.Message);
Logger.LogError(ex.StackTrace); Logger.LogError(ex.StackTrace);
throw new AppFriendlyException($"绑定失败(1.可能是存在已被绑定的条码 2.存在与此载具编号相同的载具 3.存在字段传了空值) {ex.Message}", 500); throw new AppFriendlyException($"绑定失败(1.可能是存在已被绑定的条码 2.存在其他与此载具编号相同的载具 3.存在字段传了空值) {ex.Message}", 500);
} }
catch (Exception ex) catch (Exception ex)
{ {

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

@@ -345,7 +345,7 @@ namespace Tnb.WarehouseMgr
{ {
Logger.LogError(ex.Message); Logger.LogError(ex.Message);
Logger.LogError(ex.StackTrace); Logger.LogError(ex.StackTrace);
throw new AppFriendlyException($"绑定失败(1.可能是存在已被绑定的条码 2.存在与此载具编号相同的载具 3.存在字段传了空值) {ex.Message}", 500); throw new AppFriendlyException($"绑定失败(1.可能是存在已被绑定的条码 2.存在其他与此载具编号相同的载具 3.存在字段传了空值) {ex.Message}", 500);
} }
catch (Exception ex) catch (Exception ex)
{ {