From 3b243dbf4c477fc6ca39263f3969c7118fe27a68 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 20 六月 2024 20:17:14 +0800
Subject: [PATCH] 优化检测上料逻辑
---
代码管理/PCS/WCS_Client/package.json | 6 +++---
代码管理/PCS/WCS_Client/src/api/http.js | 2 +-
代码管理/PCS/WCS_Server/WIDESEA_WCS/Common/Pipeline.cs | 6 ++++++
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/package.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/package.json"
index a13e8bb..79b0a97 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/package.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/package.json"
@@ -3,11 +3,11 @@
"version": "0.1.0",
"private": true,
"scripts": {
- "serve": "vue-cli-service serve",
- "build": "vue-cli-service build",
+ "serve": " SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+ "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
"test:unit": "vue-cli-service test:unit",
"lint": "vue-cli-service lint"
- },
+},
"dependencies": {
"@element-plus/icons-vue": "^2.1.0",
"@microsoft/signalr": "^6.0.4",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/api/http.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/api/http.js"
index a3bcc6a..f6b7a14 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/api/http.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/api/http.js"
@@ -12,7 +12,7 @@
let loadingInstance;
let loadingStatus = false;
if (process.env.NODE_ENV == 'development') {
- axios.defaults.baseURL = 'http://192.168.12.118:8099/';
+ axios.defaults.baseURL = 'http://192.168.12.101:8099/';
}
else if (process.env.NODE_ENV == 'debug') {
axios.defaults.baseURL = 'http://192.168.12.101:8099/';
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Pipeline.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Pipeline.cs"
index 8d50692..6184d54 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Pipeline.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Pipeline.cs"
@@ -17,6 +17,7 @@
using WIDESEA_WCS.JobsPart.Common;
using System.Xml.Linq;
using WIDESEA_Common;
+using System.Net;
namespace WIDESEA_WCS
{
@@ -219,6 +220,11 @@
//}
#endregion
}
+ else
+ {
+ var count = Gantry_client.ReadByOrder<Int16>("W_IndexNr", number);
+ if (Station.quantity != count) Gantry_client.WriteByOrder("W_RequestUnload", false, number);
+ }
}
else
{
--
Gitblit v1.9.3