From 24ac6e3688db3dbb68eb6a53dd6c6fc9f8e12d6b Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 24 三月 2026 15:28:24 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs | 50 ++++++++++++------------
代码管理/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_StationInfo.vue | 33 ++++++++++++++--
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/ScheduledTaskJob.cs | 4 +-
3 files changed, 55 insertions(+), 32 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_StationInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_StationInfo.vue"
index ef3060d..45e7ffb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_StationInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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: "鍗犵敤" },
],
},
],
@@ -243,7 +252,7 @@
align: "left",
bind: {
key: "value",
- data: [
+ data:[
{ key: "1", value: "鍙叆" },
{ key: "2", value: "鍙嚭" },
{ key: "3", value: "鍙叆鍙嚭" },
@@ -257,8 +266,8 @@
width: 120,
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",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/ScheduledTaskJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/ScheduledTaskJob.cs"
index 56833dd..ffdff71 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/ScheduledTaskJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs"
index 53a2629..6528366 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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);
- //}
+ //#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);
+ }
}
#endregion
--
Gitblit v1.9.3