任务优化，工单状态修改优化

Ben Lin

2024-12-17 86722aca20973a1e73d0a446c124eb6a5790496b

任务优化，工单状态修改优化

 Tiger.Business.MES/BIZ/BIZ_MES_WO.cs

@@ -292,6 +292,9 @@
                        _woBatch.CHANGE_USER = input.UserId;
                        _woBatch.CHANGE_TIME = DateTime.Now;
                    }
                    if (!Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.ORDER_NO == input.WorkOrder && x.STATUS> BIZ_MES_WO_BATCH.STATUSs.Init.GetValue()).Any()) {
                        _wo.STATUS = BIZ_MES_WO.STATUSs.Init.GetValue();
                    }
                }
                else
                {
@@ -312,6 +315,10 @@
                    {
                        db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS, x.UPDATE_USER, x.UPDATE_TIME, x.CHANGE_USER, x.CHANGE_TIME }).ExecuteCommand();
                    }
                    if (!_wo.IsNullOrEmpty() && _wo.STATUS == BIZ_MES_WO.STATUSs.Init.GetValue())
                    {
                        db.Updateable(_wo, input.UserId).UpdateColumns(x => new { x.STATUS, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
                    }
                });
                if (!dbTran.IsSuccess)
                {

 Tiger.Business.MES/Task/Jobs.U9C_ME_GetCustSn.cs

@@ -54,7 +54,7 @@
                    {
                        msg = $"从U9C获取客户条码信息成功:{result.Message}";
                        //固定写法
                        Trig.LastRunTime = tskJobInput.input.endTime.ToDateTime();
                        Trig.LastRunTime = Args.ByInterval == "Y" ? tskJobInput.input.endTime.ToDateTime().AddHours(Args.Interval) : tskJobInput.input.endTime.ToDateTime();
                        Trig.NextRunTime = Schedule.NextRun;
                    }
                }

 Tiger.Business.MES/Task/Jobs.U9C_ME_GetCustomer.cs

@@ -54,7 +54,7 @@
                    {
                        msg = $"从U9C获取客户信息成功:{result.Message}";
                        //固定写法
                        Trig.LastRunTime = tskJobInput.input.endTime.ToDateTime();
                        Trig.LastRunTime = Args.ByInterval == "Y" ? tskJobInput.input.endTime.ToDateTime().AddHours(Args.Interval) : tskJobInput.input.endTime.ToDateTime();
                        Trig.NextRunTime = Schedule.NextRun;
                    }
                }

 Tiger.Business.MES/Task/Jobs.U9C_ME_GetItem.cs

@@ -55,7 +55,7 @@
                    {
                        msg = $"从U9C获取物料信息成功:{result.Message}";
                        //固定写法
                        Trig.LastRunTime = tskJobInput.input.endTime.ToDateTime();
                        Trig.LastRunTime = Args.ByInterval == "Y" ? tskJobInput.input.endTime.ToDateTime().AddHours(Args.Interval) : tskJobInput.input.endTime.ToDateTime();
                        Trig.NextRunTime = Schedule.NextRun;
                    }
                }

 Tiger.Business.MES/Task/Jobs.U9C_ME_GetSupplier.cs

@@ -56,7 +56,7 @@
                    {
                        msg = $"从U9C获取供应商信息成功:{result.Message}";
                        //固定写法
                        Trig.LastRunTime = tskJobInput.input.endTime.ToDateTime();
                        Trig.LastRunTime = Args.ByInterval == "Y" ? tskJobInput.input.endTime.ToDateTime().AddHours(Args.Interval) : tskJobInput.input.endTime.ToDateTime();
                        Trig.NextRunTime = Schedule.NextRun;
                    }
                }

 Tiger.Business.MES/Task/Jobs.U9C_ME_GetWo.cs

@@ -104,7 +104,7 @@
                    {
                        msg = $"从U9C获取工单信息成功:{result.Message}";
                        //固定写法
                        Trig.LastRunTime = tskJobInput.input.endTime.ToDateTime();
                        Trig.LastRunTime = Args.ByInterval=="Y"? tskJobInput.input.endTime.ToDateTime().AddHours(Args.Interval) : tskJobInput.input.endTime.ToDateTime();
                        Trig.NextRunTime = Schedule.NextRun;
                    }
                }

 Tiger.Business.MES/Task/TskJob.cs

@@ -66,6 +66,7 @@
                    Hours = input.Hours,
                    Days = input.Days,
                    Interval = input.Interval,
                    ByInterval = input.ByInterval,
                };
                TSK_TRIG tskTrig = Biz.Db.Queryable<TSK_TRIG>().Where(x => x.JobId == _job.ID).First() ?? new()
                {

 Tiger.Business.MES/Transaction/Position.cs

@@ -993,6 +993,20 @@
            return list;
        }
        #endregion
        #region 提交前通用方法
        public async Task<ApiAction> CheckCode(string code) {
            var action = new ApiAction();
            try
            {
                
            }
            catch (Exception ex)
            {
                action.CatchExceptionWithLog(ex, $"检查条码{code}异常");
            }
            return action;
        }
        #endregion
        #endregion Functions

        public override bool Close(bool needSaveHistoryLog = false)

 Tiger.Business/SYS/Biz.SYS_MENU.cs

