修改补空托任务和工单完成的时间条件

dengjunjie

2024-05-12 8e2ae27beff0379104ff3bd7ea31036613e6f4e5

修改补空托任务和工单完成的时间条件

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Entity/DomainModels/WCS/dt_management_time.cs

@@ -31,7 +31,7 @@
       [Display(Name ="名称")]
       [MaxLength(100)]
       [Column(TypeName="nvarchar(100)")]
       [Required(AllowEmptyStrings=false)]
       //[Required(AllowEmptyStrings=false)]
       public string management_name { get; set; }

       /// <summary>
@@ -49,7 +49,7 @@
       [Display(Name ="时间单位")]
       [MaxLength(20)]
       [Column(TypeName="nvarchar(20)")]
       [Required(AllowEmptyStrings=false)]
       //[Required(AllowEmptyStrings=false)]
       public string management_unitoftime { get; set; }

       /// <summary>

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs

@@ -60,9 +60,10 @@
            VOLContext context = new VOLContext();
            Idt_mes_headRepository mes_HeadRepository = new dt_mes_headRepository(context);
            Idt_inventoryRepository inventoryRepository = new dt_inventoryRepository(context);
            Idt_management_timeRepository timeRepository = new dt_management_timeRepository(context);


            var mes_heads = mes_HeadRepository.Find(x => x.quantity == x.finishNum /*|| x.CreateTime.AddDays(30) < DateTime.Now*/).ToList();
            var val = timeRepository.Find(x => x.management_name == "FinishMesWork").FirstOrDefault().management_numericalvalue;
            var mes_heads = mes_HeadRepository.Find(x => x.quantity == x.finishNum || x.CreateTime.AddDays(val) < DateTime.Now).ToList();

            #region æ£€æµ‹çº¿å·¥å•
            var mes_head_jcxs = mes_heads.Where(x => x.processCode == "28").ToList();

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/RestockHCJ.cs

@@ -153,13 +153,15 @@
            VOLContext Context = new VOLContext();
            Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(Context);
            IVV_Mes_WorkinfoRepository workinfoRepository = new VV_Mes_WorkinfoRepository(Context);
            Idt_management_timeRepository timeRepository = new dt_management_timeRepository(Context);
            try
            {
                if (agvtask.agv_tasktype == AGVTaskTypeEnum.TaskType_EmptyPallet.ToString())//空托任务
                {
                    var val = timeRepository.Find(x => x.management_name == AGVTaskTypeEnum.TaskType_EmptyPallet.ToString()).FirstOrDefault().management_numericalvalue;
                    if (agvtask.agv_fromaddress == "" && agvtask.agv_toaddress.Contains("W"))
                        GetStation.EmptyPalletStation(agvtask);
                    else if (agvtask.agv_fromaddress == "" && DateTime.Now - agvtask.agv_createtime >= TimeSpan.FromMinutes(2))
                    else if (agvtask.agv_fromaddress == "" && DateTime.Now - agvtask.agv_createtime >= TimeSpan.FromMinutes(val))
                    {
                        if (agvtask.agv_tasknum.Contains("_"))
                        {