From 787cc88bd5655c701299f24a5779a908e51eeb0d Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期日, 06 七月 2025 13:01:59 +0800
Subject: [PATCH] 1
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs | 24 ++-
Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js | 2
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs | 9 +
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue | 11 +
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue | 4
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json | 52 +++---
Code Management/WCS/WIDESEAWCS_Client/src/extension/ProcessParameters/extend/importDevicePro.vue | 0
Code Management/WMS/WIDESEA_WMSClient/src/api/http.js | 4
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs | 5
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile1.pubxml.user | 11 +
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 14 ++
Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/extend/importDevicePro.vue | 0
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs | 115 +++++++++++-----
Code Management/WCS/WIDESEAWCS_Client/src/api/http.js | 7
Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationStatus.vue | 85 ++++++++++++
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue | 2
Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js | 8 +
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile1.pubxml | 17 ++
18 files changed, 284 insertions(+), 86 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/api/http.js b/Code Management/WCS/WIDESEAWCS_Client/src/api/http.js
index a92c0c7..ef542f6 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/api/http.js
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/api/http.js
@@ -11,16 +11,15 @@
let loadingInstance;
let loadingStatus = false;
-if (process.env.NODE_ENV == 'development') {
- axios.defaults.baseURL = 'http://127.0.0.1:9291/';
+if (process.env.NODE_ENV == 'development') {axios.defaults.baseURL = 'http://127.0.0.1:9291/';
// axios.defaults.baseURL = 'http://192.168.20.251:9291/';
}
else if (process.env.NODE_ENV == 'debug') {
- axios.defaults.baseURL = 'http://127.0.0.1:8098/';
+ axios.defaults.baseURL = 'http://192.168.15.253:9291/';
}
else if (process.env.NODE_ENV == 'production') {
- axios.defaults.baseURL = 'http://192.168.20.253:9291/';
+ axios.defaults.baseURL = 'http://192.168.15.253:9291/';
}
if (!axios.defaults.baseURL.endsWith('/')) {
axios.defaults.baseURL+="/";
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/extend/importDevicePro.vue b/Code Management/WCS/WIDESEAWCS_Client/src/extension/ProcessParameters/extend/importDevicePro.vue
similarity index 100%
rename from Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/extend/importDevicePro.vue
rename to Code Management/WCS/WIDESEAWCS_Client/src/extension/ProcessParameters/extend/importDevicePro.vue
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js b/Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js
index 54d708c..e5457dc 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/deviceInfo.js
@@ -1,4 +1,4 @@
-import gridBody from "./extend/importDevicePro.vue";
+import gridBody from '@/extension/ProcessParameters/extend/importDevicePro.vue';
let extension = {
components: {
//鏌ヨ鐣岄潰鎵╁睍缁勪欢
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/extend/importDevicePro.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/extend/importDevicePro.vue
similarity index 100%
copy from Code Management/WCS/WIDESEAWCS_Client/src/extension/quartzJob/extend/importDevicePro.vue
copy to Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/extend/importDevicePro.vue
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
index f306f76..8f4c81b 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
@@ -176,7 +176,7 @@
type: "string",
width: 90,
align: "left",
- hidden: true,
+
},
{
field: "grade",
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue
index 3ba651f..8048fa8 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_Hty.vue
@@ -68,7 +68,7 @@
{ title: "宸烽亾鍙�", field: "roadway", type: "text" },
{ "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
{ title: "鍒涘缓浜�", field: "creater", type: "text" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ { title: "瀹屾垚鏃堕棿", field: "createDate", type: "datetime" },
],
]);
const columns = ref([
@@ -161,7 +161,7 @@
type: "string",
width: 90,
align: "left",
- hidden: true,
+
},
{
field: "grade",
@@ -176,6 +176,7 @@
type: "datetime",
width: 150,
align: "left",
+ hidden: true,
},
{
field: "wMSId",
@@ -188,7 +189,7 @@
{
field: "createDate",
- title: "鍒涘缓鏃堕棿",
+ title: "瀹屾垚鏃堕棿",
type: "datetime",
width: 150,
align: "left",
@@ -199,10 +200,11 @@
type: "datetime",
width: 160,
align: "left",
+ hidden: true,
},
{
field: "creater",
- title: "鍒涘缓浜�",
+ title: "瀹屾垚鑰�",
type: "string",
width: 90,
align: "left",
@@ -213,6 +215,7 @@
type: "string",
width: 90,
align: "left",
+ hidden: true,
},
{
field: "remark",
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
index 0c8f095..3c01be4 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json
@@ -1,28 +1,28 @@
{
- "urls": "http://*:9291", //web鏈嶅姟绔彛锛屽鏋滅敤IIS閮ㄧ讲锛屾妸杩欎釜鍘绘帀
- "Logging": {
- "LogLevel": {
- "Default": "Information",
- "Microsoft.AspNetCore": "Warning"
- }
- },
- "dics": "deviceType,devicePlcType,jobAssembly,jobClassName,deviceStatus,taskType,taskState,inOutType",
- "AllowedHosts": "*",
- "ConnectionStringsEncryption": false,
- "MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
- //杩炴帴瀛楃涓�
- //"ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=WIDESEA_WCSDBB2F;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- "ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WCSDB_BB3F;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //璺ㄥ煙
- "Cors": {
- "PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
- "EnableAllIPs": true, //褰撲负true鏃讹紝寮�鏀炬墍鏈塈P鍧囧彲璁块棶銆�
- // 鏀寔澶氫釜鍩熷悕绔彛锛屾敞鎰忕鍙ｅ彿鍚庝笉瑕佸甫/鏂滄潌锛氭瘮濡俵ocalhost:8000/锛屾槸閿欑殑
- // 娉ㄦ剰锛宧ttp://127.0.0.1:1818 鍜� http://localhost:1818 鏄笉涓�鏍风殑
- "IPs": "http://127.0.0.1:8080,http://localhost:8080,http://127.0.0.1:8081,http://localhost:8081"
- },
- "ApiName": "WIDESEA",
- "ExpMinutes": 120,
- "QuartzJobAutoStart": true,
- "LogDeubgEnable": true
+ "urls": "http://*:9291", //web鏈嶅姟绔彛锛屽鏋滅敤IIS閮ㄧ讲锛屾妸杩欎釜鍘绘帀
+ "Logging": {
+ "LogLevel": {
+ "Default": "Information",
+ "Microsoft.AspNetCore": "Warning"
+ }
+ },
+ "dics": "deviceType,devicePlcType,jobAssembly,jobClassName,deviceStatus,taskType,taskState,inOutType",
+ "AllowedHosts": "*",
+ "ConnectionStringsEncryption": false,
+ "MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
+ //杩炴帴瀛楃涓�
+ //"ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=WIDESEA_WCSDBB2F;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WCSDB_BBMain;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ //璺ㄥ煙
+ "Cors": {
+ "PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
+ "EnableAllIPs": true, //褰撲负true鏃讹紝寮�鏀炬墍鏈塈P鍧囧彲璁块棶銆�
+ // 鏀寔澶氫釜鍩熷悕绔彛锛屾敞鎰忕鍙ｅ彿鍚庝笉瑕佸甫/鏂滄潌锛氭瘮濡俵ocalhost:8000/锛屾槸閿欑殑
+ // 娉ㄦ剰锛宧ttp://127.0.0.1:1818 鍜� http://localhost:1818 鏄笉涓�鏍风殑
+ "IPs": "http://127.0.0.1:8080,http://localhost:8080,http://127.0.0.1:8081,http://localhost:8081"
+ },
+ "ApiName": "WIDESEA",
+ "ExpMinutes": 120,
+ "QuartzJobAutoStart": true,
+ "LogDeubgEnable": true
}
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
index b6b2846..8338a0c 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
@@ -133,7 +133,7 @@
}
}
- if (childDeviceCode == "1670"||childDeviceCode=="1666"||childDeviceCode=="1548"||childDeviceCode=="1448")
+ if (childDeviceCode == "1670" || childDeviceCode == "1666" || childDeviceCode == "1548" || childDeviceCode == "1448")
{
Platform platform = _platFormRepository.QueryFirst(x => x.DeviceCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
if (platform != null)
@@ -212,7 +212,7 @@
else
{
var GWTask = _taskRepository.QueryData(x => x.Roadway.Contains("GWSC2") && x.SourceAddress == "1039" && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskInStatusEnum.Line_InFinish)).ToList();
- if (GWTask.Count >= 2 && childDeviceCode == "1039"&& task.Roadway.Contains("GWSC2"))
+ if (GWTask.Count >= 2 && childDeviceCode == "1039" && task.Roadway.Contains("GWSC2"))
{
ConsoleHelper.WriteErrorLine($"鎵樼洏鍙凤細銆恵command.ConveyorLineBarcode}銆戦珮娓╀簩宸插瓨鍦ㄣ�恵GWTask.Count}銆戜釜浠诲姟澶т簬2涓换鍔′笉鍙笅鍙�");
return;
@@ -220,10 +220,12 @@
ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
//conveyorLine.SendCommand(taskCommand, childDeviceCode);
- SendCommand(taskCommand, conveyorLine, childDeviceCode);
-
- conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
- _taskService.UpdateTaskStatusToNext(task);
+ bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
+ if (sendFlag)
+ {
+ conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
+ _taskService.UpdateTaskStatusToNext(task);
+ }
}
}
catch (Exception ex)
@@ -255,10 +257,12 @@
ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(newTask);
//conveyorLine.SendCommand(taskCommand, childDeviceCode);
- SendCommand(taskCommand, conveyorLine, childDeviceCode);
-
- conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
- _taskService.UpdateData(newTask);
+ bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
+ if (sendFlag)
+ {
+ conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
+ _taskService.UpdateData(newTask);
+ }
}
}
}
@@ -279,7 +283,7 @@
if (content.Status)
{
- conveyorLine.SetValue(ConveyorLineDBName_After.ResponState,Convert.ToInt16(1), childDeviceCode);
+ conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
}
Console.Out.WriteLine(content.Serialize());
@@ -301,14 +305,16 @@
ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
//conveyorLine.SendCommand(taskCommand, childDeviceCode);
- SendCommand(taskCommand, conveyorLine, childDeviceCode);
-
- conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
-
- _taskService.UpdateTaskStatusToNext(task);
- if (task.TaskType == (int)TaskOutboundTypeEnum.OutTray)
+ bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
+ if (sendFlag)
{
+ conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
+
_taskService.UpdateTaskStatusToNext(task);
+ if (task.TaskType == (int)TaskOutboundTypeEnum.OutTray)
+ {
+ _taskService.UpdateTaskStatusToNext(task);
+ }
}
}
}
@@ -358,10 +364,12 @@
ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(newTask);
//conveyorLine.SendCommand(taskCommand, childDeviceCode);
- SendCommand(taskCommand, conveyorLine, childDeviceCode);
-
- conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
- _taskService.UpdateData(newTask);
+ bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
+ if (sendFlag)
+ {
+ conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
+ _taskService.UpdateData(newTask);
+ }
}
}
else
@@ -370,10 +378,12 @@
taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(stationManager.stationNGChildCode);
//conveyorLine.SendCommand(taskCommand, childDeviceCode);
- SendCommand(taskCommand, conveyorLine, childDeviceCode);
-
- conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
- _taskService.UpdateTaskStatusToNext(task);
+ bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
+ if (sendFlag)
+ {
+ conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
+ _taskService.UpdateTaskStatusToNext(task);
+ }
}
}
}
@@ -421,9 +431,12 @@
}
//conveyorLine.SendCommand(taskCommand, childDeviceCode);
- SendCommand(taskCommand, conveyorLine, childDeviceCode);
- conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
- content = _taskService.UpdateTaskStatusToNext(task);
+ bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
+ if (sendFlag)
+ {
+ conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
+ content = _taskService.UpdateTaskStatusToNext(task);
+ }
}
else
{
@@ -455,11 +468,15 @@
}
//conveyorLine.SendCommand(taskCommand, childDeviceCode);
- SendCommand(taskCommand, conveyorLine, childDeviceCode);
- conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
- taskNext.ExceptionMessage = log;
- content = _taskService.UpdateTaskStatusToNext(taskNext);
+ bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
+ if (sendFlag)
+ {
+ conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
+
+ taskNext.ExceptionMessage = log;
+ content = _taskService.UpdateTaskStatusToNext(taskNext);
+ }
}
}
}
@@ -543,15 +560,41 @@
return content;
}
- public void SendCommand(ConveyorLineTaskCommand_After taskCommand, CommonConveyorLine_GW conveyorLine, string childDeviceCode)
+ public bool SendCommand(ConveyorLineTaskCommand_After taskCommand, CommonConveyorLine_GW conveyorLine, string childDeviceCode)
{
- conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, taskCommand.ConveyorLineTargetAddress, childDeviceCode);
+ conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, Convert.ToInt16(taskCommand.ConveyorLineTargetAddress), childDeviceCode);
Thread.Sleep(100);
- conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineBarcode, taskCommand.ConveyorLineBarcode, childDeviceCode);
+ conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineBarcode, taskCommand.ConveyorLineBarcode, childDeviceCode);
Thread.Sleep(100);
conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTaskNum, taskCommand.ConveyorLineTaskNum, childDeviceCode);
+ for (int i = 0; i < 6; i++)
+ {
+ ConveyorLineTaskCommand_After command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand_After>(childDeviceCode);
+ if (command != null)
+ {
+ if (command.ConveyorLineBarcode == taskCommand.ConveyorLineBarcode && command.ConveyorLineTaskNum == taskCommand.ConveyorLineTaskNum && command.ConveyorLineTargetAddress == taskCommand.ConveyorLineTargetAddress)
+ {
+ return true;
+ }
+ if (command.ConveyorLineTargetAddress != taskCommand.ConveyorLineTargetAddress)
+ {
+ conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, Convert.ToInt16(taskCommand.ConveyorLineTargetAddress), childDeviceCode);
+ Thread.Sleep(100);
+ }
+ if (command.ConveyorLineBarcode != taskCommand.ConveyorLineBarcode)
+ {
+ conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineBarcode, taskCommand.ConveyorLineBarcode, childDeviceCode);
+ Thread.Sleep(100);
+ }
+ if (command.ConveyorLineTaskNum != taskCommand.ConveyorLineTaskNum)
+ {
+ conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTaskNum, taskCommand.ConveyorLineTaskNum, childDeviceCode); Thread.Sleep(100);
+ }
+
+ }
+ }
+ return false;
}
}
}
-
#endregion
\ No newline at end of file
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
index 101939f..8ab0147 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
@@ -185,7 +185,7 @@
// break;
//}
- RequestWmsTask(conveyorLine, command, childDeviceCode,stationManager);
+ RequestWmsTask(conveyorLine, command, childDeviceCode, stationManager);
break;
}
}
@@ -269,9 +269,11 @@
var taskCommand = MapTaskCommand(task, command);
//conveyorLine.SendCommand(taskCommand, childDeviceCode);
- SendCommand(taskCommand, conveyorLine, childDeviceCode);
-
- _taskService.UpdateTaskStatusToNext(task);
+ bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
+ if (sendFlag)
+ {
+ _taskService.UpdateTaskStatusToNext(task);
+ }
}
}
//}
@@ -329,11 +331,13 @@
ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
//conveyorLine.SendCommand(taskCommand, childDeviceCode);
- SendCommand(taskCommand, conveyorLine, childDeviceCode);
+ bool sendFlag = SendCommand(taskCommand, conveyorLine, childDeviceCode);
+ if (sendFlag)
+ {
+ conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
- conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, Convert.ToInt16(1), childDeviceCode);
-
- _taskService.UpdateTaskStatusToNext(task);
+ _taskService.UpdateTaskStatusToNext(task);
+ }
}
}
else
@@ -398,8 +402,8 @@
if (conveyorLine.ReadValue(ConveyorLineDBName_After.InteractiveSignal, childDeviceCode).ObjToInt() == 0) //鎵樼洏姝ｅ弽淇″彿
{
- };
-
+ }
+ ;
conveyorLine.ReadValue(ConveyorLineDBName_After.InteractiveSignal, childDeviceCode); //鎵樼洏鏈夋棤鐢佃姱淇″彿
}
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/api/http.js b/Code Management/WMS/WIDESEA_WMSClient/src/api/http.js
index baab04e..0b61bce 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/api/http.js
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/api/http.js
@@ -15,11 +15,11 @@
// axios.defaults.baseURL = 'http://192.168.20.253:5000/';
}
else if (process.env.NODE_ENV == 'debug') {
- axios.defaults.baseURL = 'http://192.168.20.253:5000/';
+ axios.defaults.baseURL = 'http://192.168.15.253:5000/';
}
else if (process.env.NODE_ENV == 'production') {
// axios.defaults.baseURL = 'http://127.0.0.1:5000/';
- axios.defaults.baseURL = 'http://192.168.20.253:5000/';
+ axios.defaults.baseURL = 'http://192.168.15.253:5000/';
}
//axios.defaults.baseURL = 'http://api.volcore.xyz/';
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js b/Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js
index 805cad8..c6c6ac0 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js
@@ -29,6 +29,14 @@
}
},
{
+ path: '/Dt_LocationStatus',
+ name: 'Dt_LocationStatus',
+ component: () => import('@/views/widesea_wms/basicinfo/LocationStatusChange.vue'),
+ meta: {
+
+ }
+ },
+ {
path: '/Dt_InboundOrderDetail',
name: 'Dt_InboundOrderDetail',
component: () => import('@/views/widesea_wms/invoices/Dt_InboundOrderDetail.vue'),
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationStatus.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationStatus.vue
new file mode 100644
index 0000000..bd071e5
--- /dev/null
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationStatus.vue
@@ -0,0 +1,85 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/basicinfo/Dt_LocationInfo.js姝ゅ缂栧啓
+ -->
+ <template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/widesea_wms/basicinfo/Dt_LocationInfo.jsx";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'id',
+ footer: "Foots",
+ cnName: '璐т綅淇℃伅',
+ name: '/api',
+ url: "/Task/LocationStatus",
+ sortName: "id"
+ });
+ const editFormFields = ref({ "locationStatus": "" });
+ const editFormOptions = ref([
+ [
+ { "title": "璐т綅鐘舵��", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] },
+ { "title": "鏄惁绂佺敤", "field": "enalbeStatus", "type": "select", dataKey: "EnalbeStatus", data: [] },
+ ]
+ ]);
+ const searchFormFields = ref({ "LocationID": "",roadWayNO:"" });
+ const searchFormOptions = ref([
+ [
+ { "title": "璐т綅缂栧彿", "field": "locationCode", type: "text" },
+ { "title": "璐т綅鐘舵��", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] },
+ { "title": "宸烽亾缂栧彿", "field": "roadWayNO", type: "text" },
+ ],
+ [
+ { "title": "琛�", "field": "row", type: "text" },
+ { "title": "鍒�", "field": "column", "type": "text" },
+ { "title": "灞�", "field": "layer", type: "text" },
+ ]
+ ]);
+ const columns = ref([{ field: 'locationID', title: '璐т綅ID', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
+ { field: 'locationCode', title: '璐т綅缂栧彿', type: 'string', width: 110, require: true, align: 'left' },
+ { field: 'locationName', title: '璐т綅鍚嶇О', type: 'string', width: 120, align: 'left' },
+ { field: 'roadwayNo', title: '宸烽亾鍙�', type: 'string', width: 110, require: true, align: 'left', sort: true },
+ { field: 'row', title: '琛�', type: 'string', width: 70, align: 'left' },
+ { field: 'column', title: '鍒�', type: 'string', width: 70, align: 'left' },
+ { field: 'layer', title: '灞�', type: 'string', width: 110, align: 'left' },
+ { field: 'depth', title: '娣卞害', type: 'string', width: 110, align: 'left', hidden: true },
+ { field: 'scNo', title: '瀵瑰簲鍫嗗灈鏈哄彿', type: 'string', width: 110, align: 'left', hidden: true },
+ { field: 'locationType', title: '璐т綅绫诲瀷', type: 'int', width: 110, align: 'left',bind: { key: "LocationType", data: [] } },
+ { field: 'locationStatus', title: '璐т綅鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "LocationState", data: [] } },
+ { field: 'enalbeStatus', title: '鏄惁绂佺敤', type: 'int', width: 75, align: 'left', bind: { key: "EnalbeStatus", data: [] }},
+ // { field: 'isLocked', title: '鏄惁閿佸畾', type: 'bool', width: 110, align: 'left', bind: { key: "IsLocked", data: [] } },
+ { field: 'locationDesc', title: '璐т綅鎻忚堪', type: 'string', width: 110, align: 'left', hidden: true },
+ { field: 'remark', title: '妫�娴嬫煖鍏佽', type: 'string', width: 110, align: 'left' ,bind: { key: "AllowStatus", data: [] }},
+ { field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+ { field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
+ { field: 'modifyDate', title: '淇敼鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "#detailTable",
+ columns: [],
+ sortName: "",
+ key: ""
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue
index bed5875..848d6d7 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue
@@ -83,9 +83,9 @@
{ field: 'dispatchertime', title: '浠诲姟涓嬪彂鏃堕棿', type: 'datetime', width: 150, align: 'left', sort: true },
{ field: 'operateType', title: '鎿嶄綔绫诲瀷', type: 'string', width: 110, align: 'left', bind: { key: "operateType", data: [] }},
{ field: 'remark', title: '澶囨敞', type: 'string', width: 110, align: 'left',hidden: true, },
- { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+ { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, hidden: true,align: 'left', sort: true },
//{ field: 'modifyDate', title: '淇敼鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
- { field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'creater', title: '瀹屾垚鑰�', type: 'string', sort: true, width: 110, align: 'left' },
//{ field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
{ field: 'finishTime', title: '瀹屾垚鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
{ field: 'locationCode', title: '璐т綅鍙�', type: 'string', width: 110, hidden: true, align: 'left' },
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs
index b3e4e81..2e46f1a 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs
@@ -271,4 +271,9 @@
/// </summary>
/// <returns></returns>
WebResponseContent Getproductionstatistics();
+ /// <summary>
+ /// 鑾峰彇璐т綅鐘舵�佷笉鏄┖闂层�佹湁璐х殑鍏ㄩ儴璐т綅
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent GetLocationStatus();
}
\ No newline at end of file
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
index 19282f0..f8c87c9 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
@@ -1637,6 +1637,20 @@
return content.Error(ex.Message);
}
}
+ public WebResponseContent GetLocationStatus()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ List<DtLocationInfo> LocationList = _locationRepository.Db.Queryable<DtLocationInfo>().Where(x => x.LocationStatus != 2 && x.LocationStatus != 0).ToList();
+ return content.OK1(total1: LocationList.Count, data: LocationList);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+
+ }
}
internal class TaskHourData
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
index a7ae9dc..a510ec9 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs
@@ -261,4 +261,13 @@
{
return Service.Getproductionstatistics();
}
+ /// <summary>
+ /// 鑾峰彇涓嶆槸绌洪棽浠ュ強鏈夎揣鐨勫叏閮ㄨ揣浣�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("LocationStatusgetPageData")]
+ public WebResponseContent LocationStatus()
+ {
+ return Service.GetLocationStatus();
+ }
}
\ No newline at end of file
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile1.pubxml b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile1.pubxml
new file mode 100644
index 0000000..588f952
--- /dev/null
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile1.pubxml
@@ -0,0 +1,17 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+ <PropertyGroup>
+ <DeleteExistingFiles>false</DeleteExistingFiles>
+ <ExcludeApp_Data>false</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>D:\2025骞�7鏈�4鏃�</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ <_TargetId>Folder</_TargetId>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile1.pubxml.user b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile1.pubxml.user
new file mode 100644
index 0000000..1b5f721
--- /dev/null
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -0,0 +1,11 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+ <PropertyGroup>
+ <_PublishTargetUrl>D:\2025骞�7鏈�4鏃�</_PublishTargetUrl>
+ <History>True|2025-07-04T02:32:33.2226066Z||;</History>
+ <LastFailureDetails />
+ </PropertyGroup>
+</Project>
\ No newline at end of file
--
Gitblit v1.9.3