From e8042fe43a178ca26fe4fe4f8cf5dedbfc9910fd Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 03 七月 2025 10:50:24 +0800
Subject: [PATCH] 更新任务查询逻辑以包含条形码在CommonConveyorLineJob.cs和 CommonConveyorLine_GWJob.cs文件中，修改了多个任务查询方法，现支持使用任务号、子设备代码和条形码进行查询。这一改动旨在提高任务查询的准确性。同时，移除了不再需要的注释代码行。
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/QuartzJob/DeviceProtocolController.cs | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/QuartzJob/DeviceProtocolController.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/QuartzJob/DeviceProtocolController.cs
index 48181c7..d7d9d36 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/QuartzJob/DeviceProtocolController.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/QuartzJob/DeviceProtocolController.cs
@@ -22,11 +22,21 @@
return Service.GetImportData(fileInput);
}
- [HttpPost, Route("AddDeviceProtocol"), AllowAnonymous]
+ [HttpPost, Route("AddAfterDeviceProtocol"), AllowAnonymous]
public WebResponseContent AddDeviceProtocol(int DeviceID,string DeviceChildCode, decimal DeviceProOffset)
{
-
- return Service.AddDeviceProtocol(DeviceID, DeviceChildCode, DeviceProOffset);
+ return Service.AddAfterDeviceProtocol(DeviceID, DeviceChildCode, DeviceProOffset);
+ }
+
+ [HttpPost, Route("AddBeforeDeviceProtocol"), AllowAnonymous]
+ public WebResponseContent AddBeforeDeviceProtocol(int DeviceID, string DeviceChildCode, decimal DeviceProOffsetRead, decimal DeviceProOffsetWrite)
+ {
+ return Service.AddBeforeDeviceProtocol(DeviceID, DeviceChildCode, DeviceProOffsetRead, DeviceProOffsetWrite);
+ }
+ [HttpPost, Route("AddBeforReadDeviceProtocol"), AllowAnonymous]
+ public WebResponseContent AddBeforReadDeviceProtocol(int DeviceID, string DeviceChildCode, decimal DeviceProOffsetRead)
+ {
+ return Service.AddBeforReadDeviceProtocol(DeviceID, DeviceChildCode, DeviceProOffsetRead);
}
}
}
--
Gitblit v1.9.3