ÏîÄ¿´úÂë/DB/WCS2025-11-12.bakBinary files differ
ÏîÄ¿´úÂë/DB/WMS2025-11-12.bakBinary files differ
ÏîÄ¿´úÂë/DB/wcs.sql
ÎļþÒÑɾ³ý ÏîÄ¿´úÂë/DB/wms.sql
ÎļþÒÑɾ³ý ÏîÄ¿´úÂë/DB/²âÊÔ.txt
ÎļþÒÑɾ³ý ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.binBinary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v9.binBinary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.binBinary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v9.binBinary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.strings.v9.binBinary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/17.14.1368.60722/CodeChunks.dbBinary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/17.14.1368.60722/SemanticSymbols.dbBinary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2Binary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2Binary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suoBinary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs
@@ -327,7 +327,7 @@ /// </summary> /// <param name="TargetAddress"></param> /// <returns></returns> WebResponseContent GetAGVTaskdistribution(string TargetAddress); WebResponseContent GetAGVTaskdistribution(string TargetAddress,string Number); /// <summary> /// åå ¥è¾é线åé¦ä¿¡æ¯ ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs
@@ -86,5 +86,12 @@ [HttpPost, Route("UpWheelsFlow"), AllowAnonymous] public WebResponseContent UpWheelsFlow([FromBody] SaveModel saveModel) { return Service.UpWheelsFlow(saveModel); } } } ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/È«¾ÖÒì³£´íÎóÈÕÖ¾_1743004371.log
@@ -38,3 +38,23 @@ at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeInnerFilterAsync() --- End of stack trace from previous location --- at Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.<InvokeNextExceptionFilterAsync>g__Awaited|26_0(ResourceInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted) -------------------------------- 2025/10/9 10:28:34| Object reference not set to an instance of an object. ãèªå®ä¹é误ãï¼Object reference not set to an instance of an object. ãå¼å¸¸ç±»åãï¼NullReferenceException ãå¼å¸¸ä¿¡æ¯ãï¼Object reference not set to an instance of an object. ãå æ è°ç¨ãï¼ at WIDESEAWCS_TaskInfoService.TaskService.GetPlcState(String TargetAddress) in F:\ZHOCHELUNDUIYA\LunDuiYa\项ç®ä»£ç \WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\TaskService.cs:line 1014 at Castle.Proxies.Invocations.ITaskService_GetPlcState.InvokeMethodOnTarget() at Castle.DynamicProxy.AbstractInvocation.Proceed() at Castle.Proxies.IService`1Proxy_3.GetPlcState(String TargetAddress) at WIDESEAWCS_WCSServer.Controllers.Task.TaskController.GetPlcState(String TargetAddress) in F:\ZHOCHELUNDUIYA\LunDuiYa\项ç®ä»£ç \WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\Controllers\Task\TaskController.cs:line 78 at lambda_method795(Closure , Object , Object[] ) at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments) at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker) at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted) at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.Rethrow(ActionExecutedContextSealed context) at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.Next(State& next, Scope& scope, Object& state, Boolean& isCompleted) at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeInnerFilterAsync() --- End of stack trace from previous location --- at Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.<InvokeNextExceptionFilterAsync>g__Awaited|26_0(ResourceInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted) ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/WIDESEAWCS_Server.csproj.EntityFrameworkCore.targets
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Target Name="GetEFProjectMetadata"> <MSBuild Condition=" '$(TargetFramework)' == '' " Projects="$(MSBuildProjectFile)" Targets="GetEFProjectMetadata" Properties="TargetFramework=$(TargetFrameworks.Split(';')[0]);EFProjectMetadataFile=$(EFProjectMetadataFile)" /> <ItemGroup Condition=" '$(TargetFramework)' != '' "> <EFProjectMetadata Include="AssemblyName: $(AssemblyName)" /> <EFProjectMetadata Include="Language: $(Language)" /> <EFProjectMetadata Include="OutputPath: $(OutputPath)" /> <EFProjectMetadata Include="Platform: $(Platform)" /> <EFProjectMetadata Include="PlatformTarget: $(PlatformTarget)" /> <EFProjectMetadata Include="ProjectAssetsFile: $(ProjectAssetsFile)" /> <EFProjectMetadata Include="ProjectDir: $(ProjectDir)" /> <EFProjectMetadata Include="RootNamespace: $(RootNamespace)" /> <EFProjectMetadata Include="RuntimeFrameworkVersion: $(RuntimeFrameworkVersion)" /> <EFProjectMetadata Include="TargetFileName: $(TargetFileName)" /> <EFProjectMetadata Include="TargetFrameworkMoniker: $(TargetFrameworkMoniker)" /> <EFProjectMetadata Include="Nullable: $(Nullable)" /> <EFProjectMetadata Include="TargetFramework: $(TargetFramework)" /> <EFProjectMetadata Include="TargetPlatformIdentifier: $(TargetPlatformIdentifier)" /> </ItemGroup> <WriteLinesToFile Condition=" '$(TargetFramework)' != '' " File="$(EFProjectMetadataFile)" Lines="@(EFProjectMetadata)" /> </Target> </Project> ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -939,7 +939,7 @@ //读åç³è¯·ï¼ç»agvä¸åä»»å¡ public WebResponseContent GetAGVTaskdistribution(string TargetAddress) public WebResponseContent GetAGVTaskdistribution(string TargetAddress,string Number) { WebResponseContent content = new WebResponseContent(); @@ -952,16 +952,41 @@ { throw new InvalidOperationException("WMS IP æªé ç½®"); } var wmsIpAddress = wmsBase + completeTask; var taskDto = new RequestTaskDto() IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "1000"); CommonConveyorLine conveyorLine = (CommonConveyorLine)device; DeviceProDTO? deviceProDTOt = conveyorLine.DeviceProDTOs.Find(x => x.DeviceChildCode == TargetAddress && x.DeviceProParamName == "ConveyorLineSingal"); if (conveyorLine.Communicator.Read<short>(deviceProDTOt.DeviceProAddress) == 1) { RequestType = "999", Position = TargetAddress, }; var result = HttpHelper.PostAsync(wmsIpAddress, taskDto.ToJsonString()).Result; content = JsonConvert.DeserializeObject<WebResponseContent>(result); var wmsIpAddress = wmsBase + completeTask; var taskDto = new RequestTaskDto() { RequestType = "999", Position = TargetAddress, }; var result = HttpHelper.PostAsync(wmsIpAddress, taskDto.ToJsonString()).Result; content = JsonConvert.DeserializeObject<WebResponseContent>(result); if (content.Status) { List<Dt_Task> tasks = BaseDal.QueryData(x => x.axle_czh == Number); if (tasks.Count > 0) { foreach (var task in tasks) { task.Towhereabouts = TargetAddress; } BaseDal.UpdateData(tasks); } } } else { content.Error(); } return content; } catch (Exception ex) ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -459,7 +459,7 @@ if (Number != "" && Number != null) { //è°åwmsæ¥å£ç³è¯·agvä»»å¡ WebResponseContent content = _taskService.GetAGVTaskdistribution(stationInfo.stationLocation); WebResponseContent content = _taskService.GetAGVTaskdistribution(stationInfo.stationLocation, Number); } } ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_SelectionStandards.vue
@@ -72,13 +72,11 @@ const searchFormOptions = ref([ [ { "title": "éç¨è½¦å", "field": "carType", type: "text" }, //{ "title": "è´§ä½ç¶æ", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] }, { "title": "卿屿§", "field": "mttype", "type": "select", dataKey: "dongtuoshux", data: [] }, { "title": "æ°/æ§", "field": "neworold", type: "select", dataKey: "NewOld", data: [] }, { "title": "ç级", "field": "gkdj", type: "select", dataKey: "Level", data: [] }, ], [ //{ "title": "æ¯å¦ç¦ç¨", "field": "enalbeStatus", "type": "select", dataKey: "EnalbeStatus", data: [] } // { "title": "å", "field": "column", "type": "text" }, // { "title": "å±", "field": "layer", type: "text" }, { "title": "卿屿§", "field": "mttype", "type": "select", dataKey: "dongtuoshux", data: [] }, ] ]); const columns = ref([{ field: 'id', title: 'ID', type: 'int', width: 110, hidden: true, readonly: true, require: true, align: 'left' }, ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/check/Dt_CheckResult.vue
@@ -30,10 +30,14 @@ ]); const searchFormFields = ref({ cltm:"", result:"", }); const searchFormOptions = ref([ [ { "title": "车轮æ¡ç ", "field": "cltm", type: "like" }, { "title": "æ¯å¦åæ ¼", "field": "result", type: "select", dataKey: "IsQuan", data: [] }, ], ]); const columns = ref([ { field: 'iD', title: '主é®ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' }, ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_CZInfo_mes.vue
@@ -45,20 +45,29 @@ ]); const searchFormFields = ref({ CZTM: "" CZTM: "", temporaryState:"" }); const searchFormOptions = ref([ [ { "title": "车轮å·", "field": "CZTM", type: "text" }, ], { "title": "车轴æ¡ç ", "field": "CZTM", type: "text" }, ],[ { "title": "æ¯å¦æå", "field": "temporaryState", type: "select", dataKey: "", data: [{key:"0",value:"å¦"},{key:"1",value:"æ¯"}] }, ] ]); const columns = ref([ { field: 'id', title: '主é®ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' }, { field: 'cztm', title: '车轴æ¡ç ', type: 'string', width: 110, align: 'left' }, { field: 'czh', title: '车轴å·', type: 'string', width: 110, align: 'left' }, { field: 'ldtm', title: '轮对æ¡ç ', type: 'string', width: 110, align: 'left' }, { field: 'leftCcltm', title: '左轮(ç)æ¡ç ', type: 'string', width: 110, align: 'left' }, { field: 'rightcltm', title: 'å³è½®(ç)æ¡ç ', type: 'string', width: 110, align: 'left' }, { field: 'middlecltm', title: 'ä¸è½®(ç)æ¡ç ', type: 'string', width: 110, align: 'left' }, { field: 'currentStatue', title: 'ç¶æ', type: 'string', width: 75, align: 'left',bind: { key: "InboundState", data: [] } }, { field: 'temporaryState', title: 'æ¯å¦æå', type: 'string', width: 75, align: 'left',bind: { key: "", data: [{key:"0",value:"å¦"},{key:"1",value:"æ¯"}] } }, { field: 'chexing', title: '车å', type: 'string', width: 100, align: 'left' }, { field: 'czxh', title: '车轴åå·', type: 'int', width: 110, align: 'left' }, { field: 'mttype', title: 'å¨/æ', type: 'string', width: 60, align: 'left' }, ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_CZInfo_mes_hty.vue
@@ -49,6 +49,7 @@ mttype:"", czxh:"", createDate:"", temporaryState:"" }); const searchFormOptions = ref([ [ @@ -64,14 +65,20 @@ ], [ { "title": "å建æ¶é´", "field": "createDate", type: "datetime" }, { "title": "æ¯å¦æå", "field": "temporaryState", type: "select", dataKey: "", data: [{key:"0",value:"å¦"},{key:"1",value:"æ¯"}] }, ] ]); const columns = ref([ { field: 'id', title: '主é®ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' }, { field: 'cztm', title: '车轴æ¡ç ', type: 'string', width: 110, align: 'left' }, { field: 'czh', title: '车轴å·', type: 'string', width: 110, align: 'left' }, { field: 'leftCLTM', title: '左轮(ç)æ¡ç ', type: 'string', width: 110, align: 'left' }, { field: 'rightCLTM', title: 'å³è½®(ç)æ¡ç ', type: 'string', width: 110, align: 'left' }, { field: 'middleCLTM', title: 'ä¸è½®(ç)æ¡ç ', type: 'string', width: 110, align: 'left' }, { field: 'ldtm', title: '轮对æ¡ç ', type: 'string', width: 110, align: 'left' }, { field: 'currentStatue', title: 'ç¶æ', type: 'string', width: 75, align: 'left',bind: { key: "InboundState", data: [] } }, { field: 'temporaryState', title: 'æ¯å¦æå', type: 'string', width: 75, align: 'left',bind: { key: "", data: [{key:"0",value:"å¦"},{key:"1",value:"æ¯"}] } }, { field: 'chexing', title: '车å', type: 'string', width: 100, align: 'left' }, { field: 'czxh', title: '车轴åå·', type: 'int', width: 110, align: 'left' }, { field: 'mttype', title: 'å¨/æ', type: 'string', width: 60, align: 'left' }, ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/yarn.lock
@@ -38,7 +38,7 @@ resolved "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.24.1.tgz" integrity sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA== "@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.11.0", "@babel/core@^7.23.3": "@babel/core@^7.23.3": version "7.24.3" resolved "https://registry.npmmirror.com/@babel/core/-/core-7.24.3.tgz" integrity sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ== @@ -327,6 +327,111 @@ resolved "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz" integrity sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg== "@esbuild/android-arm64@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622" integrity sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ== "@esbuild/android-arm@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz#fedb265bc3a589c84cc11f810804f234947c3682" integrity sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw== "@esbuild/android-x64@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz#35cf419c4cfc8babe8893d296cd990e9e9f756f2" integrity sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg== "@esbuild/darwin-arm64@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1" integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA== "@esbuild/darwin-x64@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz#d70d5790d8bf475556b67d0f8b7c5bdff053d85d" integrity sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ== "@esbuild/freebsd-arm64@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz#98755cd12707f93f210e2494d6a4b51b96977f54" integrity sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw== "@esbuild/freebsd-x64@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz#c1eb2bff03915f87c29cece4c1a7fa1f423b066e" integrity sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ== "@esbuild/linux-arm64@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz#bad4238bd8f4fc25b5a021280c770ab5fc3a02a0" integrity sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA== "@esbuild/linux-arm@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz#3e617c61f33508a27150ee417543c8ab5acc73b0" integrity sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg== "@esbuild/linux-ia32@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7" integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA== "@esbuild/linux-loong64@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d" integrity sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg== "@esbuild/linux-mips64el@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz#eeff3a937de9c2310de30622a957ad1bd9183231" integrity sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ== "@esbuild/linux-ppc64@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz#2f7156bde20b01527993e6881435ad79ba9599fb" integrity sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA== "@esbuild/linux-riscv64@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz#6628389f210123d8b4743045af8caa7d4ddfc7a6" integrity sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A== "@esbuild/linux-s390x@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz#255e81fb289b101026131858ab99fba63dcf0071" integrity sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ== "@esbuild/linux-x64@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz#c7690b3417af318a9b6f96df3031a8865176d338" integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w== "@esbuild/netbsd-x64@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz#30e8cd8a3dded63975e2df2438ca109601ebe0d1" integrity sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A== "@esbuild/openbsd-x64@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz#7812af31b205055874c8082ea9cf9ab0da6217ae" integrity sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg== "@esbuild/sunos-x64@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz#d5c275c3b4e73c9b0ecd38d1ca62c020f887ab9d" integrity sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ== "@esbuild/win32-arm64@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz#73bc7f5a9f8a77805f357fab97f290d0e4820ac9" integrity sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg== "@esbuild/win32-ia32@0.18.20": version "0.18.20" resolved "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz#ec93cbf0ef1085cc12e71e0d661d20569ff42102" integrity sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g== "@esbuild/win32-x64@0.18.20": version "0.18.20" resolved "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz" @@ -473,7 +578,7 @@ "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" "@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5": "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" resolved "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== @@ -501,11 +606,6 @@ resolved "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz" integrity sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ== "@rollup/rollup-win32-x64-msvc@4.14.0": version "4.14.0" resolved "https://registry.npmmirror.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.0.tgz" integrity sha512-aGg7iToJjdklmxlUlJh/PaPNa4PmqHfyRMLunbL3eaMO0gp656+q1zOKkpJ/CVe9CryJv6tAN1HDoR8cNGzkag== "@rushstack/eslint-patch@^1.2.0": version "1.10.1" resolved "https://registry.npmmirror.com/@rushstack/eslint-patch/-/eslint-patch-1.10.1.tgz" @@ -528,7 +628,7 @@ resolved "https://registry.npmmirror.com/@types/chai/-/chai-4.3.14.tgz" integrity sha512-Wj71sXE4Q4AkGdG9Tvq1u/fquNz9EdG4LIJMwVVII7ashjD/8cf8fyIfJAjRr6YcsXnSE8cOGQPq1gqeR8z+3w== "@types/estree@*", "@types/estree@1.0.5": "@types/estree@*": version "1.0.5" resolved "https://registry.npmmirror.com/@types/estree/-/estree-1.0.5.tgz" integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== @@ -547,7 +647,7 @@ resolved "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.15.tgz" integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== "@types/lodash-es@*", "@types/lodash-es@^4.17.6": "@types/lodash-es@^4.17.6": version "4.17.12" resolved "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz" integrity sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ== @@ -559,7 +659,7 @@ resolved "https://registry.npmmirror.com/@types/lodash/-/lodash-4.17.0.tgz" integrity sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA== "@types/node@*", "@types/node@^18.14.2", "@types/node@>= 14": "@types/node@*", "@types/node@^18.14.2": version "18.19.29" resolved "https://registry.npmmirror.com/@types/node/-/node-18.19.29.tgz" integrity sha512-5pAX7ggTmWZdhUrhRWLPf+5oM7F80bcKVCBbr0zwEkTNzTJL2CWQjznpFgHYy6GrzkYi2Yjy7DHKoynFxqPV8g== @@ -597,7 +697,7 @@ semver "^7.3.7" tsutils "^3.21.0" "@typescript-eslint/parser@^5.0.0", "@typescript-eslint/parser@^5.59.1": "@typescript-eslint/parser@^5.59.1": version "5.62.0" resolved "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.62.0.tgz" integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA== @@ -719,14 +819,14 @@ loupe "^2.3.6" pretty-format "^27.5.1" "@volar/language-core@~1.11.1", "@volar/language-core@1.11.1": "@volar/language-core@1.11.1", "@volar/language-core@~1.11.1": version "1.11.1" resolved "https://registry.npmmirror.com/@volar/language-core/-/language-core-1.11.1.tgz" integrity sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw== dependencies: "@volar/source-map" "1.11.1" "@volar/source-map@~1.11.1", "@volar/source-map@1.11.1": "@volar/source-map@1.11.1", "@volar/source-map@~1.11.1": version "1.11.1" resolved "https://registry.npmmirror.com/@volar/source-map/-/source-map-1.11.1.tgz" integrity sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg== @@ -785,7 +885,7 @@ estree-walker "^2.0.2" source-map-js "^1.0.2" "@vue/compiler-dom@^3.3.0", "@vue/compiler-dom@3.4.21": "@vue/compiler-dom@3.4.21", "@vue/compiler-dom@^3.3.0": version "3.4.21" resolved "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.21.tgz" integrity sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA== @@ -793,7 +893,7 @@ "@vue/compiler-core" "3.4.21" "@vue/shared" "3.4.21" "@vue/compiler-sfc@^3.4.15", "@vue/compiler-sfc@3.4.21": "@vue/compiler-sfc@3.4.21", "@vue/compiler-sfc@^3.4.15": version "3.4.21" resolved "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.4.21.tgz" integrity sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ== @@ -885,7 +985,7 @@ "@vue/compiler-ssr" "3.4.21" "@vue/shared" "3.4.21" "@vue/shared@^3.3.0", "@vue/shared@3.4.21": "@vue/shared@3.4.21", "@vue/shared@^3.3.0": version "3.4.21" resolved "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.21.tgz" integrity sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g== @@ -960,7 +1060,7 @@ resolved "https://registry.npmmirror.com/acorn-walk/-/acorn-walk-8.3.2.tgz" integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A== "acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8.1.0, acorn@^8.10.0, acorn@^8.11.3, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0: acorn@^8.1.0, acorn@^8.10.0, acorn@^8.11.3, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0: version "8.11.3" resolved "https://registry.npmmirror.com/acorn/-/acorn-8.11.3.tgz" integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== @@ -1042,14 +1142,7 @@ dependencies: color-convert "^1.9.0" ansi-styles@^4.0.0: version "4.3.0" resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== dependencies: color-convert "^2.0.1" ansi-styles@^4.1.0: ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== @@ -1061,12 +1154,7 @@ resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-5.2.0.tgz" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== ansi-styles@^6.0.0: version "6.2.1" resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-6.2.1.tgz" integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== ansi-styles@^6.1.0: ansi-styles@^6.0.0, ansi-styles@^6.1.0: version "6.2.1" resolved "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-6.2.1.tgz" integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== @@ -1176,7 +1264,7 @@ dependencies: fill-range "^7.0.1" browserslist@^4.22.2, "browserslist@>= 4.21.0": browserslist@^4.22.2: version "4.23.0" resolved "https://registry.npmmirror.com/browserslist/-/browserslist-4.23.0.tgz" integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ== @@ -1290,15 +1378,15 @@ dependencies: color-name "~1.1.4" color-name@~1.1.4: version "1.1.4" resolved "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== color-name@1.1.3: version "1.1.3" resolved "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz" integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== color-name@~1.1.4: version "1.1.4" resolved "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== combined-stream@^1.0.8: version "1.0.8" @@ -1455,19 +1543,19 @@ resolved "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz" integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg== debug@4, debug@^4.1.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" debug@^2.6.9: version "2.6.9" resolved "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" debug@^4.1.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@4: version "4.3.4" resolved "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" decimal.js@^10.4.3: version "10.4.3" @@ -1817,7 +1905,7 @@ dependencies: prettier-linter-helpers "^1.0.0" eslint-plugin-vue@^9.0.0, eslint-plugin-vue@^9.9.0: eslint-plugin-vue@^9.9.0: version "9.24.0" resolved "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-9.24.0.tgz" integrity sha512-9SkJMvF8NGMT9aQCwFc5rj8Wo1XWSMSHk36i7ZwdI614BU7sIOR28ZjuFPKp8YGymZN12BSEbiSwa7qikp+PBw== @@ -1831,7 +1919,7 @@ vue-eslint-parser "^9.4.2" xml-name-validator "^4.0.0" eslint-scope@^5.1.1, eslint-scope@5.1.1: eslint-scope@5.1.1, eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz" integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== @@ -1839,15 +1927,7 @@ esrecurse "^4.3.0" estraverse "^4.1.1" eslint-scope@^7.1.1: version "7.2.2" resolved "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-7.2.2.tgz" integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== dependencies: esrecurse "^4.3.0" estraverse "^5.2.0" eslint-scope@^7.2.2: eslint-scope@^7.1.1, eslint-scope@^7.2.2: version "7.2.2" resolved "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-7.2.2.tgz" integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== @@ -1860,22 +1940,12 @@ resolved "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== eslint-visitor-keys@^3.3.0: eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3: version "3.4.3" resolved "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== eslint-visitor-keys@^3.4.1: version "3.4.3" resolved "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== eslint-visitor-keys@^3.4.3: version "3.4.3" resolved "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== eslint@*, "eslint@^6.0.0 || ^7.0.0 || ^8.0.0", "eslint@^6.0.0 || ^7.0.0 || >=8.0.0", "eslint@^6.2.0 || ^7.0.0 || ^8.0.0", "eslint@^7.5.0 || ^8.0.0", eslint@^8.36.0, "eslint@>= 7.28.0", eslint@>=6.0.0, eslint@>=7.0.0, eslint@>=7.28.0: eslint@^8.36.0: version "8.57.0" resolved "https://registry.npmmirror.com/eslint/-/eslint-8.57.0.tgz" integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ== @@ -1952,12 +2022,7 @@ resolved "https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== estraverse@^5.1.0: version "5.3.0" resolved "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz" integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== estraverse@^5.2.0: estraverse@^5.1.0, estraverse@^5.2.0: version "5.3.0" resolved "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz" integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== @@ -2119,6 +2184,11 @@ resolved "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== fsevents@~2.3.2: version "2.3.3" resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== function-bind@^1.1.2: version "1.1.2" resolved "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz" @@ -2204,19 +2274,7 @@ minipass "^7.0.4" path-scurry "^1.10.2" glob@^7.1.3: version "7.2.3" resolved "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" minimatch "^3.1.1" once "^1.3.0" path-is-absolute "^1.0.0" glob@^7.1.6: glob@^7.1.3, glob@^7.1.6: version "7.2.3" resolved "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -2243,14 +2301,7 @@ resolved "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^13.19.0: version "13.24.0" resolved "https://registry.npmmirror.com/globals/-/globals-13.24.0.tgz" integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ== dependencies: type-fest "^0.20.2" globals@^13.24.0: globals@^13.19.0, globals@^13.24.0: version "13.24.0" resolved "https://registry.npmmirror.com/globals/-/globals-13.24.0.tgz" integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ== @@ -2385,19 +2436,19 @@ dependencies: ms "^2.0.0" iconv-lite@0.6.3, iconv-lite@^0.6.3: version "0.6.3" resolved "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== dependencies: safer-buffer ">= 2.1.2 < 3.0.0" iconv-lite@^0.4.15: version "0.4.24" resolved "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== dependencies: safer-buffer ">= 2.1.2 < 3" iconv-lite@^0.6.3, iconv-lite@0.6.3: version "0.6.3" resolved "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== dependencies: safer-buffer ">= 2.1.2 < 3.0.0" ignore@^5.2.0: version "5.3.1" @@ -2430,7 +2481,7 @@ once "^1.3.0" wrappy "1" inherits@^2.0.1, inherits@~2.0.3, inherits@2: inherits@2, inherits@^2.0.1, inherits@~2.0.3: version "2.0.4" resolved "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -2705,7 +2756,7 @@ dependencies: argparse "^2.0.1" jsdom@*, jsdom@^21.1.0: jsdom@^21.1.0: version "21.1.2" resolved "https://registry.npmmirror.com/jsdom/-/jsdom-21.1.2.tgz" integrity sha512-sCpFmK2jv+1sjff4u7fzft+pUh2KSUbUrEHYHyfSIbGTIcmnjyp83qg6qLwdJ/I3LpTXx33ACxeRL7Lsyc6lGQ== @@ -2784,7 +2835,7 @@ dependencies: json-buffer "3.0.1" less@*, less@^4.1.3: less@^4.1.3: version "4.2.0" resolved "https://registry.npmmirror.com/less/-/less-4.2.0.tgz" integrity sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA== @@ -2831,7 +2882,7 @@ dependencies: p-locate "^5.0.0" lodash-es@*, lodash-es@^4.17.21: lodash-es@^4.17.21: version "4.17.21" resolved "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz" integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== @@ -2846,7 +2897,7 @@ resolved "https://registry.npmmirror.com/lodash.merge/-/lodash.merge-4.6.2.tgz" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== lodash@*, lodash@^4.17.21: lodash@^4.17.21: version "4.17.21" resolved "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -2949,6 +3000,13 @@ resolved "https://registry.npmmirror.com/mime/-/mime-2.6.0.tgz" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== minimatch@9.0.1: version "9.0.1" resolved "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.1.tgz" integrity sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w== dependencies: brace-expansion "^2.0.1" minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz" @@ -2963,24 +3021,10 @@ dependencies: brace-expansion "^2.0.1" minimatch@^9.0.1: minimatch@^9.0.1, minimatch@^9.0.3: version "9.0.4" resolved "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.4.tgz" integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw== dependencies: brace-expansion "^2.0.1" minimatch@^9.0.3: version "9.0.4" resolved "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.4.tgz" integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw== dependencies: brace-expansion "^2.0.1" minimatch@9.0.1: version "9.0.1" resolved "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.1.tgz" integrity sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w== dependencies: brace-expansion "^2.0.1" @@ -3016,15 +3060,15 @@ pkg-types "^1.0.3" ufo "^1.3.2" ms@^2.0.0, ms@2.1.2: version "2.1.2" resolved "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== ms@2.0.0: version "2.0.0" resolved "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz" integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== ms@2.1.2, ms@^2.0.0: version "2.1.2" resolved "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== muggle-string@^0.3.1: version "0.3.1" @@ -3393,7 +3437,7 @@ dependencies: fast-diff "^1.1.2" prettier@^2.8.4, "prettier@>= 2.0.0", prettier@>=2.0.0: prettier@^2.8.4: version "2.8.8" resolved "https://registry.npmmirror.com/prettier/-/prettier-2.8.8.tgz" integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== @@ -3582,30 +3626,6 @@ optionalDependencies: fsevents "~2.3.2" rollup@>=1.12.0, "rollup@2.x || 3.x || 4.x": version "4.14.0" resolved "https://registry.npmmirror.com/rollup/-/rollup-4.14.0.tgz" integrity sha512-Qe7w62TyawbDzB4yt32R0+AbIo6m1/sqO7UPzFS8Z/ksL5mrfhA0v4CavfdmFav3D+ub4QeAgsGEe84DoWe/nQ== dependencies: "@types/estree" "1.0.5" optionalDependencies: "@rollup/rollup-android-arm-eabi" "4.14.0" "@rollup/rollup-android-arm64" "4.14.0" "@rollup/rollup-darwin-arm64" "4.14.0" "@rollup/rollup-darwin-x64" "4.14.0" "@rollup/rollup-linux-arm-gnueabihf" "4.14.0" "@rollup/rollup-linux-arm64-gnu" "4.14.0" "@rollup/rollup-linux-arm64-musl" "4.14.0" "@rollup/rollup-linux-powerpc64le-gnu" "4.14.0" "@rollup/rollup-linux-riscv64-gnu" "4.14.0" "@rollup/rollup-linux-s390x-gnu" "4.14.0" "@rollup/rollup-linux-x64-gnu" "4.14.0" "@rollup/rollup-linux-x64-musl" "4.14.0" "@rollup/rollup-win32-arm64-msvc" "4.14.0" "@rollup/rollup-win32-ia32-msvc" "4.14.0" "@rollup/rollup-win32-x64-msvc" "4.14.0" fsevents "~2.3.2" rrweb-cssom@^0.6.0: version "0.6.0" resolved "https://registry.npmmirror.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz" @@ -3647,7 +3667,7 @@ resolved "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== sax@^1.2.4, sax@>=0.6.0: sax@>=0.6.0, sax@^1.2.4: version "1.3.0" resolved "https://registry.npmmirror.com/sax/-/sax-1.3.0.tgz" integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA== @@ -3671,17 +3691,7 @@ dependencies: get-ready "~1.0.0" semver@^5.0.1: version "5.7.2" resolved "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== semver@^5.5.0: version "5.7.2" resolved "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== semver@^5.6.0: "semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.5.0, semver@^5.6.0: version "5.7.2" resolved "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== @@ -3691,45 +3701,12 @@ resolved "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== semver@^7.3.6: semver@^7.3.6, semver@^7.3.7, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0: version "7.6.0" resolved "https://registry.npmmirror.com/semver/-/semver-7.6.0.tgz" integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== dependencies: lru-cache "^6.0.0" semver@^7.3.7: version "7.6.0" resolved "https://registry.npmmirror.com/semver/-/semver-7.6.0.tgz" integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== dependencies: lru-cache "^6.0.0" semver@^7.5.3: version "7.6.0" resolved "https://registry.npmmirror.com/semver/-/semver-7.6.0.tgz" integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== dependencies: lru-cache "^6.0.0" semver@^7.5.4: version "7.6.0" resolved "https://registry.npmmirror.com/semver/-/semver-7.6.0.tgz" integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== dependencies: lru-cache "^6.0.0" semver@^7.6.0: version "7.6.0" resolved "https://registry.npmmirror.com/semver/-/semver-7.6.0.tgz" integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== dependencies: lru-cache "^6.0.0" "semver@2 || 3 || 4 || 5": version "5.7.2" resolved "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== set-cookie-parser@^2.4.8: version "2.6.0" @@ -3820,11 +3797,6 @@ ansi-styles "^6.0.0" is-fullwidth-code-point "^4.0.0" sortablejs@^1.14.0: version "1.15.2" resolved "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.2.tgz" integrity sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA== source-map-js@^1.0.2, source-map-js@^1.2.0: version "1.2.0" resolved "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.0.tgz" @@ -3835,12 +3807,7 @@ resolved "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== source-map@^0.7.3: version "0.7.4" resolved "https://registry.npmmirror.com/source-map/-/source-map-0.7.4.tgz" integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== source-map@^0.7.4: source-map@^0.7.3, source-map@^0.7.4: version "0.7.4" resolved "https://registry.npmmirror.com/source-map/-/source-map-0.7.4.tgz" integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== @@ -3907,13 +3874,6 @@ resolved "https://registry.npmmirror.com/stream-wormhole/-/stream-wormhole-1.1.0.tgz" integrity sha512-gHFfL3px0Kctd6Po0M8TzEvt3De/xu6cnRrjlfYNhwbhLPLwigI2t1nc6jrzNuaYg5C4YF78PPFuQPzRiqn9ew== string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz" integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== dependencies: safe-buffer "~5.1.0" "string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz" @@ -3923,16 +3883,7 @@ is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" string-width@^4.1.0, string-width@^4.2.0: version "4.2.3" resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" string-width@^4.2.3: string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -3988,6 +3939,13 @@ define-properties "^1.2.1" es-object-atoms "^1.0.0" string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz" integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== dependencies: safe-buffer "~5.1.0" "strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz" @@ -4026,7 +3984,7 @@ dependencies: acorn "^8.10.0" stylus@*, stylus@^0.59.0: stylus@^0.59.0: version "0.59.0" resolved "https://registry.npmmirror.com/stylus/-/stylus-0.59.0.tgz" integrity sha512-lQ9w/XIOH5ZHVNuNbWW8D822r+/wBSO/d6XvtyHLF7LW4KaCIDeVbvn5DF8fGCJAUCwVhVi/h6J0NUcnylUEjg== @@ -4144,15 +4102,15 @@ resolved "https://registry.npmmirror.com/tr46/-/tr46-0.0.3.tgz" integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== tslib@2.3.0, tslib@^2.1.0, tslib@^2.3.0: version "2.3.0" resolved "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz" integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== tslib@^1.8.1: version "1.14.1" resolved "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tslib@^2.1.0, tslib@^2.3.0, tslib@2.3.0: version "2.3.0" resolved "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz" integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== tsutils@^3.21.0: version "3.21.0" @@ -4222,7 +4180,7 @@ is-typed-array "^1.1.13" possible-typed-array-names "^1.0.0" typescript@*, "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta", typescript@>=4.4.4, typescript@~4.8.4: typescript@~4.8.4: version "4.8.4" resolved "https://registry.npmmirror.com/typescript/-/typescript-4.8.4.tgz" integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== @@ -4368,7 +4326,7 @@ "@babel/traverse" "^7.22.5" "@babel/types" "^7.22.5" "vite@^3.0.0 || ^4.0.0", "vite@^4.0.0 || ^5.0.0", vite@^4.2.0: "vite@^3.0.0 || ^4.0.0", vite@^4.2.0: version "4.5.3" resolved "https://registry.npmmirror.com/vite/-/vite-4.5.3.tgz" integrity sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg== @@ -4414,12 +4372,7 @@ resolved "https://registry.npmmirror.com/vue-component-type-helpers/-/vue-component-type-helpers-2.0.7.tgz" integrity sha512-7e12Evdll7JcTIocojgnCgwocX4WzIYStGClBQ+QuWPinZo/vQolv2EMq4a3lg16TKfwWafLimG77bxb56UauA== vue-demi@*: version "0.14.7" resolved "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.7.tgz" integrity sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA== vue-demi@>=0.14.5: vue-demi@*, vue-demi@>=0.14.5: version "0.14.7" resolved "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.7.tgz" integrity sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA== @@ -4466,7 +4419,7 @@ "@vue/language-core" "1.8.27" semver "^7.5.4" "vue@^2.6.14 || ^3.3.0", vue@^3.0.0, "vue@^3.0.0-0 || ^2.6.0", vue@^3.2.0, vue@^3.2.2, vue@^3.2.25, vue@^3.2.47, vue@3.4.21: vue@^3.2.47: version "3.4.21" resolved "https://registry.npmmirror.com/vue/-/vue-3.4.21.tgz" integrity sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA== ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.binBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v9.binBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.binBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v9.binBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.strings.v9.binBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.dbBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db-shmBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db-walBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.dbBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db-shmBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db-walBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suoBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.binBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_Common/LevelChange/CheckTaskChangeHelper.cs
@@ -45,10 +45,10 @@ { string wheelsNewOld = string.Empty; if (wxrw.Contains("æ¢è½®ç(æ§)")) if (wxrw.Contains("æ¢è½®ç(æ§)") ) { wheelsNewOld = "æ°è½®æ§ç"; }else if (wxrw.Contains("æ¢è½®ç»æ(æ°)")) }else if (wxrw.Contains("æ¢è½®ç»æ(æ°)") || wxrw.Contains("æ¢è½®(æ°)") || wxrw.Contains("æ°è½®æ°ç")) { wheelsNewOld = "æ°è½®æ°ç"; } ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_Core/HostedService/SeedDataHostedService.cs
@@ -49,7 +49,7 @@ { // ä½¿ç¨ myScopedService æ§è¡ä»»å¡ //await DBSeed.SeedAsync(_dbContext, _webRootPath); await DBSeed.SeedAsync(_dbContext, _webRootPath); //å¤ç§æ· 忥 //await DBSeed.TenantSeedAsync(_dbContext); ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_CZInfo_mes.cs
@@ -47,6 +47,26 @@ public string LDTM { get; set; } /// <summary> /// 左车轮æ¡ç /// </summary> [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "左车轮æ¡ç ")] public string LeftCLTM { get; set; } /// <summary> /// ä¸è½¦è½®æ¡ç /// </summary> [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "ä¸è½¦è½®æ¡ç ")] public string MiddleCLTM { get; set; } /// <summary> /// å³è½¦è½®æ¡ç /// </summary> [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "左车轮æ¡ç ")] public string RightCLTM { get; set; } /// <summary> /// ç¶æ 1-å建 2-å ¥åº 3-è¾éçº¿å®æ ï¼ç«å°ç»ä¿¡å·åï¼ 4-agvä»»å¡ä¸å 5-agvåè´§å®æ 6-agv宿 /// ç´èµ°ï¼11-ç´èµ°å建 12-ç´èµ°ä¸ 13-ç´èµ°å®æ ï¼ /// </summary> @@ -322,5 +342,33 @@ /// </summary> [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "ä¸ç座ç´å¾")] public string MPZZJ { get; set; } /// <summary> /// æ¯å¦æåï¼æåç¶æ(0为æ£å¸¸ï¼1为æå) /// </summary> [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "æåç¶æ")] public int TemporaryState { get; set; } /// å·¦è¿çé /// </summary> [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "å·¦è¿çé")] public string LeftCLinterference { get; set; } /// <summary> /// å³è¿çé /// </summary> [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "å³è¿çé")] public string RightCLinterference { get; set; } /// <summary> /// ä¸è¿çé /// </summary> [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "ä¸è¿çé")] public string MiddleCLinterference { get; set; } } } ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/agvCallback.cs
@@ -67,7 +67,7 @@ Dt_CZInfo_mes CZInfotlist = _task_CZInfoRepository.QueryFirst(x => x.CurrentStatue == "5"); //è°åè¾é线æ¥å£ï¼åé¦è¾éçº¿å®æä¿¡å· WCS_Set(CZInfotlist.AGVaddres); bool k= WCS_Set(CZInfotlist.AGVaddres); if(CZInfotlist != null) @@ -78,6 +78,7 @@ Dt_CZInfo_mes_hty stockInfo_Hty = CZInfotlist.Adapt<Dt_CZInfo_mes_hty>(); _CZInfo_Mes_HtyRepository.AddData(stockInfo_Hty); _task_CZInfoRepository.DeleteData(CZInfotlist); } ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/genAgvSchedulingTask.cs
@@ -39,9 +39,9 @@ //æ¥æ¾å½åå¨è½¦è½´çº¿æ«ç«¯éè¦agvæ¬è¿ç车轴 List<Dt_CZInfo_mes> CZInfotlist = _task_CZInfoRepository.QueryData(x => x.CurrentStatue == "4" || x.CurrentStatue == "5" ); Dt_CZInfo_mes CZInfotlist = _task_CZInfoRepository.QueryData(x => x.CurrentStatue == "4" || x.CurrentStatue == "5" ).FirstOrDefault(); if (CZInfotlist.Count >= 2) { return content.Error($"å·²æagv任塿£å¨è¿è¡ä¸ï¼ä¸å失败ï¼ï¼ï¼"); } if (CZInfotlist!=null) { return content.Error($"å·²æagv任塿£å¨è¿è¡ä¸ï¼ä¸å失败ï¼ï¼ï¼"); } Dt_CZInfo_mes CZInfot = null; @@ -56,9 +56,11 @@ if (CZInfot == null) { return content.Error($"æªæ¾å°ç°æè¾éçº¿å®æç车轴信æ¯"); } } if(CZInfot.TemporaryState==1) { return content.Error($"æå车车轴ï¼ä¸å¯åºåº"); } CZInfot.CurrentStatue = "4"; CZInfot.AGVaddres = input.Position; //æ¥æ¾è½¦è½´å¯¹åºçè½¦è½®ä¿¡æ¯ List<Dt_Task> tasks=_taskRepository.QueryData(x => x.task_CZInfo == CZInfot.CZH).ToList(); ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCLinfo.cs
@@ -97,6 +97,7 @@ if (string.IsNullOrEmpty(gkdj)) throw new Exception("ç级转æ¢å¤±è´¥,è¯·æ£æ¥æ¥å£ççº§åæ°"); //} Dt_InWheels_mes wheels_Mes = new Dt_InWheels_mes { Wheels_code = clCode, ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs
@@ -1,4 +1,5 @@ using Newtonsoft.Json; using Masuit.Tools; using Newtonsoft.Json; using SharpCompress.Compressors.Xz; using System.Reflection.Emit; using WIDESEA_Common; @@ -24,9 +25,14 @@ /// <returns></returns> public WebResponseContent SaveCZInfo(SaveModel saveModel) { WebResponseContent content = new WebResponseContent(); try { string CZjson = Newtonsoft.Json.JsonConvert.SerializeObject(saveModel, Newtonsoft.Json.Formatting.Indented); // æå任塿°æ® LogFactory.GetLog("车轮éé åºåºæ¥æ¶è½¦è½´æ°æ®").Info(true, $"è½¦è½´ä¼ éçæ°æ®ï¼{CZjson}"); //å¦å½åå卿ªå¼å§å ¥åºç车轮æå¶å¨çæ°æ®,åç¦æ¢ä¿åæ°æ°æ® 以鲿°æ®æ··ä¹± var waitInbound = _CZInfo_MesRepository.QueryFirst(x => x.CurrentStatue == "0"); if (waitInbound != null) throw new Exception("å½åå卿ªå¼å§å ¥åºçè½¦è½´æ°æ®,请å 䏿¶å¯å¨ååä¿åä¿¡æ¯!"); @@ -220,8 +226,11 @@ YLZZJ = ylzzj, ZLZDJ = leftLevel, YLZDJ = rightLevel, WXRW = wxrw WXRW = wxrw, TemporaryState=0, }; //å·¦åºåºè½¦è½® Dt_WheelsStock leftContainer = null; @@ -240,42 +249,71 @@ //M1C å¯¹åº è½¦å CRH1C CRH1A-A if (czxh == "M1A") { WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && (x.Wheels_CarType == "CRH1A" || x.Wheels_CarType == "CRH1A-200") && x.Wheels_Statue==0); if (CZInfo_Mes.MTTYPE == "T") { WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && (x.Wheels_CarType == "CRH1A" || x.Wheels_CarType == "CRH1A-200") && x.Wheels_Statue == 0); } else { WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && (x.Wheels_CarType == "CRH1A" || x.Wheels_CarType == "CRH1A-200") && x.Wheels_Statue == 0); } } else if(czxh == "M1B") else if (czxh == "M1B") { WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && (x.Wheels_CarType == "CRH1B" || x.Wheels_CarType == "CRHA1A-250") && x.Wheels_Statue == 0); if (CZInfo_Mes.MTTYPE == "T") { WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && (x.Wheels_CarType == "CRH1B" || x.Wheels_CarType == "CRHA1A-250") && x.Wheels_Statue == 0); } else { WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && (x.Wheels_CarType == "CRH1B" || x.Wheels_CarType == "CRHA1A-250") && x.Wheels_Statue == 0); } } else if (czxh == "M1C") { WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && (x.Wheels_CarType == "CRH1C" || x.Wheels_CarType == "CRH1A-A") && x.Wheels_Statue == 0); } else { if (CZInfo_Mes.MTTYPE == "T") { //廿äºå±æ§å¯¹æ¯ WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.Wheels_Statue == 0); WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && (x.Wheels_CarType == "CRH1C" || x.Wheels_CarType == "CRH1A-A") && x.Wheels_Statue == 0); } else { WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && (x.Wheels_CarType == "CRH1C" || x.Wheels_CarType == "CRH1A-A") && x.Wheels_Statue == 0); } } else { if (CZInfo_Mes.MTTYPE == "T") { //æ¾åºææç¬¦åæ¡ä»¶çåºå车轮 WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.Wheels_Statue == 0); } else { //æ¾åºææç¬¦åæ¡ä»¶çåºå车轮 WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps && x.Wheels_Statue == 0); } } if(newOrOld=="1") if (newOrOld=="1") { foreach (var item in WheelsList) //foreach (var item in WheelsList) //{ // decimal ygrjz = decimal.Parse(item.Wheels_ygljz); // if (ygrjz < zuixiaoz || ygrjz > zuidaz) // WheelsList.Remove(item); //} foreach (var item in WheelsList.ToList()) { decimal ygrjz = decimal.Parse(item.Wheels_ygljz); if (ygrjz < zuixiaoz || ygrjz > zuidaz) WheelsList.Remove(item); WheelsList.Remove(item); } } @@ -335,6 +373,7 @@ List<DtLocationInfo> locationInfos = new List<DtLocationInfo>(); List<Dt_WheelsStock> wheelsStocks = new List<Dt_WheelsStock>(); List<WMSTaskDTO> listTaskDTO = new List<WMSTaskDTO>(); if (null != leftContainer) { Dt_Task leftTask = CreateOutTask(leftContainer, czCode); @@ -385,6 +424,8 @@ listTaskDTO.Add(leftTaskDTO); wheelsStocks.Add(leftContainer); locationInfos.Add(lefolocation); CZInfo_Mes.LeftCLTM = leftContainer.Wheels_Num; CZInfo_Mes.LeftCLinterference= (decimal.Parse(CZInfo_Mes.ZLZZJ) -decimal.Parse(leftContainer.Wheels_gkcc)).ToString(); } if (null != rightContainer) { @@ -433,6 +474,8 @@ listTaskDTO.Add(rihgtTaskDTO); wheelsStocks.Add(rightContainer); locationInfos.Add(rightlocation); CZInfo_Mes.RightCLTM = rightContainer.Wheels_Num; CZInfo_Mes.RightCLinterference = (decimal.Parse(CZInfo_Mes.YLZZJ) - decimal.Parse(rightContainer.Wheels_gkcc)).ToString(); } _unitOfWorkManage.BeginTran(); //å¼å¯äºå¡ @@ -468,6 +511,18 @@ WebResponseContent respone = JsonConvert.DeserializeObject<WebResponseContent>(respon.ToString()); if (respone.Status) { LogFactory.GetLog("车轮éé åºåº").Info(true, $"\r\r-----------------------------------------------------------"); LogFactory.GetLog("车轮éé åºåº").Info(true, $"车轴ç¼å·ï¼{CZInfo_Mes.CZH}"); // æå任塿°æ® LogFactory.GetLog("车轮éé åºåº").Info(true, $"è½¦è½´ä¼ éçæ°æ®ï¼{CZjson}"); LogFactory.GetLog("车轮éé åºåº").Info(true, $"\r\r>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"); LogFactory.GetLog("车轮éé åºåº").Info(true, $"çéçè½¦è½®æ°æ®ï¼{wheelsStocks.ToJsonString()}"); LogFactory.GetLog("车轮éé åºåº").Info(true, $"\r\r-----------------------------------------------------------"); _unitOfWorkManage.CommitTran(); //æäº¤äºå¡ content.OK($"车轮åºåºä»»å¡ä¸åç»WCSæå."); } ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -5,6 +5,7 @@ using OfficeOpenXml.FormulaParsing.Excel.Functions.Database; using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime; using OfficeOpenXml.FormulaParsing.Excel.Functions.Math; using SqlSugar; using System.Diagnostics; using System.Reflection.Emit; using System.Text.RegularExpressions; @@ -47,6 +48,7 @@ private readonly IDt_ZdpStockRepository _ZdpStockRepository; private readonly IDt_ZdpStock_htyRepository _ZdpStock_HtyRepository; private readonly IDt_PreOutboundRepository _PreOutboundRepository; private readonly ILocationInfoRepository _locationInfoRepository; public Dt_TaskService(IDt_TaskRepository BaseDal, @@ -72,7 +74,8 @@ IDt_ZdpStockRepository zdpStockRepository, IDt_ZdpStock_htyRepository dt_ZdpStock_HtyRepository, IDt_OutZdp_htyRepository dt_OutZdp_HtyRepository, IDt_PreOutboundRepository dt_PreOutboundRepository) : base(BaseDal) IDt_PreOutboundRepository dt_PreOutboundRepository, ILocationInfoRepository locationInfoRepository) : base(BaseDal) { _unitOfWorkManage = unitOfWorkManage; @@ -95,6 +98,7 @@ _ZdpStock_HtyRepository = dt_ZdpStock_HtyRepository; _Dt_OutZdp_htyRepository = dt_OutZdp_HtyRepository; _PreOutboundRepository = dt_PreOutboundRepository; _locationInfoRepository = locationInfoRepository; } #region å¤é¨æ¥å£æ¹æ³ @@ -776,7 +780,7 @@ IsCheck = true, Standards = stockInfo.Wheels_NewOrOld }; task = new Dt_Task { @@ -816,7 +820,7 @@ } // è·åWMS IPå°åç¨äºåéä»»å¡è¯·æ± //è·åWMS IPå°åç¨äºåéä»»å¡è¯·æ± var wmsIpAddress = GetWCSIpReceiveTask(); if (wmsIpAddress == null) { @@ -840,6 +844,8 @@ _WheelsStockRepository.UpdateData(WheelList); } } } catch (Exception ex) @@ -909,6 +915,8 @@ return await BaseDal.Delete(ids); } #region å é¤ä»»å¡åæ» public override WebResponseContent DeleteData(object[] key) { WebResponseContent content = new WebResponseContent(); @@ -924,6 +932,59 @@ if (task.TaskState != (int)TaskInStatusEnum.InNew && task.TaskState != (int)TaskOutStatusEnum.OutNew && task.TaskState != (int)TaskStatus.Created) { return content.Error("ä»»å¡ä¸å¤äºæ°å»ºç¶æ,ç¦æ¢å é¤!"); } ////å ¥åºæä¸¾ //List<int> TaskInboundTypeEnums = Enum.GetValues(typeof(TaskInboundTypeEnum)).Cast<int>().ToList(); ////åºåºæä¸¾ //List<int> TaskOutboundTypeEnums = Enum.GetValues(typeof(TaskOutboundTypeEnum)).Cast<int>().ToList(); ////ç§»åºæä¸¾ //List<int> TaskMoveTypeEnums = Enum.GetValues(typeof(TaskRelocationTypeEnum)).Cast<int>().ToList(); //夿任å¡ç±»å // æ ¹æ®ä»»å¡ç±»åè°ç¨ç¸åºç宿任塿¹æ³ // éªè¯åºåæ¯å¦åå¨ var stock = _WheelsStockRepository.QueryFirstNavAsync(x => x.Wheels_Num.Contains(task.PalletCode) && x.Wheels_Location == task.SourceAddress); var ZdpStock = _ZdpStockRepository.QueryFirstNavAsync(x => x.Zdp_code == task.PalletCode && x.Zdp_Location == task.SourceAddress); bool res = false; switch (task.TaskType) { case (int)TaskInboundTypeEnum.Inbound: case (int)TaskInboundTypeEnum.InWheels: case (int)TaskInboundTypeEnum.InBrake: LogFactory.GetLog("ä»»å¡å®æ").InfoFormat(true, "å ¥åºä»»å¡", ""); res = SellectLocationInfo(task,1); break; case (int)TaskOutboundTypeEnum.Outbound: case (int)TaskOutboundTypeEnum.OutWheels: LogFactory.GetLog("ä»»å¡å®æ").InfoFormat(true, "åºåºä»»å¡", ""); res = SellectLocationInfo(task,2); break; case (int)TaskOutboundTypeEnum.OutBrake: LogFactory.GetLog("ä»»å¡å®æ").InfoFormat(true, "å¶å¨çåºåºä»»å¡", ""); res = SellectLocationInfo(task,3); break; case (int)TaskRelocationTypeEnum.Relocation: if (stock != null) { res = SellectLocationInfo(task,4); } else { res = SellectLocationInfo(task,5); } break; default: return content.Error("ä»»å¡ç±»åä¸åå¨"); } if (!res) { return content.Error("卿§è¡ä»»å¡åç±»çæ¶ååºç°é误ï¼"); } var taskHtyNG = CreateHistoricalTask(task, true); @@ -948,6 +1009,97 @@ } /// <summary> /// è·ååºä½ä¿¡æ¯ /// </summary> /// <param name="targetAddress"></param> /// <returns></returns> /// <exception cref="NotImplementedException"></exception> private bool SellectLocationInfo(Dt_Task task,int taskType) { // è·ååºä½ä¿¡æ¯ DtLocationInfo locationInfoT = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.TargetAddress); DtLocationInfo locationInfoS = _locationInfoRepository.QueryFirst(x => x.LocationCode == task.SourceAddress); Dt_WheelsStock stock = _WheelsStockRepository.QueryFirst(x => x.Wheels_Num.Contains(task.PalletCode) && x.Wheels_Location == task.SourceAddress); Dt_ZdpStock ZdpStock = _ZdpStockRepository.QueryFirst(x => x.Zdp_code == task.PalletCode && x.Zdp_Location == task.SourceAddress); //if (locationInfoT == null) return false; //if (locationInfoS == null) return false; //1-å ¥åº 2-åºåº 3-å¶å¨çåºåº 4-ç§»åº var db = _locationInfoRepository.Db as SqlSugarClient; try { db.Ado.BeginTran(); if (taskType == 1) { locationInfoT.LocationStatus = (int)LocationEnum.Free; bool res = _locationInfoRepository.UpdateData(locationInfoT); if (res) { db.Ado.CommitTran(); return true; } } else if (taskType == 2) { locationInfoS.LocationStatus = (int)LocationEnum.InStock; bool res = _locationInfoRepository.UpdateData(locationInfoS); stock.Wheels_CurrentStatue = 1; bool ress = _WheelsStockRepository.UpdateData(stock); if (res && ress) { db.Ado.CommitTran(); return true; } } else if (taskType == 3) { locationInfoS.LocationStatus = (int)LocationEnum.InStock; bool res = _locationInfoRepository.UpdateData(locationInfoS); ZdpStock.Zdp_CurrentStatue = 1; bool ress = _ZdpStockRepository.UpdateData(ZdpStock); if (res && ress) { db.Ado.CommitTran(); return true; } } //ç§»åº else { locationInfoT.LocationStatus = (int)LocationEnum.Free; locationInfoS.LocationStatus = (int)LocationEnum.InStock; bool res = _locationInfoRepository.UpdateData(locationInfoT); bool res1 = _locationInfoRepository.UpdateData(locationInfoS); if(taskType == 4) { stock.Wheels_CurrentStatue = 1; } else { ZdpStock.Zdp_CurrentStatue = 1; } bool ress = taskType == 4 ? _WheelsStockRepository.UpdateData(stock) : _ZdpStockRepository.UpdateData(ZdpStock); if (res && res1 && ress) { db.Ado.CommitTran(); return true; } } return false; } catch (Exception ex) { db.Ado.RollbackTran(); return false; } } #endregion /// <summary> /// éè¿IDè·åä»»å¡ /// </summary> /// <param name="id">ä»»å¡ID</param> ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs
@@ -41,8 +41,8 @@ builder.Services.AddAllOptionRegister();//读åé ç½®æä»¶ builder.Services.AddMemoryCacheSetup();//ç¼å builder.Services.AddSqlsugarSetup();//SqlSugar å¯å¨æå¡ builder.Services.AddInitializationHostServiceSetup();//åºç¨åå§åæå¡æ³¨å ¥ builder.Services.AddDbSetup();//Db å¯å¨æå¡ //builder.Services.AddInitializationHostServiceSetup();//åºç¨åå§åæå¡æ³¨å ¥ //builder.Services.AddDbSetup();//Db å¯å¨æå¡ //todo åå§å模åéªè¯é ç½® //builder.Services.UseMethodsModelParameters().UseMethodsGeneralParameters();