1

yanjinhui

2026-03-24 24ac6e3688db3dbb68eb6a53dd6c6fc9f8e12d6b

1

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_StationInfo.vue

@@ -80,7 +80,7 @@
      [
        {
          title: "站台状态",
          field: "isOccupied",
          field: "StationStatus",
          type: "select",
          width: 150,
          require: true,
@@ -185,12 +185,21 @@
        },
        { 
          title: "站台状态", 
          field: "isOccupied", 
          field: "StationStatus", 
          type: "select",
          data: [
            { key: "0", value: "空闲" },
            { key: "1", value: "占用" },
            { key: "2", value: "禁用" },
          ],
        },
         { 
          title: "站台是否可用", 
          field: "IsOccupied", 
          type: "select",
          data: [
            { key: "0", value: "可用" },
            { key: "1", value: "占用" },
          ],
        },
      ],
@@ -258,7 +267,7 @@
        align: "left",
      },
      {
        field: "isOccupied",
        field: "stationStatus",
        title: "站台状态",
        type: "select",
        width: 120,
@@ -273,6 +282,20 @@
        },
      },
      {
        field: "isOccupied",
        title: "站台是否可用",
        type: "select",
        width: 120,
        align: "left",
        bind: {
          key: "value",
          data: [
            { key: "0", value: "可用" },
            { key: "1", value: "占用" },
          ],
        },
      },
      {
        field: "creater",
        title: "创建人",
        type: "string",

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/ScheduledTaskJob.cs

@@ -39,7 +39,7 @@
            try
            {
                #region ä¸‰æ¥¼è‡ªåŠ¨ä»»åŠ¡
                List<string> StationCodes = new() { "0348840CC0315655", "0349350CC0315655" };
                List<string> StationCodes = new() { "0348840CC0315690", "0349350CC0315686" };
                var stations = _StationInfoService.Repository.QueryData(x => StationCodes.Contains(x.StationCode));
                #region å…¥æå‡æœºä»»åŠ¡
                var station = stations.FirstOrDefault(x => x.StationStatus == (int)LocationStatusEnum.InStock && x.IsOccupied == 0);
@@ -119,7 +119,7 @@
                #endregion

                #region 4F
                List<string> stationCodes = new() { "0319882DD0312730", "0319882DD0313240" };
                List<string> stationCodes = new() { "0319882DD0313240", "0319882DD0313750" };
                var Stations = _StationInfoService.Repository.QueryData(x => stationCodes.Contains(x.StationCode));
                #region å…¥æå‡æœºä»»åŠ¡
                var Station = Stations.FirstOrDefault(x => x.StationStatus == (int)LocationStatusEnum.InStock && x.IsOccupied == 0);

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs

@@ -20,33 +20,33 @@
        /// </summary>
        public void SendNewTask()
        {
            //try
            //{
            //    var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.New).ToList();
            //    if (newTasks.Count > 0)
            //    {
            //        #region æŸ¥æ‰¾å‡¯ä¹å£«ä»»åŠ¡
            //        //var Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.MLInbound || x.TaskType == (int)TaskTypeEnum.MLOutbound).OrderByDescending(x => x.Grade).ToList();
            //        //if (Tasks.Count > 0) SendGALAXISTask(Tasks);
            //        #endregion
            try
            {
                var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskStatusEnum.New).ToList();
                if (newTasks.Count > 0)
                {
                    #region æŸ¥æ‰¾å‡¯ä¹å£«ä»»åŠ¡
                    //var Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.MLInbound || x.TaskType == (int)TaskTypeEnum.MLOutbound).OrderByDescending(x => x.Grade).ToList();
                    //if (Tasks.Count > 0) SendGALAXISTask(Tasks);
                    #endregion

            //        #region æŸ¥æ‰¾RGV任务
            //        var Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPInbound).OrderByDescending(x => x.Grade).ToList();
            //        if (Tasks.Count > 0) SendRGVNewInTask(Tasks);
            //        Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPOutbound).OrderByDescending(x => x.Grade).ToList();
            //        if (Tasks.Count > 0) IsMoveTask(Tasks);
            //        #endregion
                    #region æŸ¥æ‰¾RGV任务
                    var Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPInbound).OrderByDescending(x => x.Grade).ToList();
                    if (Tasks.Count > 0) SendRGVNewInTask(Tasks);
                    Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.CPOutbound).OrderByDescending(x => x.Grade).ToList();
                    if (Tasks.Count > 0) IsMoveTask(Tasks);
                    #endregion

            //        #region æŸ¥æ‰¾æµ·åº·AGV任务
            //        Tasks = newTasks.Where(x => x.TaskType == (int)TaskTypeEnum.F01 || x.TaskType == (int)TaskTypeEnum.RK3F || x.TaskType == (int)TaskTypeEnum.CK3F || x.TaskType == (int)TaskTypeEnum.Q1TSJ4 || x.TaskType == (int)TaskTypeEnum.STU0003 || x.TaskType == (int)TaskTypeEnum.F02 || x.TaskType == (int)TaskTypeEnum.CHUKU1 || x.TaskType == (int)TaskTypeEnum.Q3RK || x.TaskType == (int)TaskTypeEnum.Q3CK).OrderByDescending(x => x.Grade).ToList();
            //        if (Tasks.Count > 0) HIKROBOTTask(Tasks);
            //        #endregion
            //    }
            //}
            //catch (Exception ex)
            //{
            //    WriteError(nameof(TaskJob), ex.Message, ex);
            //}
                }
            }
            catch (Exception ex)
            {
                WriteError(nameof(TaskJob), ex.Message, ex);
            }
        }
        #endregion