huangxiaoqiang
2025-03-04 64b22157cf84fcb6d3cecee4d864f1af9e298f4c
添加OCV管理页面
已修改8个文件
已添加3个文件
297 ■■■■ 文件已修改
Code Management/WCS/WIDESEAWCS_Client/src/router/viewGird.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue 169 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IProcessService/WIDESEAWCS_IProcessService.csproj 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessService/WIDESEAWCS_ProcessService.csproj 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server.sln 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WMS/WIDESEA_WMSClient/src/api/http.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/MOM/MOMErrorMessage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Error/MoMErrorMsg.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
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>
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>
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>
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>
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}
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" />
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/';
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>
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MOM/Error/MoMErrorMsg.cs
@@ -1,4 +1,5 @@
using Masuit.Tools;
using 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)
            {
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");