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:
qianjiawei
2023-07-17 09:42:21 +08:00
parent 6887ca9ded 22cbcd83cd
commit f24975c296
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,7 +216,7 @@ namespace Tnb.WarehouseMgr
if (kittingOut != null) if (kittingOut != null)
{ {
var locaion = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == kittingOut.location_id); var locaion = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == kittingOut.location_id);
if (locaion?.is_type.ToEnum<EnumLocationType>() != EnumLocationType.存储库位) if (locaion !=null && locaion.is_type.ToEnum<EnumLocationType>() != EnumLocationType.存储库位)
{ {
kittingOut.status = WmsWareHouseConst.BILLSTATUS_TOBESHIPPED_ID; kittingOut.status = WmsWareHouseConst.BILLSTATUS_TOBESHIPPED_ID;

5
common/Tnb.Common/Extension/StringExtensions.cs
View File

@@ -949,6 +949,11 @@ public static class StringExtensions
return (T)System.Enum.Parse(typeof(T), value, true); return (T)System.Enum.Parse(typeof(T), value, true);
} }
public static T ToEnumWithNull<T>(this string? value)
{
return (T)System.Enum.Parse(typeof(T), value, true);
}
#endregion #endregion
#region 转换,来自Abp #region 转换,来自Abp

4
taskschedule/Tnb.TaskScheduler/Listener/QcTaskTimeWorker.cs
View File

@@ -22,11 +22,11 @@ namespace Tnb.TaskScheduler.Listener
/// <summary> /// <summary>
/// 生成质检任务 /// 生成质检任务
/// </summary> /// </summary>
public class QcTaskTimeWorker : ISpareTimeWorker public class QcTaskTimeWorker //: ISpareTimeWorker
{ {
private ISqlSugarRepository<QcCheckPlanH> repository => App.GetService<ISqlSugarRepository<QcCheckPlanH>>(); private ISqlSugarRepository<QcCheckPlanH> repository => App.GetService<ISqlSugarRepository<QcCheckPlanH>>();
[SpareTime("0 0 0 * * ?", "生成质检任务", ExecuteType = SpareTimeExecuteTypes.Serial, StartNow = false)] //[SpareTime("0 0 0 * * ?", "生成质检任务", ExecuteType = SpareTimeExecuteTypes.Serial, StartNow = false)]
public async void CreateTask(SpareTimer timer, long count) public async void CreateTask(SpareTimer timer, long count)
{ {
try try