林豪 左 9 ماه پیش
والد
کامیت
43fdfaa152

+ 2 - 2
WCS.Entity/WCS_CacheLineLoc.cs

@@ -84,7 +84,7 @@ namespace WCS.Entity
         /// <summary>
         ///  超时时间-小时
         /// </summary>
-        [SugarColumn(ColumnDataType = "int", IsNullable = true)]
+        [SugarColumn(IsNullable = true)]
         public int TimeOut { get; set; }
     }
-}
+}

+ 1 - 1
业务工程/分拣库/WCS.WorkEngineering/Extensions/TaskExtension.cs

@@ -232,7 +232,7 @@ namespace WCS.WorkEngineering.Extensions
             };
 
             var matInfoList = db.Queryable<BaseMatinfo>().NoLock().Where(x => x.TimeOut != 0).ToList();
-            var defaultOutTime = db.Queryable<fjSysConfig>().First(x => x.Code == "DefaultOutTime ") ?? new fjSysConfig() { SContent = "12" };
+            var defaultOutTime = db.Queryable<fjSysConfig>().First(x => x.Code == "DefaultOutTime") ?? new fjSysConfig() { SContent = "12" };
 
             palletizing = db.InsertableRowLock(palletizing).ExecuteReturnEntity();
             foreach (var item in billBomsetinfos.Where(x => x.IsEmpty == 0).GroupBy(x => x.Row).OrderBy(x => x.Key))

+ 2 - 1
业务工程/分拣库/WCS.WorkEngineering/Systems/分拣支线/桁架分流点.cs

@@ -307,7 +307,8 @@ namespace WCS.WorkEngineering.Systems.分拣支线
                     CacheLineId = res.Id,
                     AddTime = nowTime,
                     SideNum = t.SideNum,
-                    EditTime = nowTime
+                    EditTime = nowTime,
+                    TimeOut = t.TimeOut
                 }).ToList();
 
                 taskInfo.Status = TaskStatus.FinishOfShunt;