From 2d10593918d8851fba32eadecd7e0edd41ac73a4 Mon Sep 17 00:00:00 2001
From: xxyy <cathay_xy@163.com>
Date: 星期三, 05 三月 2025 10:46:26 +0800
Subject: [PATCH] 添加 PlatForm 路由及相关组件更新
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs | 12 +-
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IProcessService/WIDESEAWCS_IProcessService.csproj | 14 ++
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/MOM/MOMErrorMessage.cs | 2
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Error/MoMErrorMsg.cs | 4
Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue | 169 ++++++++++++++++++++++++++++
Code Management/WMS/WIDESEA_WMSClient/src/api/http.js | 4
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs | 22 +-
Code Management/WCS/WIDESEAWCS_Client/src/router/viewGird.js | 8 +
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Utilities/EntityProperties.cs | 10
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 38 +++---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessService/WIDESEAWCS_ProcessService.csproj | 14 ++
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj | 1
Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue | 4
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server.sln | 31 ++++-
14 files changed, 279 insertions(+), 54 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/router/viewGird.js b/Code Management/WCS/WIDESEAWCS_Client/src/router/viewGird.js
index 374e2bd..cf19aa2 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/router/viewGird.js
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/router/viewGird.js
@@ -78,6 +78,14 @@
keepAlive: false
}
},
+ {
+ path: '/PlatForm',
+ name: 'PlatForm',
+ component: () => import('@/views/ProcessParameters/PlatForm.vue'),
+ meta: {
+ keepAlive: false
+ }
+ },
]
export default viewgird
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue
new file mode 100644
index 0000000..015c106
--- /dev/null
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue
@@ -0,0 +1,169 @@
+
+<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/ProcessParameters/PlatForm.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "id",
+ footer: "Foots",
+ cnName: "OCV鍙枡",
+ name: "Platform",
+ url: "/Platform/",
+ sortName: "id",
+ });
+ const editFormFields = ref({
+ id:"",
+ platCode:"",
+ platformName: "",
+ stacker: "",
+ executionMethod:"",
+ platformType:"",
+ plcCode:"",
+ location: "",
+ capacity: "",
+ status: "",
+ productionLine: ""
+
+ });
+ const editFormOptions = ref([
+ [
+ { title: "鍙紦瀛樻暟閲�", field: "capacity", type: "text" },
+ {
+ title: "鍚敤鐘舵��",
+ required: true,
+ field: "status",
+ type: "select",
+ dataKey: "PlatFormState",
+ data: [],
+ },
+ ]
+ ]);
+ const searchFormFields = ref({
+ platCode:"",
+ platformName: "",
+ stacker: "",
+ executionMethod:"",
+ platformType:"",
+ plcCode:"",
+ location: "",
+ capacity: "",
+ status: "",
+ productionLine: "",
+ });
+ const searchFormOptions = ref([
+
+ ]);
+ const columns = ref([
+ {
+ field: "Id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "platCode",
+ title: "绔欏彴缂栧彿",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "platformName",
+ title: "绔欏彴鍚嶇О",
+ type: "string",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "capacity",
+ title: "鍙紦瀛樻暟閲�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "status",
+ title: "鐘舵��",
+ type: "string",
+ width: 90,
+ align: "left",
+ bind: { key: "PlatFormState", data: [] },
+ },
+ {
+ field: "productionLine",
+ title: "浜х嚎",
+ type: "int",
+ width: 150,
+ align: "left",
+ bind: { key: "ProductionLine", data: [] },
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 150,
+ align: "left",
+ },
+
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ ]);
+ const detail = ref({
+ cnName: "",
+ table: "",
+ columns: [],
+ sortName: "",
+ key: "",
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
+
\ No newline at end of file
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 df216d1..c22340f 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
@@ -32,7 +32,7 @@
roadway: "",
taskType:"",
taskState:"",
- wMSId:"",
+ wmsId:"",
sourceAddress: "",
targetAddress: "",
currentAddress: "",
@@ -193,7 +193,7 @@
align: "left",
},
{
- field: "wMSId",
+ field: "wmsId",
title: "WMS浠诲姟涓婚敭",
type: "int",
width: 120,
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Utilities/EntityProperties.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Utilities/EntityProperties.cs
index 91dacd8..11ea985 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Utilities/EntityProperties.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Utilities/EntityProperties.cs
@@ -173,11 +173,11 @@
if (sugarColumn == null)
return "璇烽厤缃甋ugarColumn灞炴��";
//蹇界暐涓庝富閿殑瀛楁涓嶅仛楠岃瘉
- if (property.Name == keyName.FirstLetterToUpper() || (ignoreFields != null && ignoreFields.Contains(property.Name)) || sugarColumn.IsOnlyIgnoreInsert || sugarColumn.IsOnlyIgnoreUpdate || sugarColumn.IsIgnore)
+ if (property.Name.ToUpper() == keyName.ToUpper() || (ignoreFields != null && ignoreFields.Contains(property.Name)) || sugarColumn.IsOnlyIgnoreInsert || sugarColumn.IsOnlyIgnoreUpdate || sugarColumn.IsIgnore)
continue;
//涓嶅湪缂栬緫涓殑鍒楋紝鏄惁涔熻蹇呭～
- if (!dic.ContainsKey(property.Name.FirstLetterToLower()))
+ if (!dic.ContainsKey(property.Name.ToUpper()))
{
if (!sugarColumn.IsNullable)
{
@@ -187,12 +187,12 @@
}
continue;
}
- if(dic[property.Name.FirstLetterToLower()] != null)
+ if(dic[property.Name.ToUpper()] != null)
{
- string str = dic[property.Name.FirstLetterToLower()].ToString();
+ string str = dic[property.Name.ToUpper()].ToString();
//灏嗘墍鏈夌┖鍊艰缃负null
if (str == string.Empty)
- dic[property.Name.FirstLetterToLower()] = null;
+ dic[property.Name.ToUpper()] = null;
}
}
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IProcessService/WIDESEAWCS_IProcessService.csproj b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IProcessService/WIDESEAWCS_IProcessService.csproj
new file mode 100644
index 0000000..75b2aa7
--- /dev/null
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IProcessService/WIDESEAWCS_IProcessService.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\WIDESEAWCS_ISystemServices\WIDESEAWCS_ISystemServices.csproj" />
+ <ProjectReference Include="..\WIDESEAWCS_ProcessParameters\WIDESEAWCS_IProcessRepository.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs
index a4ebcc0..104af76 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs
@@ -24,7 +24,7 @@
/// </summary>
[ImporterHeader(Name = "绔欏彴缂栧彿锛屽敮涓�鏍囪瘑姣忎釜绔欏彴鐨勭紪鍙�")]
[ExporterHeader(DisplayName = "绔欏彴缂栧彿锛屽敮涓�鏍囪瘑姣忎釜绔欏彴鐨勭紪鍙�")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "绔欏彴缂栧彿锛屽敮涓�鏍囪瘑姣忎釜绔欏彴鐨勭紪鍙�")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "绔欏彴缂栧彿锛屽敮涓�鏍囪瘑姣忎釜绔欏彴鐨勭紪鍙�")]
public string PlatCode { get; set; }
/// <summary>
@@ -32,7 +32,7 @@
/// </summary>
[ImporterHeader(Name = "绔欏彴鍚嶇О")]
[ExporterHeader(DisplayName = "绔欏彴鍚嶇О")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "绔欏彴鍚嶇О")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "绔欏彴鍚嶇О")]
public string PlatformName { get; set; }
/// <summary>
@@ -40,7 +40,7 @@
/// </summary>
[ImporterHeader(Name = "瀵瑰簲鍫嗗灈鏈�")]
[ExporterHeader(DisplayName = "瀵瑰簲鍫嗗灈鏈�")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "瀵瑰簲鍫嗗灈鏈�")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "瀵瑰簲鍫嗗灈鏈�")]
public string Stacker { get; set; }
/// <summary>
@@ -48,7 +48,7 @@
/// </summary>
[ImporterHeader(Name = "鎵ц鏂规硶")]
[ExporterHeader(DisplayName = "鎵ц鏂规硶")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵ц鏂规硶")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎵ц鏂规硶")]
public string ExecutionMethod { get; set; }
/// <summary>
@@ -56,7 +56,7 @@
/// </summary>
[ImporterHeader(Name = "绔欏彴绫诲瀷")]
[ExporterHeader(DisplayName = "绔欏彴绫诲瀷")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "绔欏彴绫诲瀷")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "绔欏彴绫诲瀷")]
public string PlatformType { get; set; }
/// <summary>
@@ -64,7 +64,7 @@
/// </summary>
[ImporterHeader(Name = "瀵瑰簲PLC缂栧彿")]
[ExporterHeader(DisplayName = "瀵瑰簲PLC缂栧彿")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "瀵瑰簲PLC缂栧彿")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "瀵瑰簲PLC缂栧彿")]
public string PLCCode { get; set; }
/// <summary>
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs
index 0caccd8..d6e99c9 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs
@@ -42,7 +42,7 @@
/// </summary>
[ImporterHeader(Name = "浠诲姟鍙�")]
[ExporterHeader(DisplayName = "浠诲姟鍙�")]
- [SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟鍙�")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟鍙�")]
public int TaskNum { get; set; }
/// <summary>
@@ -50,7 +50,7 @@
/// </summary>
[ImporterHeader(Name = "鎵樼洏缂栧彿")]
[ExporterHeader(DisplayName = "鎵樼洏缂栧彿")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵樼洏缂栧彿")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎵樼洏缂栧彿")]
public string PalletCode { get; set; }
/// <summary>
@@ -58,7 +58,7 @@
/// </summary>
[ImporterHeader(Name = "宸烽亾鍙�")]
[ExporterHeader(DisplayName = "宸烽亾鍙�")]
- [SugarColumn(IsNullable = false, Length = 10, ColumnDescription = "宸烽亾鍙�")]
+ [SugarColumn(IsNullable = true, Length = 10, ColumnDescription = "宸烽亾鍙�")]
public string Roadway { get; set; }
/// <summary>
@@ -66,7 +66,7 @@
/// </summary>
[ImporterHeader(Name = "浠诲姟绫诲瀷")]
[ExporterHeader(DisplayName = "浠诲姟绫诲瀷")]
- [SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟绫诲瀷")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟绫诲瀷")]
public int TaskType { get; set; }
/// <summary>
@@ -74,7 +74,7 @@
/// </summary>
[ImporterHeader(Name = "浠诲姟鐘舵��")]
[ExporterHeader(DisplayName = "浠诲姟鐘舵��")]
- [SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟鐘舵��")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟鐘舵��")]
public int TaskState { get; set; }
/// <summary>
@@ -82,7 +82,7 @@
/// </summary>
[ImporterHeader(Name = "璧峰鍦板潃")]
[ExporterHeader(DisplayName = "璧峰鍦板潃")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璧峰鍦板潃")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "璧峰鍦板潃")]
public string SourceAddress { get; set; }
/// <summary>
@@ -90,7 +90,7 @@
/// </summary>
[ImporterHeader(Name = "鐩爣鍦板潃")]
[ExporterHeader(DisplayName = "鐩爣鍦板潃")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鐩爣鍦板潃")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "鐩爣鍦板潃")]
public string TargetAddress { get; set; }
/// <summary>
@@ -98,7 +98,7 @@
/// </summary>
[ImporterHeader(Name = "褰撳墠浣嶇疆")]
[ExporterHeader(DisplayName = "褰撳墠浣嶇疆")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "褰撳墠浣嶇疆")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "褰撳墠浣嶇疆")]
public string CurrentAddress { get; set; }
/// <summary>
@@ -106,7 +106,7 @@
/// </summary>
[ImporterHeader(Name = "涓嬩竴鍦板潃")]
[ExporterHeader(DisplayName = "涓嬩竴鍦板潃")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "涓嬩竴鍦板潃")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "涓嬩竴鍦板潃")]
public string NextAddress { get; set; }
/// <summary>
@@ -122,7 +122,7 @@
/// </summary>
[ImporterHeader(Name = "浼樺厛绾�")]
[ExporterHeader(DisplayName = "浼樺厛绾�")]
- [SugarColumn(IsNullable = false, ColumnDescription = "浼樺厛绾�")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "浼樺厛绾�")]
public int Grade { get; set; }
/// <summary>
@@ -130,7 +130,7 @@
/// </summary>
[ImporterHeader(Name = "WMS浠诲姟涓婚敭")]
[ExporterHeader(DisplayName = "WMS浠诲姟涓婚敭")]
- [SugarColumn(IsNullable = false, ColumnDescription = "WMS浠诲姟涓婚敭")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "WMS浠诲姟涓婚敭")]
public int WMSId { get; set; }
/// <summary>
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessService/WIDESEAWCS_ProcessService.csproj b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessService/WIDESEAWCS_ProcessService.csproj
new file mode 100644
index 0000000..bff2f37
--- /dev/null
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessService/WIDESEAWCS_ProcessService.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\WIDESEAWCS_IProcessService\WIDESEAWCS_IProcessService.csproj" />
+ <ProjectReference Include="..\WIDESEAWCS_QuartzJob\WIDESEAWCS_QuartzJob.csproj" />
+ </ItemGroup>
+
+</Project>
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server.sln b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server.sln
index 5d54fc1..0d73571 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server.sln
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server.sln
@@ -66,19 +66,25 @@
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProcessParameters", "ProcessParameters", "{396F6843-C06A-4856-B0AF-769542C83000}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEAWCS_IProcessRepository", "WIDESEAWCS_ProcessParameters\WIDESEAWCS_IProcessRepository.csproj", "{D33C3BD0-2C88-4875-B47E-7BDD908C3342}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEAWCS_IProcessRepository", "WIDESEAWCS_ProcessParameters\WIDESEAWCS_IProcessRepository.csproj", "{D33C3BD0-2C88-4875-B47E-7BDD908C3342}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEAWCS_ProcessRepository", "WIDESEAWCS_ProcessRepository\WIDESEAWCS_ProcessRepository.csproj", "{A099C81C-73ED-4AF0-80A0-C12FB8B87394}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEAWCS_ProcessRepository", "WIDESEAWCS_ProcessRepository\WIDESEAWCS_ProcessRepository.csproj", "{A099C81C-73ED-4AF0-80A0-C12FB8B87394}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEAWCS_ITaskInfo_HtyRepository", "WIDESEAWCS_ITaskInfo_HtyRepository\WIDESEAWCS_ITaskInfo_HtyRepository.csproj", "{17EADC05-D1F1-4440-8B86-56B21E19DC93}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEAWCS_ITaskInfo_HtyRepository", "WIDESEAWCS_ITaskInfo_HtyRepository\WIDESEAWCS_ITaskInfo_HtyRepository.csproj", "{17EADC05-D1F1-4440-8B86-56B21E19DC93}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEAWCS_TaskInfo_HtyRepository", "WIDESEAWCS_TaskInfo_HtyRepository\WIDESEAWCS_TaskInfo_HtyRepository.csproj", "{3E3522C6-5A03-4333-9602-B13243334887}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEAWCS_TaskInfo_HtyRepository", "WIDESEAWCS_TaskInfo_HtyRepository\WIDESEAWCS_TaskInfo_HtyRepository.csproj", "{3E3522C6-5A03-4333-9602-B13243334887}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEAWCS_TaskInfo_HtyService", "WIDESEAWCS_TaskInfo_HtyService\WIDESEAWCS_TaskInfo_HtyService.csproj", "{978A638E-EDA8-43B7-A1C2-104A790A0C10}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEAWCS_TaskInfo_HtyService", "WIDESEAWCS_TaskInfo_HtyService\WIDESEAWCS_TaskInfo_HtyService.csproj", "{978A638E-EDA8-43B7-A1C2-104A790A0C10}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEAWCS_ITaskInfo_HtyService", "WIDESEAWCS_ITaskInfo_HtyService\WIDESEAWCS_ITaskInfo_HtyService.csproj", "{61271216-85F8-4425-BAFB-1BEE4A35F5F9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEAWCS_ITaskInfo_HtyService", "WIDESEAWCS_ITaskInfo_HtyService\WIDESEAWCS_ITaskInfo_HtyService.csproj", "{61271216-85F8-4425-BAFB-1BEE4A35F5F9}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEAWCS_SignalR", "WIDESEAWCS_SignalR\WIDESEAWCS_SignalR.csproj", "{59D26679-7299-4251-A58E-3AC3C6FA717E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEAWCS_SignalR", "WIDESEAWCS_SignalR\WIDESEAWCS_SignalR.csproj", "{59D26679-7299-4251-A58E-3AC3C6FA717E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProcessParameters", "ProcessParameters", "{2DA6F051-80D7-4BA4-AB6B-98261C3EE7B9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEAWCS_ProcessService", "WIDESEAWCS_ProcessService\WIDESEAWCS_ProcessService.csproj", "{2FC9015D-41AF-4B8E-941B-A3CBAEA19EDF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEAWCS_IProcessService", "WIDESEAWCS_IProcessService\WIDESEAWCS_IProcessService.csproj", "{4975C9B8-E205-41F5-A38A-19496A4B85CF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -194,6 +200,14 @@
{59D26679-7299-4251-A58E-3AC3C6FA717E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59D26679-7299-4251-A58E-3AC3C6FA717E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{59D26679-7299-4251-A58E-3AC3C6FA717E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2FC9015D-41AF-4B8E-941B-A3CBAEA19EDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2FC9015D-41AF-4B8E-941B-A3CBAEA19EDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2FC9015D-41AF-4B8E-941B-A3CBAEA19EDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2FC9015D-41AF-4B8E-941B-A3CBAEA19EDF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4975C9B8-E205-41F5-A38A-19496A4B85CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4975C9B8-E205-41F5-A38A-19496A4B85CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4975C9B8-E205-41F5-A38A-19496A4B85CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4975C9B8-E205-41F5-A38A-19496A4B85CF}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -224,6 +238,9 @@
{3E3522C6-5A03-4333-9602-B13243334887} = {684035E2-174F-47CE-AA5C-36624C7E26F3}
{978A638E-EDA8-43B7-A1C2-104A790A0C10} = {D9CF90D0-AFB3-42AA-A2F1-BEE741E0AC0D}
{61271216-85F8-4425-BAFB-1BEE4A35F5F9} = {D9CF90D0-AFB3-42AA-A2F1-BEE741E0AC0D}
+ {2DA6F051-80D7-4BA4-AB6B-98261C3EE7B9} = {A12315CA-9D81-412C-A09B-B23D95CFFE16}
+ {2FC9015D-41AF-4B8E-941B-A3CBAEA19EDF} = {2DA6F051-80D7-4BA4-AB6B-98261C3EE7B9}
+ {4975C9B8-E205-41F5-A38A-19496A4B85CF} = {2DA6F051-80D7-4BA4-AB6B-98261C3EE7B9}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C9A356D5-D4FE-414B-B982-6C97792BE6C6}
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj
index 51f1104..fa406f4 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj
@@ -77,6 +77,7 @@
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\WIDESEAWCS_ProcessService\WIDESEAWCS_ProcessService.csproj" />
<ProjectReference Include="..\WIDESEAWCS_QuartzJob\WIDESEAWCS_QuartzJob.csproj" />
<ProjectReference Include="..\WIDESEAWCS_SignalR\WIDESEAWCS_SignalR.csproj" />
<ProjectReference Include="..\WIDESEAWCS_SystemServices\WIDESEAWCS_SystemServices.csproj" />
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/api/http.js b/Code Management/WMS/WIDESEA_WMSClient/src/api/http.js
index 68b5797..a37567d 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/api/http.js
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/api/http.js
@@ -11,8 +11,8 @@
let loadingInstance
let loadingStatus = false
if (process.env.NODE_ENV == 'development') {
- // axios.defaults.baseURL = 'http://localhost:5000/';
- axios.defaults.baseURL = 'http://192.168.20.251:5000/';
+ axios.defaults.baseURL = 'http://localhost:5000/';
+ // axios.defaults.baseURL = 'http://192.168.20.251:5000/';
}
else if (process.env.NODE_ENV == 'debug') {
axios.defaults.baseURL = 'http://127.0.0.1:9991/';
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/MOM/MOMErrorMessage.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/MOM/MOMErrorMessage.cs
index cebbb4b..44045d8 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/MOM/MOMErrorMessage.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/MOM/MOMErrorMessage.cs
@@ -41,7 +41,7 @@
/// 澶� 娉�:寮傚父娑堟伅
/// 榛樿鍊�:
///</summary>
- [SugarColumn(ColumnName = "API鍚嶇О")]
+ [SugarColumn(ColumnName = "APIName")]
public string? APIName { get; set; }
/// <summary>
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Error/MoMErrorMsg.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Error/MoMErrorMsg.cs
index 077bc09..3df4e32 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Error/MoMErrorMsg.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Error/MoMErrorMsg.cs
@@ -1,4 +1,5 @@
-锘縰sing Masuit.Tools;
+锘縰sing LogLibrary.Log;
+using Masuit.Tools;
using SqlSugar;
using WIDESEA_Core;
using WIDESEA_Core.Helper;
@@ -42,6 +43,7 @@
var isResult = Db.Insertable(result).ExecuteCommand() > 0;
content.OK(data: result);
}
+
}
catch (Exception ex)
{
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 1b10faa..514860b 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
@@ -988,26 +988,26 @@
WebResponseContent content = new WebResponseContent();
try
{
- string requestKey = JsonConvert.SerializeObject(json);
- // 妫�鏌ヨ姹傛鏁板拰鏃堕棿闄愬埗
- if (requestTracker.TryGetValue(requestKey, out var requestInfo))
- {
- if (requestInfo.Count >= 9 && DateTime.Now < requestInfo.LastRequestTime.AddMinutes(5))
- {
- // 濡傛灉璇锋眰娆℃暟瓒呰繃闄愬埗涓旀湭瓒呰繃10鍒嗛挓锛屾姏鍑哄紓甯�
- throw new InvalidOperationException("璇锋眰娆℃暟宸茶揪鍒伴檺鍒讹紝璇风◢鍚庡啀璇曘��");
- }
- }
+ //string requestKey = JsonConvert.SerializeObject(json);
+ //// 妫�鏌ヨ姹傛鏁板拰鏃堕棿闄愬埗
+ //if (requestTracker.TryGetValue(requestKey, out var requestInfo))
+ //{
+ // if (requestInfo.Count >= 9 && DateTime.Now < requestInfo.LastRequestTime.AddMinutes(5))
+ // {
+ // // 濡傛灉璇锋眰娆℃暟瓒呰繃闄愬埗涓旀湭瓒呰繃10鍒嗛挓锛屾姏鍑哄紓甯�
+ // throw new InvalidOperationException("璇锋眰娆℃暟宸茶揪鍒伴檺鍒讹紝璇风◢鍚庡啀璇曘��");
+ // }
+ //}
- // 鏇存柊璇锋眰璺熻釜淇℃伅
- if (requestTracker.ContainsKey(requestKey))
- {
- requestTracker[requestKey] = (requestInfo.Count + 1, DateTime.Now);
- }
- else
- {
- requestTracker[requestKey] = (1, DateTime.Now);
- }
+ //// 鏇存柊璇锋眰璺熻釜淇℃伅
+ //if (requestTracker.ContainsKey(requestKey))
+ //{
+ // requestTracker[requestKey] = (requestInfo.Count + 1, DateTime.Now);
+ //}
+ //else
+ //{
+ // requestTracker[requestKey] = (1, DateTime.Now);
+ //}
//LogFactory.GetLog("甯告俯3鍑哄簱鑷冲寘瑁�").Info(true, $"甯告俯3鍑哄簱鑷冲寘瑁呬紶鍏ュ弬鏁帮細" + JsonConvert.SerializeObject(json, Formatting.Indented));
Dt_StationManager station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == json.Position && x.stationType == 12 && x.stationArea == "Call");
--
Gitblit v1.9.3