@@ -126,7 +126,8 @@
            SYS_MENU func = null;
            if (!string.IsNullOrEmpty(menuName))
            {
                func = Biz.Db.Queryable<SYS_MENU>().Where(x => x.FUNC_NAME == menuName).First();
                string name = menuName.StartsWith("BS")?"BS": menuName;
                func = Biz.Db.Queryable<SYS_MENU>().Where(x => x.FUNC_NAME == name).First();
            }
            if (func != null)
            {

 Tiger.Business/Services/Base/TigerJobBase.cs

@@ -135,7 +135,7 @@
                    tskJobInput.input = new()
                    {
                        startTime = Args.Interval > 0 ? ((DateTime)Trig.LastRunTime).AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss") : dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = dateTime.AddMilliseconds(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = Args.ByInterval == "Y"? dateTime.ToString("yyyy-MM-dd HH:mm:ss") : dateTime.AddMilliseconds(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
                    };
                    break;
                case TrigArgs.EveryType.Seconds:
@@ -144,7 +144,7 @@
                    tskJobInput.input = new()
                    {
                        startTime = Args.Interval > 0 ? ((DateTime)Trig.LastRunTime).AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss") : dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = dateTime.AddSeconds(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = Args.ByInterval == "Y" ? dateTime.ToString("yyyy-MM-dd HH:mm:ss") : dateTime.AddSeconds(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
                    };
                    break;
                case TrigArgs.EveryType.Minutes:
@@ -153,7 +153,7 @@
                    tskJobInput.input = new()
                    {
                        startTime = Args.Interval > 0 ? ((DateTime)Trig.LastRunTime).AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss") : dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = dateTime.AddMinutes(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = Args.ByInterval == "Y" ? dateTime.ToString("yyyy-MM-dd HH:mm:ss") : dateTime.AddMinutes(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
                    };
                    break;
                case TrigArgs.EveryType.Hours:
@@ -162,7 +162,7 @@
                    tskJobInput.input = new()
                    {
                        startTime = Args.Interval > 0 ? ((DateTime)Trig.LastRunTime).AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss") : dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = dateTime.AddHours(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = Args.ByInterval == "Y" ? dateTime.ToString("yyyy-MM-dd HH:mm:ss") : dateTime.AddHours(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
                    };
                    break;
                case TrigArgs.EveryType.Days:
@@ -171,7 +171,7 @@
                    tskJobInput.input = new()
                    {
                        startTime = Args.Interval > 0 ? ((DateTime)Trig.LastRunTime).AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss") : dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = dateTime.AddDays(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = Args.ByInterval == "Y" ? dateTime.ToString("yyyy-MM-dd HH:mm:ss") : dateTime.AddDays(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
                    };
                    break;
                case TrigArgs.EveryType.Weeks:
@@ -180,7 +180,7 @@
                    tskJobInput.input = new()
                    {
                        startTime = Args.Interval > 0 ? ((DateTime)Trig.LastRunTime).AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss") : dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = dateTime.AddDays(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = Args.ByInterval == "Y" ? dateTime.ToString("yyyy-MM-dd HH:mm:ss") : dateTime.AddDays(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
                    };
                    break;
                case TrigArgs.EveryType.Weekdays:
@@ -189,7 +189,7 @@
                    tskJobInput.input = new()
                    {
                        startTime = Args.Interval > 0 ? ((DateTime)Trig.LastRunTime).AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss") : dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = dateTime.AddDays(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = Args.ByInterval == "Y" ? dateTime.ToString("yyyy-MM-dd HH:mm:ss") : dateTime.AddDays(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
                    };
                    break;
                case TrigArgs.EveryType.Months:
@@ -198,7 +198,7 @@
                    tskJobInput.input = new()
                    {
                        startTime = Args.Interval > 0 ? ((DateTime)Trig.LastRunTime).AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss") : dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = dateTime.AddMonths(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
                        endTime = Args.ByInterval == "Y" ? dateTime.ToString("yyyy-MM-dd HH:mm:ss") : dateTime.AddMonths(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
                    };
                    break;
            }

 Tiger.Model.Net/Entitys/MES/ParameterEntity/TskParameter.cs

@@ -25,6 +25,7 @@
        public int Hours { get; set; }
        public int Days { get; set; }
        public double Interval { get; set; }
        public string ByInterval { get; set; }
    }

    public class TskJobInput

 Tiger.Model.Net/Entitys/TSK/TSK_TRIG.cs

@@ -198,6 +198,7 @@
        public int Days { get; set; }
        public int Weekday { get; set; }
        public double Interval { get; set; }
        public string ByInterval { get; set; }

        public enum EveryType
        {