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

WarehouseMgr/Tnb.WarehouseMgr/WmsKittingInStkService.cs

@@ -216,7 +216,7 @@ namespace Tnb.WarehouseMgr
                 if (kittingOut != null)
                 {
                     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;
 

common/Tnb.Common/Extension/StringExtensions.cs

@@ -949,6 +949,11 @@ public static class StringExtensions
         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
 
     #region 转换,来自Abp

taskschedule/Tnb.TaskScheduler/Listener/QcTaskTimeWorker.cs

@@ -22,11 +22,11 @@ namespace Tnb.TaskScheduler.Listener
     /// <summary>
     /// 生成质检任务
     /// </summary>
-    public class QcTaskTimeWorker : ISpareTimeWorker
+    public class QcTaskTimeWorker //: ISpareTimeWorker
     {
         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)
         {
             try