From 829eabf256e29392ca63f6da48829dba3b075dfe Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期五, 24 一月 2025 08:59:53 +0800
Subject: [PATCH] 资料，优化程序
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/refint/WIDESEA_TaskInfoService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/obj/Debug/net6.0/WIDESEA_OutboundService.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/obj/Debug/net6.0/WIDESEA_IOutboundService.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/WIDESEA_TaskInfoService.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/ref/WIDESEA_ITaskInfoService.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/ref/WIDESEAWCS_Tasks.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/1号堆垛机/Logs_20241029152000.txt | 50 +++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/WIDESEA_TaskInfoService.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/输送线D/Logs_20241120091220.txt | 20 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/obj/Debug/net6.0/WIDESEA_InboundRepository.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/obj/Debug/net6.0/WIDESEA_IOutboundRepository.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/obj/Debug/net6.0/WIDESEA_TaskInfoRepository.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/obj/Debug/net6.0/WIDESEA_StockRepository.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/ref/WIDESEAWCS_TaskInfoService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/refint/WIDESEA_WMSServer.dll | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/HierarchyCache.v1.txt | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2 | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/obj/Debug/net6.0/WIDESEA_BasicRepository.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/obj/Debug/net6.0/WIDESEA_ISystemRepository.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/refint/WIDESEAWCS_TaskInfoService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_StockService.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json | 5
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 17
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/输送线A/Logs_20241111101003.txt | 8
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/ref/WIDESEA_WMSServer.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_StockService.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_ITaskInfoService.pdb | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 291 ++++++++-----------
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_ITaskInfoService.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/2号堆垛机/Logs_20241029153638.txt | 44 ++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/refint/WIDESEAWCS_Tasks.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_RecordRepository/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/WIDESEA_StockService.csproj.AssemblyReference.cache | 0
资料管理/项目文件/新天力嘉兴立库系统升级替换-尖山仓解决方案-V1.0-20241130.docx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs | 38 ++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/obj/Debug/net6.0/WIDESEA_ISystemService.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_RecordRepository/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/obj/Debug/net6.0/WIDESEA_IInboundRepository.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d18985ab-0a96-4d3a-9b51-0ec52888d2ce.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/ref/WIDESEA_TaskInfoService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 10
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll | 0
代码管理/WMS/WIDESEA_WMSClient/src/api/http.js | 13
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/obj/Debug/net6.0/WIDESEA_BasicService.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/035920fb-ad11-424e-b799-260b561f7c3d.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache | 2
资料管理/通信协议/尖山堆垛机通信协议 11-08(新增协议).xlsx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 28 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_StockService.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/obj/Debug/net6.0/WIDESEA_OutboundRepository.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/obj/Debug/net6.0/WIDESEA_SystemService.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3a71424b-e03e-4581-9e9d-ac05e24a5ddb.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_StockService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/WIDESEA_TaskInfoService.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/obj/Debug/net6.0/WIDESEA_IBasicService.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Tasks.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/50c94507-e35e-46a9-af6c-acac0d423d57.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_WMSServer.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/obj/Debug/net6.0/WIDESEA_IRecordService.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/refint/WIDESEA_StockService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_WMSServer.pdb | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.pdb | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 131 ++++----
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_TaskInfoService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.dll | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2 | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/obj/Debug/net6.0/WIDESEA_IBasicRepository.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_TaskInfoService.pdb | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json | 3
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Tasks.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
资料管理/项目文件/天通凯立 操作手册.docx | 0
资料管理/项目文件/流程图.vsdx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Debug/net6.0/WIDESEA_DTO.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/obj/Debug/net6.0/WIDESEA_IStockService.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs | 64 ++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/refint/WIDESEAWCS_ITaskInfoService.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/输送线B/Logs_20241113180159.txt | 38 ++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoRepository/obj/Debug/net6.0/WIDESEA_ITaskInfoRepository.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.GeneratedMSBuildEditorConfig.editorconfig | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs | 6
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Debug/net6.0/WIDESEA_Model.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2 | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/WIDESEA_StockService.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/appsettings.json | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_RecordRepository/obj/Debug/net6.0/WIDESEA_RecordRepository.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Client/src/api/http.js | 7
代码管理/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin | 0
资料管理/项目文件/尖山堆垛机通信协议 11-08(2).xlsx | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 7
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/ref/WIDESEAWCS_Server.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/WMS手动删除任务/2025-01-22/删除成功250122.txt | 5
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/obj/Debug/net6.0/WIDESEA_IStockRepository.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/obj/Debug/net6.0/WIDESEA_IInboundService.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/ref/WIDESEA_StockService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.csproj.AssemblyReference.cache | 0
资料管理/通信协议/天通凯立WCS_PLC协议.xls | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.assets.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/obj/Debug/net6.0/WIDESEA_IRecordRepository.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_TaskInfoService.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/ref/WIDESEAWCS_ITaskInfoService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_TaskInfoService.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/refint/WIDESEA_ITaskInfoService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/475c722e-4a7d-4ce9-b2cb-8439f297a32b.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs | 6
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/obj/Debug/net6.0/WIDESEA_SystemRepository.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/WIDESEA_ITaskInfoService.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/WIDESEA_StockService.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/WIDESEA_ITaskInfoService.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/obj/Debug/net6.0/WIDESEA_RecordService.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js | 65 +--
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/appsettings.json | 3
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/WIDESEA_ITaskInfoService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/obj/Debug/net6.0/WIDESEA_InboundService.csproj.AssemblyReference.cache | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.dll | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Tasks.pdb | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/3de83feb-efcf-4a90-91f1-14fd8bcd893c.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/690401db-67d0-4b2d-bcd1-ba733d802126.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Tasks.dll | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/refint/WIDESEAWCS_Server.dll | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/856cde03-f651-45ba-baf5-5c7045c8fbff.vsidx | 0
/dev/null | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/bin/Debug/net6.0/WIDESEA_Core.pdb | 0
代码管理/WMS/WIDESEA_WMSClient/config/buttons.js | 3
222 files changed, 560 insertions(+), 315 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/api/http.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/api/http.js"
index 47a0fab..3a22dea 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/api/http.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Client/src/api/http.js"
@@ -11,15 +11,16 @@
let loadingInstance;
let loadingStatus = false;
+let loadbaseUrl='http://127.0.0.1:9291';
if (process.env.NODE_ENV == 'development') {
- axios.defaults.baseURL = 'http://10.50.11.65:8099/';
+ axios.defaults.baseURL = loadbaseUrl;
}
else if (process.env.NODE_ENV == 'debug') {
- axios.defaults.baseURL = 'http://10.50.11.65:8099/';
+ axios.defaults.baseURL = loadbaseUrl;
}
else if (process.env.NODE_ENV == 'production') {
- axios.defaults.baseURL = 'http://10.50.11.65:8099/';
+ axios.defaults.baseURL = loadbaseUrl;
}
if (!axios.defaults.baseURL.endsWith('/')) {
axios.defaults.baseURL+="/";
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin"
index aff690b..7005a2a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin"
index 9be140e..1d7fb9f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2"
index 64ad893..08b394e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/3de83feb-efcf-4a90-91f1-14fd8bcd893c.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/3de83feb-efcf-4a90-91f1-14fd8bcd893c.vsidx"
new file mode 100644
index 0000000..6388ad6
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/3de83feb-efcf-4a90-91f1-14fd8bcd893c.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/e34962cc-b873-40c9-98cb-4fdabe717ac4.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/50c94507-e35e-46a9-af6c-acac0d423d57.vsidx"
similarity index 100%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/e34962cc-b873-40c9-98cb-4fdabe717ac4.vsidx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/50c94507-e35e-46a9-af6c-acac0d423d57.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/690401db-67d0-4b2d-bcd1-ba733d802126.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/690401db-67d0-4b2d-bcd1-ba733d802126.vsidx"
new file mode 100644
index 0000000..13b8ca2
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/690401db-67d0-4b2d-bcd1-ba733d802126.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/5310f6ea-7549-4dc5-ab4f-8506de1f8b58.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/856cde03-f651-45ba-baf5-5c7045c8fbff.vsidx"
similarity index 100%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/5310f6ea-7549-4dc5-ab4f-8506de1f8b58.vsidx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/856cde03-f651-45ba-baf5-5c7045c8fbff.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d0fcec97-88cb-4ca6-8406-36bc29d55499.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d0fcec97-88cb-4ca6-8406-36bc29d55499.vsidx"
deleted file mode 100644
index fd48eee..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d0fcec97-88cb-4ca6-8406-36bc29d55499.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f15f9d16-fef1-4439-94ef-35e26c33c1ac.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f15f9d16-fef1-4439-94ef-35e26c33c1ac.vsidx"
deleted file mode 100644
index ed84d7c..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/f15f9d16-fef1-4439-94ef-35e26c33c1ac.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2"
index 2318c1c..c705668 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo"
index f0fcff0..044e8a6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/HierarchyCache.v1.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/HierarchyCache.v1.txt"
index ac3c5cf..ed09bac 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/HierarchyCache.v1.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/HierarchyCache.v1.txt"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
index af0e9ee..cbe717c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
@@ -229,5 +229,12 @@
/// <param name="taskNum">浠诲姟鍙�</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
WebResponseContent RollbackTaskStatusToLast(int taskNum);
+
+ /// <summary>
+ /// 鍒犻櫎浠诲姟
+ /// </summary>
+ /// <param name="taskDTOs"></param>
+ /// <returns></returns>
+ WebResponseContent ReceiveWCSTask(int tasknum);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll"
index 35366ee..ebc26d2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb"
index f69da3a..bf549cf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll"
index 35366ee..ebc26d2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb"
index f69da3a..bf549cf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/ref/WIDESEAWCS_ITaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/ref/WIDESEAWCS_ITaskInfoService.dll"
index fbbdfa0..9f4d99f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/ref/WIDESEAWCS_ITaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/ref/WIDESEAWCS_ITaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/refint/WIDESEAWCS_ITaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/refint/WIDESEAWCS_ITaskInfoService.dll"
index fbbdfa0..9f4d99f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/refint/WIDESEAWCS_ITaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/refint/WIDESEAWCS_ITaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
index bc22c16..71d68f3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
@@ -25,6 +25,12 @@
return Service.ReceiveWMSTask(taskDTOs);
}
+ [HttpPost, Route("ReceiveWCSTask"), AllowAnonymous]
+ public WebResponseContent ReceiveWCSTask([FromBody] int tasknum)
+ {
+ return Service.ReceiveWCSTask(tasknum);
+ }
+
[HttpPost, HttpGet, Route("UpdateTaskExceptionMessage")]
public WebResponseContent UpdateTaskExceptionMessage(int taskNum, string message)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/WMS\346\211\213\345\212\250\345\210\240\351\231\244\344\273\273\345\212\241/2025-01-22/\345\210\240\351\231\244\346\210\220\345\212\237250122.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/WMS\346\211\213\345\212\250\345\210\240\351\231\244\344\273\273\345\212\241/2025-01-22/\345\210\240\351\231\244\346\210\220\345\212\237250122.txt"
new file mode 100644
index 0000000..410e443
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/WMS\346\211\213\345\212\250\345\210\240\351\231\244\344\273\273\345\212\241/2025-01-22/\345\210\240\351\231\244\346\210\220\345\212\237250122.txt"
@@ -0,0 +1,5 @@
+2025/1/22 16:52:07.479
+鐢宠鍒犻櫎鐨勬潯鐮侊細90,鎵樼洏鏉＄爜锛歜kd0312
+{"淇℃伅":"鍒犻櫎鎴愬姛"}
+-------------------------------
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
index 952e607..a245690 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
@@ -1,5 +1,5 @@
{
- //"urls": "http://*:9291", //web鏈嶅姟绔彛锛屽鏋滅敤IIS閮ㄧ讲锛屾妸杩欎釜鍘绘帀
+ "urls": "http://*:9291", //web鏈嶅姟绔彛锛屽鏋滅敤IIS閮ㄧ讲锛屾妸杩欎釜鍘绘帀
"Logging": {
"LogLevel": {
"Default": "Information",
@@ -12,7 +12,6 @@
"urlEmptyOutbound": "http://10.50.11.65:8098/api/Task/Empty_outbound", //璇锋眰绌烘墭鍑哄簱TaskCompleted
"urlTaskCompleted": "http://10.50.11.65:8098/api/Task/TaskCompleted", //浠诲姟鍙嶉
"urlQueryinventory": "http://10.50.11.65:8098/api/Task/Queryinventory", //鏌ヨ搴撳瓨锛岀‘璁ゅ叆搴撶珯鍙�
- "urlRelocationTaskCompleted": "http://10.50.11.65:8098/api/Task/RelocationTaskCompleted", //鐢ㄤ簬绉诲簱浠诲姟瀹屾垚鎺ュ彛
"urlRawmaterialout": "http://10.50.11.65:8098/api/Task/Rawmaterialout", //鍚庣画鐢ㄤ簬鍒ゆ柇鍘熸潗鏂欏嚭搴�
"urlPalletQueryinventory": "http://10.50.11.65:8098/api/Task/PalletQueryinventory", //鍒ゆ柇鍏ュ簱鍘诲悜
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/1\345\217\267\345\240\206\345\236\233\346\234\272/Logs_20241029152000.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/1\345\217\267\345\240\206\345\236\233\346\234\272/Logs_20241029152000.txt"
index e0a8eeb..d8f5b6e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/1\345\217\267\345\240\206\345\236\233\346\234\272/Logs_20241029152000.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/1\345\217\267\345\240\206\345\236\233\346\234\272/Logs_20241029152000.txt"
@@ -72258,3 +72258,53 @@
閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
/=================================================[ Exception ]================================================/
+[閿欒] 2025-01-21 17:03:20.659 Thread:[003] 1鍙峰爢鍨涙満 : PLC杩炴帴澶辫触锛孖P锛氥��10.50.11.79銆戯紝Port锛氥��102銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+[鑷村懡] 2025-01-21 17:03:30.825 Thread:[014] 1鍙峰爢鍨涙満 : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.SiemensS7.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[鑷村懡] 2025-01-21 17:03:41.397 Thread:[014] 1鍙峰爢鍨涙満 : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.SiemensS7.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[鑷村懡] 2025-01-21 17:03:52.024 Thread:[014] 1鍙峰爢鍨涙満 : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.SiemensS7.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[鑷村懡] 2025-01-21 17:04:02.596 Thread:[014] 1鍙峰爢鍨涙満 : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.SiemensS7.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[閿欒] 2025-01-21 17:04:43.920 Thread:[003] 1鍙峰爢鍨涙満 : PLC杩炴帴澶辫触锛孖P锛氥��10.50.11.79銆戯紝Port锛氥��102銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+[鑷村懡] 2025-01-21 17:04:54.147 Thread:[012] 1鍙峰爢鍨涙満 : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.SiemensS7.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[鑷村懡] 2025-01-21 17:05:04.750 Thread:[012] 1鍙峰爢鍨涙満 : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.SiemensS7.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[鑷村懡] 2025-01-21 17:05:15.338 Thread:[012] 1鍙峰爢鍨涙満 : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.SiemensS7.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[鑷村懡] 2025-01-21 17:05:25.995 Thread:[012] 1鍙峰爢鍨涙満 : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.79:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.SiemensS7.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/2\345\217\267\345\240\206\345\236\233\346\234\272/Logs_20241029153638.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/2\345\217\267\345\240\206\345\236\233\346\234\272/Logs_20241029153638.txt"
index fe47e01..cdbe4d5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/2\345\217\267\345\240\206\345\236\233\346\234\272/Logs_20241029153638.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/2\345\217\267\345\240\206\345\236\233\346\234\272/Logs_20241029153638.txt"
@@ -24417,3 +24417,47 @@
閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
/=================================================[ Exception ]================================================/
+[閿欒] 2025-01-21 17:03:30.736 Thread:[003] 2鍙峰爢鍨涙満 : PLC杩炴帴澶辫触锛孖P锛氥��10.50.11.69銆戯紝Port锛氥��102銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.69:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+[鑷村懡] 2025-01-21 17:03:40.872 Thread:[008] 2鍙峰爢鍨涙満 : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.69:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.69:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.SiemensS7.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[鑷村懡] 2025-01-21 17:03:51.502 Thread:[008] 2鍙峰爢鍨涙満 : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.69:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.69:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.SiemensS7.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[鑷村懡] 2025-01-21 17:04:02.070 Thread:[008] 2鍙峰爢鍨涙満 : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.69:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.69:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.SiemensS7.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[閿欒] 2025-01-21 17:04:54.096 Thread:[003] 2鍙峰爢鍨涙満 : PLC杩炴帴澶辫触锛孖P锛氥��10.50.11.69銆戯紝Port锛氥��102銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.69:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+[鑷村懡] 2025-01-21 17:05:04.226 Thread:[007] 2鍙峰爢鍨涙満 : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.69:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.69:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.SiemensS7.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[鑷村懡] 2025-01-21 17:05:14.913 Thread:[007] 2鍙峰爢鍨涙満 : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.69:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.69:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.SiemensS7.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[鑷村懡] 2025-01-21 17:05:25.498 Thread:[007] 2鍙峰爢鍨涙満 : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.69:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.69:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.SiemensS7.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[鑷村懡] 2025-01-21 17:05:36.085 Thread:[007] 2鍙峰爢鍨涙満 : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.69:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怋yte銆戯紝鍦板潃锛氥�怐B106.2.0銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.69:102 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.SiemensS7.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/\350\276\223\351\200\201\347\272\277A/Logs_20241111101003.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/\350\276\223\351\200\201\347\272\277A/Logs_20241111101003.txt"
index 9cdab25..57ab2d9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/\350\276\223\351\200\201\347\272\277A/Logs_20241111101003.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/\350\276\223\351\200\201\347\272\277A/Logs_20241111101003.txt"
@@ -57518,3 +57518,11 @@
閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
/=================================================[ Exception ]================================================/
+[閿欒] 2025-01-21 17:04:01.120 Thread:[003] 杈撻�佺嚎A : PLC杩炴帴澶辫触锛孖P锛氥��10.50.11.19銆戯紝Port锛氥��44818銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.19:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+[閿欒] 2025-01-21 17:05:24.423 Thread:[003] 杈撻�佺嚎A : PLC杩炴帴澶辫触锛孖P锛氥��10.50.11.19銆戯紝Port锛氥��44818銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.19:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+[鑷村懡] 2025-01-21 17:05:35.650 Thread:[021] 杈撻�佺嚎A : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怚nt16銆戯紝鍦板潃锛氥�怶CS_PLC_A._03_WCS_TYPE銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.19:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怚nt16銆戯紝鍦板潃锛氥�怶CS_PLC_A._03_WCS_TYPE銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.19:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.AllenBrandlyEtherNetCommunicator.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/\350\276\223\351\200\201\347\272\277B/Logs_20241113180159.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/\350\276\223\351\200\201\347\272\277B/Logs_20241113180159.txt"
index 6a6c5f4..b82fc7a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/\350\276\223\351\200\201\347\272\277B/Logs_20241113180159.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/\350\276\223\351\200\201\347\272\277B/Logs_20241113180159.txt"
@@ -78476,3 +78476,41 @@
閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
/=================================================[ Exception ]================================================/
+[閿欒] 2025-01-21 17:03:40.867 Thread:[003] 杈撻�佺嚎B : PLC杩炴帴澶辫触锛孖P锛氥��10.50.11.18銆戯紝Port锛氥��44818銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.18:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+[鑷村懡] 2025-01-21 17:03:51.000 Thread:[016] 杈撻�佺嚎B : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怱tring銆戯紝鍦板潃锛氥�怭LC_WCS_B._01_PLC_LPN銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.18:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怱tring銆戯紝鍦板潃锛氥�怭LC_WCS_B._01_PLC_LPN銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.18:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.AllenBrandlyEtherNetCommunicator.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[鑷村懡] 2025-01-21 17:04:01.665 Thread:[016] 杈撻�佺嚎B : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怱tring銆戯紝鍦板潃锛氥�怭LC_WCS_B._01_PLC_LPN銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.18:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怱tring銆戯紝鍦板潃锛氥�怭LC_WCS_B._01_PLC_LPN銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.18:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.AllenBrandlyEtherNetCommunicator.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[閿欒] 2025-01-21 17:05:04.226 Thread:[003] 杈撻�佺嚎B : PLC杩炴帴澶辫触锛孖P锛氥��10.50.11.18銆戯紝Port锛氥��44818銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.18:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+[鑷村懡] 2025-01-21 17:05:14.395 Thread:[017] 杈撻�佺嚎B : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怱tring銆戯紝鍦板潃锛氥�怭LC_WCS_B._01_PLC_LPN銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.18:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怱tring銆戯紝鍦板潃锛氥�怭LC_WCS_B._01_PLC_LPN銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.18:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.AllenBrandlyEtherNetCommunicator.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[鑷村懡] 2025-01-21 17:05:24.947 Thread:[017] 杈撻�佺嚎B : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怱tring銆戯紝鍦板潃锛氥�怭LC_WCS_B._01_PLC_LPN銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.18:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怱tring銆戯紝鍦板潃锛氥�怭LC_WCS_B._01_PLC_LPN銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.18:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.AllenBrandlyEtherNetCommunicator.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[鑷村懡] 2025-01-21 17:05:35.540 Thread:[017] 杈撻�佺嚎B : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怱tring銆戯紝鍦板潃锛氥�怭LC_WCS_B._01_PLC_LPN銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.18:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怱tring銆戯紝鍦板潃锛氥�怭LC_WCS_B._01_PLC_LPN銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.18:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.AllenBrandlyEtherNetCommunicator.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[鑷村懡] 2025-01-21 17:05:56.657 Thread:[023] 杈撻�佺嚎B : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怋yte銆戯紝鍦板潃锛氥�怭LC_WCS_B._03_PLC_EVENT銆戯紝閿欒淇℃伅锛氥�怱ocket Connect 10.50.11.18:44818 Exception -> 鐢变簬杩炴帴鏂瑰湪涓�娈垫椂闂村悗娌℃湁姝ｇ‘绛斿鎴栬繛鎺ョ殑涓绘満娌℃湁鍙嶅簲锛岃繛鎺ュ皾璇曞け璐ャ�� 10.50.11.18:44818銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怋yte銆戯紝鍦板潃锛氥�怭LC_WCS_B._03_PLC_EVENT銆戯紝閿欒淇℃伅锛氥�怱ocket Connect 10.50.11.18:44818 Exception -> 鐢变簬杩炴帴鏂瑰湪涓�娈垫椂闂村悗娌℃湁姝ｇ‘绛斿鎴栬繛鎺ョ殑涓绘満娌℃湁鍙嶅簲锛岃繛鎺ュ皾璇曞け璐ャ�� 10.50.11.18:44818銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.AllenBrandlyEtherNetCommunicator.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/\350\276\223\351\200\201\347\272\277D/Logs_20241120091220.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/\350\276\223\351\200\201\347\272\277D/Logs_20241120091220.txt"
index 8adf5a3..17e5bc7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/\350\276\223\351\200\201\347\272\277D/Logs_20241120091220.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/\350\276\223\351\200\201\347\272\277D/Logs_20241120091220.txt"
@@ -10556,3 +10556,23 @@
閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
/=================================================[ Exception ]================================================/
+[閿欒] 2025-01-21 17:03:50.953 Thread:[003] 杈撻�佺嚎D : PLC杩炴帴澶辫触锛孖P锛氥��10.50.11.17銆戯紝Port锛氥��44818銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.17:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+[鑷村懡] 2025-01-21 17:04:01.560 Thread:[027] 杈撻�佺嚎D : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怱tring銆戯紝鍦板潃锛氥�怭LC_WCS_D._01_PLC_LPN銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.17:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怱tring銆戯紝鍦板潃锛氥�怭LC_WCS_D._01_PLC_LPN銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.17:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.AllenBrandlyEtherNetCommunicator.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[閿欒] 2025-01-21 17:05:14.383 Thread:[003] 杈撻�佺嚎D : PLC杩炴帴澶辫触锛孖P锛氥��10.50.11.17銆戯紝Port锛氥��44818銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.17:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+[鑷村懡] 2025-01-21 17:05:25.496 Thread:[019] 杈撻�佺嚎D : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怱tring銆戯紝鍦板潃锛氥�怭LC_WCS_D._01_PLC_LPN銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.17:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怱tring銆戯紝鍦板潃锛氥�怭LC_WCS_D._01_PLC_LPN銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.17:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.AllenBrandlyEtherNetCommunicator.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
+[鑷村懡] 2025-01-21 17:05:36.085 Thread:[019] 杈撻�佺嚎D : 鏁版嵁璇诲彇澶辫触锛屾暟鎹被鍨嬶細銆怱tring銆戯紝鍦板潃锛氥�怭LC_WCS_D._01_PLC_LPN銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.17:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆� : 閿欒淇℃伅锛氭暟鎹鍙栧け璐ワ紝鏁版嵁绫诲瀷锛氥�怱tring銆戯紝鍦板潃锛氥�怭LC_WCS_D._01_PLC_LPN銆戯紝閿欒淇℃伅锛氥�愯繛鎺� 10.50.11.17:44818 澶辫触锛岃秴鏃舵椂闂翠负 10000 ms銆�
+閿欒婧愶細WIDESEAWCS_Communicator
+閿欒鍫嗘爤锛� at WIDESEAWCS_Communicator.AllenBrandlyEtherNetCommunicator.GetContent[T](OperateResult`1 operateResult, String address)
+閿欒绫诲瀷锛歐IDESEAWCS_Communicator.CommunicationException
+閿欒鏂规硶锛歋ystem.Object GetContent[T](HslCommunication.OperateResult`1[T], System.String)
+/=================================================[ Exception ]================================================/
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll"
index 35366ee..ebc26d2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb"
index f69da3a..bf549cf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.dll"
index 53c2ddc..00869b7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.pdb"
index c58f0de..794d8d8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll"
index 74efde9..a7b5d1c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb"
index fc9e673..d928f4b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Tasks.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Tasks.dll"
index 78f3365..30e5968 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Tasks.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Tasks.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Tasks.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Tasks.pdb"
index 27d5f81..1e8a47e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Tasks.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Tasks.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/appsettings.json"
index 952e607..a245690 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/appsettings.json"
@@ -1,5 +1,5 @@
{
- //"urls": "http://*:9291", //web鏈嶅姟绔彛锛屽鏋滅敤IIS閮ㄧ讲锛屾妸杩欎釜鍘绘帀
+ "urls": "http://*:9291", //web鏈嶅姟绔彛锛屽鏋滅敤IIS閮ㄧ讲锛屾妸杩欎釜鍘绘帀
"Logging": {
"LogLevel": {
"Default": "Information",
@@ -12,7 +12,6 @@
"urlEmptyOutbound": "http://10.50.11.65:8098/api/Task/Empty_outbound", //璇锋眰绌烘墭鍑哄簱TaskCompleted
"urlTaskCompleted": "http://10.50.11.65:8098/api/Task/TaskCompleted", //浠诲姟鍙嶉
"urlQueryinventory": "http://10.50.11.65:8098/api/Task/Queryinventory", //鏌ヨ搴撳瓨锛岀‘璁ゅ叆搴撶珯鍙�
- "urlRelocationTaskCompleted": "http://10.50.11.65:8098/api/Task/RelocationTaskCompleted", //鐢ㄤ簬绉诲簱浠诲姟瀹屾垚鎺ュ彛
"urlRawmaterialout": "http://10.50.11.65:8098/api/Task/Rawmaterialout", //鍚庣画鐢ㄤ簬鍒ゆ柇鍘熸潗鏂欏嚭搴�
"urlPalletQueryinventory": "http://10.50.11.65:8098/api/Task/PalletQueryinventory", //鍒ゆ柇鍏ュ簱鍘诲悜
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache"
index c4ec142..23d890b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.dll"
index 53c2ddc..00869b7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.pdb"
index c58f0de..794d8d8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/ref/WIDESEAWCS_Server.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/ref/WIDESEAWCS_Server.dll"
index 9461f1e..ab71bbd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/ref/WIDESEAWCS_Server.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/ref/WIDESEAWCS_Server.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/refint/WIDESEAWCS_Server.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/refint/WIDESEAWCS_Server.dll"
index 9461f1e..ab71bbd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/refint/WIDESEAWCS_Server.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/refint/WIDESEAWCS_Server.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 3c0b45b..4fa7034 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -85,7 +85,6 @@
public string urlWMSTask = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlWMSTask"];
public string urlTaskCompleted = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlTaskCompleted"];
public string urlWMSMovelibraryTask = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlWMSMovelibraryTask"];
- public string urlRelocationTaskCompleted = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlRelocationTaskCompleted"];
public string urlQueryinventory = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlQueryinventory"];
public string urlEmptyOutbound = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlEmptyOutbound"];
public string urlRawmaterialout = WIDESEAWCS_Core.Helper.AppSettings.Configuration["urlRawmaterialout"];
@@ -707,7 +706,7 @@
/*List<Dt_Router> routers = _routerService.QueryNextRoutes(task.NextAddress, task.TargetAddress);
if (!routers.Any()) return WebResponseContent.Instance.Error($"鏈壘鍒拌澶囪矾鐢变俊鎭�");*/
- content = HttpHelper.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}");
+ content = HttpHelper.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}&HowWorks=2");
task.TaskState = (int)TaskOutStatusEnum.OutFinish;
task.ModifyDate = DateTime.Now;
BaseDal.DeleteData(task);
@@ -719,7 +718,7 @@
}
else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
{
- content = HttpHelper.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}");
+ content = HttpHelper.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}&HowWorks=2");
//todo
//int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
task.TaskState = (int)TaskInStatusEnum.InFinish;
@@ -732,14 +731,15 @@
}
else if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation)
{
- GenerateInv2 generate = new GenerateInv2()
+ /*GenerateInv2 generate = new GenerateInv2()
{
PalletCode = task.PalletCode,
SourceAddress = task.SourceAddress,
TargetAddress = task.TargetAddress
};
- content = HttpHelper.Post<WebResponseContent>($"{urlRelocationTaskCompleted}", generate);
+ content = HttpHelper.Post<WebResponseContent>($"{urlTaskCompleted}", generate);*/
+ content = HttpHelper.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}&HowWorks=2");
task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
task.ModifyDate = DateTime.Now;
BaseDal.DeleteData(task);
@@ -909,7 +909,23 @@
}
}
-
+ public WebResponseContent ReceiveWCSTask(int tasknum)
+ {
+ Dt_Task tasks = BaseDal.QueryFirst(x => x.TaskNum == tasknum);
+ try
+ {
+ _task_HtyService.AddTaskHty(tasks);
+ BaseDal.DeleteData(tasks);
+ WriteLog.Write_Log("WMS鎵嬪姩鍒犻櫎浠诲姟", "鍒犻櫎鎴愬姛", $"鐢宠鍒犻櫎鐨勬潯鐮侊細{tasks.TaskNum},鎵樼洏鏉＄爜锛歿tasks.PalletCode}", new { 淇℃伅 = "鍒犻櫎鎴愬姛" });
+ return WebResponseContent.Instance.OK();
+
+ }
+ catch (Exception ex)
+ {
+ WriteLog.Write_Log("WMS鎵嬪姩鍒犻櫎浠诲姟","鍒犻櫎澶辫触", $"鐢宠鍒犻櫎鐨勬潯鐮侊細{tasks.TaskNum},鎵樼洏鏉＄爜锛歿tasks.PalletCode}", new { 淇℃伅 = ex.Message });
+ return WebResponseContent.Instance.Error();
+ }
+ }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll"
index 35366ee..ebc26d2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb"
index f69da3a..bf549cf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll"
index 74efde9..a7b5d1c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb"
index fc9e673..d928f4b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs"
index dbef94c..9f58259 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs"
@@ -11,12 +11,12 @@
using System;
using System.Reflection;
-[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCs_TaskInfoService")]
+[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_TaskInfoService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
-[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCs_TaskInfoService")]
-[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCs_TaskInfoService")]
+[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_TaskInfoService")]
+[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_TaskInfoService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
// 鐢� MSBuild WriteCodeFragment 绫荤敓鎴愩��
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache"
index a9e23e5..3f6a67e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-696e07e336e90b059d5a69ceac1b59c1567636d6
+0c89bb1cae87ea43ac260fbf353d127eb2b5c7af
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.GeneratedMSBuildEditorConfig.editorconfig" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.GeneratedMSBuildEditorConfig.editorconfig"
index f2f2334..a7df384 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.GeneratedMSBuildEditorConfig.editorconfig"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.GeneratedMSBuildEditorConfig.editorconfig"
@@ -7,5 +7,5 @@
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
-build_property.RootNamespace = WIDESEAWCs_TaskInfoService
-build_property.ProjectDir = F:\澶栧嚭椤圭洰\灏栧北\11-1\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCs_TaskInfoService\
+build_property.RootNamespace = WIDESEAWCS_TaskInfoService
+build_property.ProjectDir = F:\澶栧嚭椤圭洰\灏栧北\11-1\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.assets.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.assets.cache"
index e6c5a47..fb19171 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.assets.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.assets.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.AssemblyReference.cache"
index 67e2c41..3ca11a0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll"
index 74efde9..a7b5d1c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb"
index fc9e673..d928f4b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/ref/WIDESEAWCS_TaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/ref/WIDESEAWCS_TaskInfoService.dll"
index 93921bd..5c45385 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/ref/WIDESEAWCS_TaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/ref/WIDESEAWCS_TaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/refint/WIDESEAWCS_TaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/refint/WIDESEAWCS_TaskInfoService.dll"
index 93921bd..5c45385 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/refint/WIDESEAWCS_TaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/refint/WIDESEAWCS_TaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index f3ef36f..a8377c2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -73,7 +73,6 @@
CommonConveyorLine conveyorLine = (CommonConveyorLine)context.JobDetail.JobDataMap.Get("JobParams");
if (conveyorLine != null)
{
- WriteLog.GetLog("Job鏃ュ織杩愯").Write(conveyorLine.DeviceCode + "杩愯鏃ュ織锛屽紑濮嬫椂闂�" + DateTime.Now, "Job鏃ュ織杩愯");
if (conveyorLine.DeviceCode == "1002")
{
RequestInbound(conveyorLine); //涓�妤糃,B鍖轰笟鍔�
@@ -84,20 +83,17 @@
}
if (conveyorLine.DeviceCode == "1004")
{
- RequestInbound3(conveyorLine); //涓�妤糃,B鍖轰笟鍔�
+ RequestInbound3(conveyorLine);
}
}
WriteLog.GetLog("Job鏃ュ織杩愯").Write(conveyorLine.DeviceCode + "杩愯鏃ュ織锛岀粨鏉熸椂闂�" + DateTime.Now, "Job鏃ュ織杩愯");
- //RequestInNextAddress(conveyorLine);
-
-
}
catch (Exception ex)
{
- //Console.Out.WriteLine(nameof(CommonConveyorLineJob) + ":" + ex.ToString());
+ WriteLog.Write_Log("杈撻�佺嚎浜や簰", "閿欒淇℃伅", "閿欒", new { 淇℃伅 = ex.Message });
}
finally
{
@@ -109,8 +105,8 @@
public void RequestInbound(CommonConveyorLine conveyorLine)
{
//1妤艰緭閫佺嚎鍒ゆ柇
- HandleEvent2(conveyorLine, "PLC_WCS_B._03_PLC_EVENT", "PLC_WCS_B._03_PLC_LPN", "WCS_PLC_B._03_WCS_TO"); //鍒ゆ柇宸烽亾
- HandleEvent2(conveyorLine, "PLC_WCS_C._02_PLC_EVENT", "PLC_WCS_C._02_PLC_LPN", "WCS_PLC_C._02_WCS_TO"); //鍒ゆ柇宸烽亾
+ HandleEvent2(conveyorLine, "PLC_WCS_B._03_PLC_EVENT", "PLC_WCS_B._03_PLC_LPN", "WCS_PLC_B._03_WCS_TO","鍘熸潗鏂欐壂鐮佺珯鍙�"); //鍒ゆ柇宸烽亾
+ HandleEvent2(conveyorLine, "PLC_WCS_C._02_PLC_EVENT", "PLC_WCS_C._02_PLC_LPN", "WCS_PLC_C._02_WCS_TO", "鎴愬搧鎵爜绔欏彴"); //鍒ゆ柇宸烽亾
CheckForEmptyPallet(conveyorLine, "PLC_WCS_B._02_PLC_EVENT", "PLC_WCS_B._02_PLC_LPN", "PLC_WCS_B._02_PLC_PUT", "R02-002-027-001-01"); //鍒ゆ柇鏄惁鍙栫┖鎵樺嚭搴�
CheckForEmptyPallet(conveyorLine, "PLC_WCS_C._01_PLC_EVENT", "PLC_WCS_C._01_PLC_LPN", "PLC_WCS_C._01_PLC_PUT", "R01-002-041-001-01"); //鍒ゆ柇鏄惁鍙栫┖鎵樺嚭搴�
ProcessConveyorEvent(conveyorLine, "PLC_WCS_B._01_PLC_EVENT", "PLC_WCS_B._01_PLC_LPN", "R02-003-027-001-01", "WCS_PLC_B._03_WCS_TO");// 澶勭悊 B
@@ -123,11 +119,6 @@
ProcessConveyorEvent(conveyorLine, "PLC_WCS_D._01_PLC_EVENT", "PLC_WCS_D._01_PLC_LPN", "R01-003-041-011-01", "WCS_PLC_D._01_WCS_TO");// 澶勭悊 1宸烽亾 绔欏彴浜嬩欢鍏ョ┖
ProcessConveyorEvent(conveyorLine, "PLC_WCS_D._03_PLC_EVENT", "PLC_WCS_D._03_PLC_LPN", "R02-003-027-011-01", "WCS_PLC_D._03_WCS_TO");// 澶勭悊 2宸烽亾 绔欏彴浜嬩欢 鍏ョ┖
-
- //ConveyorLineInFinish(conveyorLine, "R02-002-027-011-01"); //鍐欏叆杈撻�佺嚎鍘诲悜
-
- //CheckForEmptyPallet2(conveyorLine, "PLC_WCS_D._02_PLC_EVENT", "PLC_WCS_D._02_PLC_LPN", "PLC_WCS_D._02_PLC_PUT", "R02-002-027-011-01"); //鍘熸潗鏂欏嚭搴� 璇诲彇鏉＄爜閫夊簱鍖哄嚭搴�
- //CheckForEmptyPallet2(conveyorLine, "PLC_WCS_D._04_PLC_EVENT", "PLC_WCS_D._04_PLC_LPN", "PLC_WCS_D._04_PLC_PUT", "R01-002-041-011-01"); //鍘熸潗鏂欏嚭搴� 璇诲彇鏉＄爜閫夊簱鍖哄嚭搴�
}
public void RequestInbound3(CommonConveyorLine conveyorLine)
@@ -249,70 +240,67 @@
}
//鏂扮殑宸烽亾鍒ゆ柇
- private void HandleEvent2(CommonConveyorLine conveyorLine, string eventTag, string barcodeTag, string writeTag)
+ private void HandleEvent2(CommonConveyorLine conveyorLine, string eventTag, string barcodeTag, string writeTag,string Platform)
{
byte events = conveyorLine.Communicator.Read<byte>(eventTag); // 璇诲彇浜嬩欢
- if (events == 1)
+ string barcode = conveyorLine.Communicator.Read<string>(barcodeTag).Trim(); // 璇诲彇鏉＄爜
+ if (events == 1 && barcode !="NoRead" && barcode !="" && barcode != null)
{
- string barcode = conveyorLine.Communicator.Read<string>(barcodeTag).Trim(); // 璇诲彇鏉＄爜
- if (barcode != "1" || barcode != "0")
+ WebResponseContent content = _taskService.ToPlatform(barcode);
+ if (content != null)
{
- WebResponseContent content = _taskService.ToPlatform(barcode);
- if (content != null)
+ if (content.Status)
{
- if (content.Status)
+ if (content.Data != null)
{
- if (content.Data != null)
+ if (content.Data.ToString() == "1")
{
- if (content.Data.ToString() == "1")
+ if (conveyorLine.Communicator.Read<string>("PLC_WCS_C._03_PLC_LPN") == "")
{
- if (conveyorLine.Communicator.Read<string>("PLC_WCS_C._03_PLC_LPN") == "")
+ // 鍐欏叆鍘诲悜2鍙峰爢鍨涙満
+ bool result = conveyorLine.Communicator.Write(writeTag, (byte)1); //鍐欏叆鍘诲悜涓洪暱宸烽亾
+ if (result)
{
- // 鍐欏叆鍘诲悜2鍙峰爢鍨涙満
- bool result = conveyorLine.Communicator.Write(writeTag, (byte)1); //鍐欏叆鍘诲悜涓洪暱宸烽亾
- if (result)
- {
- WriteLog.GetLog("PLC鏃ュ織").Write($"鏉＄爜{barcode}锛屽啓鍏ュ幓鍚戯細1", "鍘诲悜");
- }
- }
- else
- {
- WriteLog.GetLog("PLC鏃ュ織").Write($"鍘熷洜锛氬綋鍓嶉渶鍐欏叆鍘诲悜锛�1锛屼絾璇诲彇杈撻�佺嚎鈥滃爢鍨涙満鍙栬揣绔欏彴鈥濇湁鏉＄爜锛屼笉鍙啓鍏�", "鍘诲悜澶辫触淇℃伅");
+ wcs_PLCto01(Platform + "锛氭垚鍔熶俊鎭�", "鎴愬姛", $"鏉＄爜{barcode},鍐欏叆鍘诲悜锛�1");
}
}
- else if (content.Data.ToString() == "3")
+ else
{
-
- if (conveyorLine.Communicator.Read<string>("PLC_WCS_B._01_PLC_LPN") == "")
- {
- // 鍐欏叆鍘诲悜2鍙峰爢鍨涙満
- bool result = conveyorLine.Communicator.Write(writeTag, (byte)3); //鍐欏叆鍘诲悜涓虹煭宸烽亾
- if (result)
- {
- WriteLog.GetLog("PLC鏃ュ織").Write($"鏉＄爜{barcode},鍐欏叆鍘诲悜锛�3", "鍘诲悜");
- }
- }
- else
- {
- WriteLog.GetLog("PLC鏃ュ織").Write($"鍘熷洜锛氬綋鍓嶉渶鍐欏叆鍘诲悜锛�3锛屼絾璇诲彇杈撻�佺嚎鈥滃爢鍨涙満鍙栬揣绔欏彴鈥濇湁鏉＄爜锛屼笉鍙啓鍏�", "鍘诲悜澶辫触淇℃伅");
- }
+ wcs_PLCto01(Platform + "锛氶敊璇俊鎭�", "閿欒", $"鏉＄爜锛歿barcode}锛屽師鍥狅細褰撳墠闇�鍐欏叆鍘诲悜锛�1锛屼絾璇诲彇杈撻�佺嚎鈥滃爢鍨涙満鍙栬揣绔欏彴鈥濇湁鏉＄爜锛屼笉鍙啓鍏ュ幓鍚�");
}
}
- }
- else
- {
- WriteLog.GetLog("PLC鏃ュ織").Write($"澶辫触淇℃伅锛歿content.Message}", "鍘诲悜澶辫触淇℃伅");
+ else if (content.Data.ToString() == "3")
+ {
+
+ if (conveyorLine.Communicator.Read<string>("PLC_WCS_B._01_PLC_LPN") == "")
+ {
+ // 鍐欏叆鍘诲悜2鍙峰爢鍨涙満
+ bool result = conveyorLine.Communicator.Write(writeTag, (byte)3); //鍐欏叆鍘诲悜涓虹煭宸烽亾
+ if (result)
+ {
+ wcs_PLCto01(Platform + "锛氭垚鍔熶俊鎭�", "鎴愬姛", $"鏉＄爜{barcode},鍐欏叆鍘诲悜锛�3");
+ }
+ }
+ else
+ {
+ wcs_PLCto01(Platform + "锛氶敊璇俊鎭�", "閿欒", $"鏉＄爜锛歿barcode}锛屽師鍥狅細褰撳墠闇�鍐欏叆鍘诲悜锛�3锛屼絾璇诲彇杈撻�佺嚎鈥滃爢鍨涙満鍙栬揣绔欏彴鈥濇湁鏉＄爜锛屼笉鍙啓鍏ュ幓鍚�");
+ }
+ }
+ else
+ {
+ wcs_PLCto01(Platform + "锛氶敊璇俊鎭�", "閿欒", $"鏉＄爜锛歿barcode}锛岀敵璇峰叆搴撳け璐ワ細鏈幏鍙栧埌鍘诲悜");
+ }
}
}
- }
- else if (barcode == "1")
- {
- bool result = conveyorLine.Communicator.Write(writeTag, (byte)1); //绌烘墭鍘诲悜
- if (result)
+ else
{
- WriteLog.GetLog("PLC鏃ュ織").Write("绌烘墭鍏ュ簱锛屽啓鍏ュ幓鍚戯細1", "鍘诲悜");
+ wcs_PLCto01(Platform + "锛氶敊璇俊鎭�", "閿欒", $"鏉＄爜锛歿barcode}锛岀敵璇峰叆搴撳け璐ワ細{content.Message}");
}
}
+ }
+ else
+ {
+ wcs_PLCto01(Platform+"锛氶敊璇俊鎭�", "閿欒", $"璇诲彇鍒拌緭閫佺嚎,鐢宠锛歿events},鏉＄爜锛歿barcode}");
}
}
@@ -320,63 +308,26 @@
private void CheckForEmptyPallet(CommonConveyorLine conveyorLine, string eventTag, string barcodeTag, string plcput, string Loc)
{
- try
- {
- Byte events = conveyorLine.Communicator.Read<Byte>(eventTag); // 璇诲彇浜嬩欢
- if (events == 1) //1涓虹┖锛�0涓烘湁
- {
- string barcode = conveyorLine.Communicator.Read<string>(barcodeTag); // 璇诲彇鏉＄爜
- if (barcode == "")
- {
- WriteLog.GetLog("PLC鏃ュ織鍑哄簱鏃ュ織").Write($"璇诲彇鍒板嚭搴撳彛琛ョ┖鎵樹俊鍙凤細{events}", "闇�瑕佺┖鎵�");
- // 鐢熸垚鍫嗗灈鏈哄彇绌烘墭浠诲姟
- byte plcputts = conveyorLine.Communicator.Read<byte>(plcput);
- if (plcputts != 1)
- {
- if ((_taskService.RequestWMSTask2("", Loc)).Status)
- {
- WriteLog.GetLog("PLC鏃ュ織鍑哄簱鏃ュ織").Write($"宸茬敓鎴愮┖鎵樺嚭搴撲换鍔★細{events}", "闇�瑕佺┖鎵�");
- }
- else
- {
- WriteLog.GetLog("PLC鏃ュ織鍑哄簱鏃ュ織").Write($"鏈敓鎴愮┖鎵樺嚭搴撲换鍔★細{events}", "闇�瑕佺┖鎵�");
- }
- }
- }
- }
- }
- catch (Exception ex)
- {
-
- throw;
- }
- }
-
- //鐢ㄤ簬鍒ゆ柇鏄惁鍑虹┖鎵� D鍖�
- private void CheckForEmptyPallet2(CommonConveyorLine conveyorLine, string eventTag, string barcodeTag, string plcput, string Loc)
- {
Byte events = conveyorLine.Communicator.Read<Byte>(eventTag); // 璇诲彇浜嬩欢
if (events == 1) //1涓虹┖锛�0涓烘湁
{
- string barcode = conveyorLine.Communicator.Read<string>(barcodeTag); // 璇诲彇鏉＄爜
- if (barcode != "1" || barcode != "0")
+ WebResponseContent content = _taskService.RequestWMSTask2("", Loc);
+ // 鐢熸垚鍫嗗灈鏈哄彇绌烘墭浠诲姟
+ if (content.Status)
{
- WriteLog.GetLog("PLC鏃ュ織鍑哄簱鏃ュ織").Write($"璇诲彇鍒板師鏉愭枡鍑哄簱淇℃伅锛屾潯鐮佷俊鎭細{barcode}", "鍘熸潗鏂欏嚭搴�");
-
- byte outCount = conveyorLine.Communicator.Read<byte>(plcput);
- if ((_taskService.RequestWMSTask3(barcode, outCount, Loc)).Status)
- {
- //鍐欏叆杈撻�佺嚎娓呴櫎淇℃伅
- WriteLog.GetLog("PLC鏃ュ織鍑哄簱鏃ュ織").Write($"宸茬敓鎴愬師鏉愭枡鍑哄簱浠诲姟锛屾潯鐮佷俊鎭細{barcode}", "鍘熸潗鏂欏嚭搴�");
- }
- else
- {
- WriteLog.GetLog("PLC鏃ュ織鍑哄簱鏃ュ織").Write($"鏈敓鎴愬師鏉愭枡鍑哄簱浠诲姟锛屾潯鐮佷俊鎭細{barcode}", "鍘熸潗鏂欏嚭搴�");
- }
+ wcs_PLCto02(Loc + "锛氭垚鍔熶俊鎭�", "鎴愬姛", $"宸茬敓鎴愮┖鎵樺嚭搴撲换鍔�");
+ }
+ else
+ {
+ wcs_PLCto02(Loc + "锛氶敊璇俊鎭�", "閿欒", $"鏈敓鎴愮┖鎵樺嚭搴撲换鍔★紝閿欒淇℃伅锛歿content.Message}");
}
}
-
+ else
+ {
+ wcs_PLCto02(Loc + "锛氶敊璇俊鎭�", "閿欒", $"璇诲彇鍒拌緭閫佺嚎,鐢宠锛歿events}");
+ }
}
+
//鐢ㄤ簬鍒ゆ柇鍏ュ簱绔欏彴
private void ProcessConveyorEvent(CommonConveyorLine conveyorLine, string eventTag, string barcodeTag, string taskCode, string writeTag)
@@ -384,41 +335,31 @@
byte eventStatus = conveyorLine.Communicator.Read<byte>(eventTag);
if (eventStatus == 1)
{
- WriteLog.GetLog("PLC鍏ュ簱绔欏彴鏃ュ織").Write($"璇诲彇鍒拌緭閫佺嚎鐢宠鍏ュ簱淇℃伅EVENT涓猴細{eventStatus}锛岀珯鍙扮紪鍙蜂负锛歿taskCode}", "绔欏彴淇℃伅");
string barcode = conveyorLine.Communicator.Read<string>(barcodeTag).Trim();
- /*if(barcode == "1")
- {
- string currentTime = DateTime.Now.ToString("HHmmss");
- barcode = "KTP" + currentTime;
-
- }*/
if (barcode != null)
{
bool result = conveyorLine.Communicator.Write(writeTag, (byte)0);
- /*if(taskCode== "R01-003-042-001-01")
- {
- if ((_taskService.ToPlatform(barcode)).Status)
- {
- WriteLog.GetLog("PLC鍏ュ簱绔欏彴鏃ュ織").Write($"缁勭洏鎴愬姛锛岀珯鍙扮紪鍙蜂负锛歿taskCode}", "绔欏彴淇℃伅");
- }
- }*/
- // 鎷垮彇鎵樼洏鏉＄爜鐢宠鍏ュ簱淇℃伅
+ wcs_PLCto03("鍘诲悜娓呴櫎", "鎴愬姛", $"鍦板潃锛歿writeTag}锛屽幓鍚戞竻闄や负锛�0");
WebResponseContent content = _taskService.RequestWMSTask(barcode, taskCode); // 鐢宠鍏ュ簱锛岀敓鎴愬爢鍨涙満浠诲姟
if (content != null)
{
if (content.Status)
{
- WriteLog.GetLog("PLC鍏ュ簱绔欏彴鏃ュ織").Write($"鐢宠鍏ュ簱鎴愬姛锛岀珯鍙扮紪鍙蜂负锛歿taskCode}", "绔欏彴淇℃伅");
+ wcs_PLCto03(taskCode + "锛氭垚鍔熶俊鎭�", "鎴愬姛", $"鏉＄爜锛歿barcode}锛岀敵璇峰叆搴撴垚鍔�");
}
else
{
- WriteLog.GetLog("PLC鍏ュ簱绔欏彴鏃ュ織").Write($"鐢宠鍏ュ簱澶辫触锛岀珯鍙扮紪鍙蜂负锛歿taskCode}", "绔欏彴淇℃伅");
+ wcs_PLCto03(taskCode+ "锛氶敊璇俊鎭�", "閿欒", $"鏉＄爜锛歿barcode}锛岀敵璇峰叆搴撳け璐ワ紝閿欒淇℃伅锛歿content.Message}");
}
+ }
+ else
+ {
+ wcs_PLCto03(taskCode + "锛氶敊璇俊鎭�", "閿欒", $"鏉＄爜锛歿barcode}锛岀敵璇峰叆搴撳け璐ワ紝閿欒淇℃伅content杩斿洖鍊间负绌�");
}
}
else
{
- WriteLog.GetLog("PLC鍏ュ簱绔欏彴鏃ュ織").Write($"璇诲彇鍒拌緭閫佺嚎淇℃伅涓虹┖锛岀珯鍙扮紪鍙蜂负锛歿taskCode}", "绔欏彴淇℃伅");
+ wcs_PLCto03(taskCode + "锛氶敊璇俊鎭�", "閿欒", $"璇诲彇鍒拌緭閫佺嚎淇℃伅涓虹┖");
}
}
else if (eventStatus == 6)
@@ -428,61 +369,59 @@
WebResponseContent content = _taskService.RequestWMSTask4();
if (content != null)
{
- if (content.Status)
+ if(content.Status && content.Data != null)
{
- if (content.Data != null)
+ if (content.Data.ToString() == "1")
{
- if (content.Data.ToString() == "1")
+ if (conveyorLine.Communicator.Write(writeTag, (byte)1))
{
- if (conveyorLine.Communicator.Read<string>("PLC_WCS_D._01_PLC_LPN") == "")
- {
- if (conveyorLine.Communicator.Write(writeTag, (byte)1))
- {
- WriteLog.GetLog("PLC鍏ュ簱绔欏彴鏃ュ織").Write($"鍐欏叆鎴愬姛锛屽幓鍚戯細1锛岀珯鍙扮紪鍙蜂负锛歿taskCode}", "绌烘墭鍏ュ簱鍘诲悜");
- }
- else
- {
- WriteLog.GetLog("PLC鍏ュ簱绔欏彴鏃ュ織").Write($"鍐欏叆澶辫触锛屽幓鍚戯細1锛岀珯鍙扮紪鍙蜂负锛歿taskCode}", "绌烘墭鍏ュ簱鍘诲悜");
- }
- }
+ wcs_PLCto04(taskCode + "锛氭垚鍔熶俊鎭�", "鎴愬姛", $"鍐欏叆鎴愬姛锛屽幓鍚戯細1");
}
- else if (content.Data.ToString() == "3")
+ else
{
-
- if (conveyorLine.Communicator.Read<string>("PLC_WCS_D._03_PLC_LPN") == "")
- {
- if (conveyorLine.Communicator.Write(writeTag, (byte)3))
- {
- WriteLog.GetLog("PLC鍏ュ簱绔欏彴鏃ュ織").Write($"鍐欏叆鎴愬姛锛屽幓鍚戯細3锛岀珯鍙扮紪鍙蜂负锛歿taskCode}", "绌烘墭鍏ュ簱鍘诲悜");
- }
- else
- {
- WriteLog.GetLog("PLC鍏ュ簱绔欏彴鏃ュ織").Write($"鍐欏叆澶辫触锛屽幓鍚戯細3锛岀珯鍙扮紪鍙蜂负锛歿taskCode}", "绌烘墭鍏ュ簱鍘诲悜");
- }
- }
+ wcs_PLCto04(taskCode + "锛氶敊璇俊鎭�", "閿欒", $"鍐欏叆澶辫触锛屽幓鍚戯細1");
}
}
+ else if (content.Data.ToString() == "3")
+ {
+
+ if (conveyorLine.Communicator.Write(writeTag, (byte)3))
+ {
+ wcs_PLCto04(taskCode + "锛氭垚鍔熶俊鎭�", "鎴愬姛", $"鍐欏叆鎴愬姛锛屽幓鍚戯細3");
+ }
+ else
+ {
+ wcs_PLCto04(taskCode + "锛氶敊璇俊鎭�", "閿欒", $"鍐欏叆澶辫触锛屽幓鍚戯細3");
+ }
+ }
+ else
+ {
+ wcs_PLCto04(taskCode + "锛氶敊璇俊鎭�", "閿欒", $"鏈壘鍒板啓鍏ュ幓鍚�");
+ }
}
+ else
+ {
+ wcs_PLCto04(taskCode + "锛氶敊璇俊鎭�", "閿欒", $"鐢宠鍏ュ簱澶辫触锛岄敊璇俊鎭細{content.Message}");
+ }
+ }
+ else
+ {
+ wcs_PLCto04(taskCode + "锛氶敊璇俊鎭�", "閿欒", $"鐢宠鍏ュ簱澶辫触锛岄敊璇俊鎭細content杩斿洖鍊间负绌�");
}
}
else if (taskCode == "R01-003-041-011-01")
{
- if (conveyorLine.Communicator.Read<string>("PLC_WCS_D._03_PLC_LPN") == "")
+ if (conveyorLine.Communicator.Write(writeTag, (byte)1))
{
- if (conveyorLine.Communicator.Write(writeTag, (byte)1))
- {
- WriteLog.GetLog("PLC鍏ュ簱绔欏彴鏃ュ織").Write($"鍐欏叆鎴愬姛锛屽幓鍚戯細1锛岀珯鍙扮紪鍙蜂负锛歿taskCode}", "绌烘墭鍏ュ簱鍘诲悜");
- }
- else
- {
- WriteLog.GetLog("PLC鍏ュ簱绔欏彴鏃ュ織").Write($"鍐欏叆澶辫触锛屽幓鍚戯細1锛岀珯鍙扮紪鍙蜂负锛歿taskCode}", "绌烘墭鍏ュ簱鍘诲悜");
- }
+ wcs_PLCto04(taskCode + "锛氭垚鍔熶俊鎭�", "鎴愬姛", $"鍐欏叆澶辫触锛屽幓鍚戯細1");
}
-
+ else
+ {
+ wcs_PLCto04(taskCode + "锛氶敊璇俊鎭�", "閿欒", $"鍐欏叆澶辫触锛屽幓鍚戯細1");
+ }
+
}
-
-
}
}
public bool SetLine(CommonConveyorLine conveyorLine, string DeviceProDataBlock, byte Pali)
@@ -502,5 +441,27 @@
{
WriteLog.GetLog("鍫嗗灈鏈轰笌plc浜や簰淇″彿").Write($"绔欏彴缂栧彿锛歿sourceAddress},淇℃伅锛歿message}", $"{sourceAddress}");
}
+
+
+
+
+ public void wcs_PLCto01(string SCLLinStack, string Logtype, string Magessadd)
+ {
+ WriteLog.Write_Log("涓�妤兼壂鐮佺珯鍙�", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+ }
+
+ public void wcs_PLCto02(string SCLLinStack, string Logtype, string Magessadd)
+ {
+ WriteLog.Write_Log("涓�妤艰ˉ绌烘墭", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+ }
+ public void wcs_PLCto03(string SCLLinStack, string Logtype, string Magessadd)
+ {
+ WriteLog.Write_Log("鍏ュ簱绔欏彴", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+ }
+ public void wcs_PLCto04(string SCLLinStack, string Logtype, string Magessadd)
+ {
+ WriteLog.Write_Log("椤舵ゼ绌烘墭鍥炲簱", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+ }
+
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 545f443..a25dcbe 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -116,25 +116,6 @@
private Dt_Task? GetTask(CommonStackerCrane commonStackerCrane)
{
Dt_Task task;
- /*if (commonStackerCrane.LastTaskType == null)
- {
- task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
- }
- else
- {
- if (commonStackerCrane.LastTaskType.GetValueOrDefault().GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
- {
- task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
- if (task == null)
- {
- task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
- }
- }
- else
- {
- task = _taskService.QueryStackerCraneOutTask(commonStackerCrane.DeviceCode);
- }
- }*/
task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);
if (task != null && task.TaskType== (int)TaskOutboundTypeEnum.Outbound)
@@ -187,24 +168,6 @@
}
- /*if (OutTaskStationIsOccupied(task) != null)
- {
- return task;
- }
- else
- {
- List<string> otherOutStaionCodes = _routerService.QueryNextRoutes(commonStackerCrane.DeviceCode, task.NextAddress).Select(x => x.ChildPosi).ToList();
-
- List<Dt_Task> tasks = _taskService.QueryStackerCraneOutTasks(commonStackerCrane.DeviceCode);
- foreach (var item in tasks)
- {
- if (OutTaskStationIsOccupied(task) != null)
- {
- return task;
- }
- }
- //task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
- }*/
}
return task;
}
@@ -301,22 +264,24 @@
if (Releasespermitted(commonStackerCrane, task.TargetAddress,true)) //鍐欏叆鍫嗗灈鏈哄厑璁告斁璐т俊
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鍏佽鏀捐揣淇″彿鎴愬姛锛歵rue", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+
+ wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", "鍐欏叆鍫嗗灈鏈哄厑璁告斁璐т俊鍙锋垚鍔燂細true");
}
else
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鍏佽鏀捐揣淇″彿澶辫触", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+ wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", "鍐欏叆鍫嗗灈鏈哄厑璁告斁璐т俊鍙峰け璐�");
}
}
else
{
if (Releasespermitted(commonStackerCrane, task.TargetAddress,false)) //鍐欏叆鍫嗗灈鏈轰笉鍏佽鏀捐揣淇�
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満涓嶅厑璁告斁璐т俊鍙锋垚鍔燂細false", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+
+ wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", "鍐欏叆鍫嗗灈鏈轰笉鍏佽鏀捐揣淇″彿鎴愬姛锛歠alse");
}
else
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満涓嶅厑璁告斁璐т俊鍙峰け璐�", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+ wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", "鍐欏叆鍫嗗灈鏈轰笉鍏佽鏀捐揣淇″彿澶辫触");
}
}
}
@@ -339,11 +304,12 @@
byte PLCtost = (byte)task.PLCTo;
if (PLCSignal2(conveyorLine, task.TargetAddress, "W_Destination", PLCtost))
{
- WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ幓鍚戞垚鍔燂紝鍘诲悜涓猴細{PLCtost}", $"鍑烘枡鍙ｅ幓鍚�");
+
+ wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍘诲悜鎴愬姛锛屽幓鍚戜负锛歿PLCtost}");
}
else
{
- WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ幓鍚戝け璐ワ紝鍘诲悜涓猴細{PLCtost}", $"鍑烘枡鍙ｅ幓鍚�");
+ wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍘诲悜澶辫触锛屽幓鍚戜负锛歿PLCtost}");
}
}
@@ -369,36 +335,35 @@
byte PLCtost2 = 0;
if (PLCSignal2(conveyorLine, task.TargetAddress, "W_Destination", PLCtost2))
{
- WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氭竻闄ゅ幓鍚戞垚鍔�", $"鍑烘枡鍙ｅ幓鍚�");
-
+ wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"娓呴櫎鍘诲悜鎴愬姛");
}
else
{
- WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氭竻闄ゅ幓鍚戝け璐�", $"鍑烘枡鍙ｅ幓鍚�");
+ wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"娓呴櫎鍘诲悜澶辫触");
}
// 娓呴櫎杈撻�佺嚎
if (PLCSignal(conveyorLine, task.TargetAddress, (byte)0))
{
- WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙锋垚鍔�", $"鍑烘枡鍙ｅ幓鍚�");
+ wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙锋垚鍔�");
}
else
{
- WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�", $"鍑烘枡鍙ｅ幓鍚�");
+ wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�");
}
//鍫嗗灈鏈哄啓瀹屾垚
if (Releasespermitted4(commonStackerCrane, task.TargetAddress, true))
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鏀句笅淇″彿鎴愬姛锛歵rue", $"鍑烘枡鍙ｅ幓鍚�");
+ wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈烘斁涓嬩俊鍙锋垚鍔燂細true");
}
else
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鏀句笅淇″彿澶辫触:true", $"鍑烘枡鍙ｅ幓鍚�");
+ wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�:true");
}
}
else
{
- WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬幓鍚戞瘮瀵逛笉涓�鑷达紝杈撻�佺嚎鍘诲悜涓猴細{PLCwcstost}锛寃cs鍐欏叆鍘诲悜涓猴細{task.PLCTo}", $"鍑烘枡鍙ｅ幓鍚�");
+ wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍘诲悜姣斿涓嶄竴鑷达紝杈撻�佺嚎鍘诲悜涓猴細{PLCwcstost}锛寃cs鍐欏叆鍘诲悜涓猴細{task.PLCTo}");
}
}
}
@@ -408,21 +373,23 @@
// 娓呴櫎杈撻�佺嚎
if (PLCSignal(conveyorLine, task.TargetAddress, 0))
{
- WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙锋垚鍔�", $"锛堟斁璐э級璇诲彇{task.TargetAddress}");
+ wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙锋垚鍔�");
}
else
{
- WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�", $"锛堟斁璐э級璇诲彇{task.TargetAddress}");
+ wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎娓呴櫎-鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�");
}
//鍫嗗灈鏈哄啓瀹屾垚
if (Releasespermitted4(commonStackerCrane, task.TargetAddress, true))
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鏀句笅淇″彿鎴愬姛锛歵rue", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+
+ wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈烘斁涓嬩俊鍙锋垚鍔燂細true");
}
else
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ュ爢鍨涙満鏀句笅淇″彿澶辫触:true", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+ wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�:true");
+
}
}
@@ -433,24 +400,25 @@
// 娓呴櫎杈撻�佺嚎
if (PLCSignal(conveyorLine, task.TargetAddress, 0))
{
- WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氭湭璇诲彇鍒拌緭閫佺嚎鍙嶉鍫嗗灈鏈哄畬鎴愬弽棣堜俊鍙凤紝閲嶇疆涓�0", $"锛堟斁璐э級璇诲彇{task.TargetAddress}");
+ wcs_PLCto06(task.TargetAddress + "鎴愬姛淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栧埌杈撻�佺嚎鍙嶉鍫嗗灈鏈哄畬鎴愬弽棣堜俊鍙凤紝閲嶇疆涓�0");
}
else
{
- WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氭湭璇诲彇鍒拌緭閫佺嚎鍙嶉鍫嗗灈鏈哄畬鎴愬弽棣堜俊鍙凤紝閲嶇疆涓�0", $"锛堟斁璐э級璇诲彇{task.TargetAddress}");
+ wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栧埌杈撻�佺嚎鍙嶉鍫嗗灈鏈哄畬鎴愬弽棣堜俊鍙凤紝閲嶇疆涓�0澶辫触");
}
}
}
}
else
{
- WriteLog.GetLog("杈撻�佺嚎").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氬啓鍏ヨ緭閫佺嚎0-鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+ wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎0-鍫嗗灈鏈烘斁涓嬩俊鍙峰け璐�");
+
}
}
}
else
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.TargetAddress},浠诲姟鍙凤細{task.TaskNum},淇℃伅锛氭湭璇诲彇鍒板爢鍨涙満鏀捐揣瀹屾垚淇″彿", $"锛堟斁璐э級鍐欏叆{task.TargetAddress}");
+ wcs_PLCto06(task.TargetAddress + "閿欒淇℃伅", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栧埌鍫嗗灈鏈烘斁璐у畬鎴愪俊鍙�");
}
}
}
@@ -473,22 +441,23 @@
{
if (Releasespermitted2(commonStackerCrane, task.SourceAddress,true)) //鍐欏叆鍫嗗灈鏈哄厑璁稿彇璐т俊鍙�
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍏佽鍙栬揣淇″彿鎴愬姛:true", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ wcs_PLCto05(task.SourceAddress+"锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈哄厑璁稿彇璐т俊鍙锋垚鍔�:true");
}
else
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍏佽鍙栬揣淇″彿澶辫触", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ wcs_PLCto05(task.SourceAddress + "锛氶敊璇俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈哄厑璁稿彇璐т俊鍙锋垚鍔�:true");
}
}
else
{
if (Releasespermitted2(commonStackerCrane, task.SourceAddress,false)) //鍐欏叆鍫嗗灈鏈哄厑璁稿彇璐т俊鍙�
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇鍒拌緭閫佺嚎鍏佽鍙栬揣淇″彿锛屽啓鍏ュ爢鍨涙満鍏佽鍙栬揣淇″彿鎴愬姛:false", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ wcs_PLCto05(task.SourceAddress + "锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栧埌杈撻�佺嚎鍏佽鍙栬揣淇″彿锛屽啓鍏ュ爢鍨涙満鍏佽鍙栬揣淇″彿鎴愬姛:false");
}
else
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇鍒拌緭閫佺嚎鍏佽鍙栬揣淇″彿锛屽啓鍏ュ爢鍨涙満鍏佽鍙栬揣淇″彿澶辫触", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+
+ wcs_PLCto05(task.SourceAddress + "锛氶敊璇俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栧埌杈撻�佺嚎鍏佽鍙栬揣淇″彿锛屽啓鍏ュ爢鍨涙満鍏佽鍙栬揣淇″彿澶辫触");
}
}
@@ -498,6 +467,7 @@
{
if(PLCSignal2(conveyorLine, task.SourceAddress, "W_StackerCranePicked", 1)) //鍐欏叆杈撻�佺嚎鍙栬揣瀹屾垚淇″彿
{
+ wcs_PLCto05(task.SourceAddress + "锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎鍙栬揣瀹屾垚淇″彿锛屽湴鍧�锛歿conveyorLine}");
DeviceProDTO? deviceProDTO2 = GetDeviceProDTO(conveyorLine, task.SourceAddress, "R_StackerCranePicked"); //杈撻�佺嚎鍗忚鎵捐鍙栦俊鍙�
if (deviceProDTO != null)
{
@@ -507,31 +477,36 @@
//鍐欏叆缁欏爢鍨涙満锛岃緭閫佺嚎鐨� 鍫嗗灈鏈哄彇璧� 淇″彿
if(Releasespermitted3(commonStackerCrane, task.SourceAddress,true))
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍙栬蛋淇″彿鎴愬姛:true", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ wcs_PLCto05(task.SourceAddress + "锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈哄彇璧颁俊鍙锋垚鍔�:true");
}
else
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍙栬蛋淇″彿澶辫触:true", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ wcs_PLCto05(task.SourceAddress + "锛氶敊璇俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈哄彇璧颁俊鍙峰け璐�:true");
}
}
else
{
if (Releasespermitted3(commonStackerCrane, task.SourceAddress,false))
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇杈撻�佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿鎴愬姛:false", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ wcs_PLCto05(task.SourceAddress + "锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栬緭閫佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿鎴愬姛:false");
}
else
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇杈撻�佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿澶辫触:false", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ wcs_PLCto05(task.SourceAddress + "锛氶敊璇俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栬緭閫佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿澶辫触:false");
}
}
}
+ }
+ else
+ {
+ wcs_PLCto05(task.SourceAddress + "锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎鍙栬揣瀹屾垚淇″彿澶辫触锛屽湴鍧�锛歿conveyorLine}");
}
}
else
{
if (PLCSignal2(conveyorLine, task.SourceAddress, "W_StackerCranePicked", 0)) //鍐欏叆杈撻�佺嚎娓呴櫎淇″彿
{
+ wcs_PLCto05(task.SourceAddress + "锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎娓呴櫎淇″彿鎴愬姛锛屽湴鍧�锛歿conveyorLine}");
DeviceProDTO? deviceProDTO2 = GetDeviceProDTO(conveyorLine, task.SourceAddress, "R_StackerCranePicked"); //杈撻�佺嚎鍗忚鎵捐鍙栦俊鍙�
if (deviceProDTO != null)
{
@@ -541,25 +516,29 @@
//鍐欏叆缁欏爢鍨涙満锛岃緭閫佺嚎鐨� 鍫嗗灈鏈哄彇璧� 淇″彿
if (Releasespermitted3(commonStackerCrane, task.SourceAddress, false))
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍙栬蛋淇″彿鎴愬姛:true", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ wcs_PLCto05(task.SourceAddress + "锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈哄彇璧颁俊鍙锋垚鍔�:true");
}
else
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氬啓鍏ュ爢鍨涙満鍙栬蛋淇″彿澶辫触:true", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ wcs_PLCto05(task.SourceAddress + "锛氶敊璇俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆鍫嗗灈鏈哄彇璧颁俊鍙峰け璐�:true");
}
}
else
{
if (Releasespermitted3(commonStackerCrane, task.SourceAddress, false))
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇杈撻�佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿鎴愬姛:false", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ wcs_PLCto05(task.SourceAddress + "锛氭垚鍔熶俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栬緭閫佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿鎴愬姛:false");
}
else
{
- WriteLog.GetLog("鍫嗗灈鏈轰俊鍙�").Write($"绔欏彴缂栧彿锛歿task.SourceAddress},淇℃伅锛氭湭璇诲彇杈撻�佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿澶辫触:false", $"锛堝彇璐э級鍐欏叆{task.SourceAddress}");
+ wcs_PLCto05(task.SourceAddress + "锛氶敊璇俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鏈鍙栬緭閫佺嚎鐨勫爢鍨涙満鍙栬蛋淇″彿锛屽啓鍏ュ爢鍨涙満鍙栬蛋淇″彿澶辫触:false");
}
}
}
+ }
+ else
+ {
+ wcs_PLCto05(task.SourceAddress + "锛氶敊璇俊鎭�", $"浠诲姟鍙凤細{task.TaskNum}锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"鍐欏叆杈撻�佺嚎娓呴櫎淇″彿澶辫触锛屽湴鍧�锛歿conveyorLine}");
}
}
}
@@ -1219,5 +1198,15 @@
}
return stackerCraneTaskCommand;
}
+
+
+ public void wcs_PLCto05(string SCLLinStack, string Logtype, string Magessadd)
+ {
+ WriteLog.Write_Log("鍏ュ簱浜や簰淇℃伅", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+ }
+ public void wcs_PLCto06(string SCLLinStack, string Logtype, string Magessadd)
+ {
+ WriteLog.Write_Log("鍑哄簱浜や簰淇℃伅", SCLLinStack, Logtype, new { 淇℃伅 = Magessadd });
+ }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll"
index 35366ee..ebc26d2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb"
index f69da3a..bf549cf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll"
index 74efde9..a7b5d1c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb"
index fc9e673..d928f4b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Tasks.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Tasks.dll"
index 78f3365..30e5968 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Tasks.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Tasks.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Tasks.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Tasks.pdb"
index 27d5f81..1e8a47e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Tasks.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Tasks.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache"
index 04dea4e..5213cf8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.dll"
index 78f3365..30e5968 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.pdb"
index 27d5f81..1e8a47e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/ref/WIDESEAWCS_Tasks.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/ref/WIDESEAWCS_Tasks.dll"
index 1dfb1fd..f740879 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/ref/WIDESEAWCS_Tasks.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/ref/WIDESEAWCS_Tasks.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/refint/WIDESEAWCS_Tasks.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/refint/WIDESEAWCS_Tasks.dll"
index 1dfb1fd..f740879 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/refint/WIDESEAWCS_Tasks.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/refint/WIDESEAWCS_Tasks.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/config/buttons.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/config/buttons.js"
index 3a1f49b..08ce1f0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/config/buttons.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/config/buttons.js"
@@ -145,9 +145,10 @@
}
},
{
- name: "鎵� 鍔� 瀹� 鎴�",
+ name: "浠� 鍔� 瀹� 鎴�",
icon: '',
class: '',
+ type:'success',
value: 'TaskHandCancel',
onClick: function () {
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/api/http.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/api/http.js"
index dc1acaf..6e895cd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/api/http.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/api/http.js"
@@ -11,18 +11,19 @@
let loadingInstance;
let loadingStatus = false;
+let loadbaseUrl='http://127.0.0.1:9290';
if (process.env.NODE_ENV == 'development') {
- axios.defaults.baseURL = 'http://10.50.11.65:8098';
- //axios.defaults.baseURL = 'http://127.0.0.1:9290';
+ //axios.defaults.baseURL = 'http://10.50.11.65:8098';
+ axios.defaults.baseURL = loadbaseUrl;
}
else if (process.env.NODE_ENV == 'debug') {
- axios.defaults.baseURL = 'http://10.50.11.65:8098';
- //axios.defaults.baseURL = 'http://127.0.0.1:9290';
+ //axios.defaults.baseURL = 'http://10.50.11.65:8098';
+ axios.defaults.baseURL = loadbaseUrl;
}
else if (process.env.NODE_ENV == 'production') {
- axios.defaults.baseURL = 'http://10.50.11.65:8098';
- //axios.defaults.baseURL = 'http://127.0.0.1:9290';
+ //axios.defaults.baseURL = 'http://10.50.11.65:8098';
+ axios.defaults.baseURL = loadbaseUrl;
}
if (!axios.defaults.baseURL.endsWith('/')) {
axios.defaults.baseURL+="/";
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
index c60206e..aaef5cf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/taskinfo/task.js"
@@ -17,18 +17,13 @@
methods: {
//涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
onInit() {
- let TaskHandCancelBtn = this.buttons.find(x => x.value == 'TaskHandCancel');
- if (TaskHandCancelBtn) {
- TaskHandCancelBtn.onClick = function () {
- this.$message.success('鑷畾涔夋寜閽偣鍑讳簨浠�');
- }
- }
- let TaskHandCompletedBtn = this.buttons.find(x => x.value == 'TaskHandCompleted');
+ let TaskHandCompletedBtn = this.buttons.find(x => x.value == 'TaskHandCancel');
if (TaskHandCompletedBtn) {
TaskHandCompletedBtn.onClick = function () {
let rows = this.$refs.table.getSelected();
if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
- this.$confirm("鏄惁纭畾瑕佹墜鍔ㄥ畬鎴愶紝鎵嬪姩瀹屾垚鍚庤鍒犻櫎WCS绯荤粺涓殑浠诲姟锛�", "鎻愮ず", {
+ if (rows.length > 1) return this.$error("鍙兘閫夋嫨涓�鏉℃暟鎹�!");
+ this.$confirm("鏄惁纭畾瑕佹墜鍔ㄥ畬鎴愶紒锛侊紒", "鎻愮ず", {
// iconClass:"el-icon-success",//el-icon-remove鑷畾涔夊浘鏍囨牱寮�
confirmButtonText: "纭",//纭鎸夐挳鏂囧瓧鏇存崲
cancelButtonText: "鍙栨秷",//鍙栨秷鎸夐挳鏂囧瓧鏇存崲
@@ -38,7 +33,7 @@
}).then(() => {
var param = rows[0].taskNum;
this.http
- .get("api/Task/TaskCompleted?taskNum=" + param, "鏁版嵁澶勭悊涓�...")
+ .get("api/Task/TaskCompleted?taskNum=" + param+"&HowWorks=1", "鏁版嵁澶勭悊涓�...")
.then((x) => {
if (x.status) {
this.$Message.success('浠诲姟鎵嬪姩瀹屾垚鎴愬姛.');
@@ -57,34 +52,30 @@
if (btnHandOutbound != null) {
btnHandOutbound.onClick = () => {
let rows = this.$refs.table.getSelected();
- if (rows.length == 0) {
- return this.$error("璇烽�夋嫨鏁版嵁!");
- } else {
-
-
- this.$confirm("鏄惁纭畾瑕佸彇娑堜换鍔★紝鍙栨秷鍚庤鍒犻櫎WCS绯荤粺涓殑浠诲姟锛�", "鎻愮ず", {
- // iconClass:"el-icon-success",//el-icon-remove鑷畾涔夊浘鏍囨牱寮�
- confirmButtonText: "纭",//纭鎸夐挳鏂囧瓧鏇存崲
- cancelButtonText: "鍙栨秷",//鍙栨秷鎸夐挳鏂囧瓧鏇存崲
- // cancelBtn:"鍙栨秷",//鍙栨秷鎸夐挳鏂囧瓧鏇存崲
- showClose: true,//鏄惁鏄剧ず鍙充笂瑙掑叧闂寜閽�
- type: "warning",//鎻愮ず绫诲瀷 success:鎴愬姛/info:淇℃伅/warning:璀﹀憡/error:鎶ラ敊
- }).then(() => {
- var ids = rows.map(x => {
- return x.taskNum
- })
- this.http
- .get("api/Task/Cancelinventory?TaskNum=" + ids, "鏁版嵁澶勭悊涓�...")
- .then((x) => {
- if (x.status) {
- this.$Message.success('鎴愬姛.');
- this.refresh();
- } else {
- return this.$error(x.message);
- }
- });
- })
- }
+ if (rows.length == 0) return this.$error("璇烽�夋嫨鏁版嵁!");
+ if (rows.length > 1) return this.$error("鍙兘閫夋嫨涓�鏉℃暟鎹�!");
+ this.$confirm("鏄惁纭畾瑕佸彇娑堜换鍔★紒锛侊紒", "鎻愮ず", {
+ // iconClass:"el-icon-success",//el-icon-remove鑷畾涔夊浘鏍囨牱寮�
+ confirmButtonText: "纭",//纭鎸夐挳鏂囧瓧鏇存崲
+ cancelButtonText: "鍙栨秷",//鍙栨秷鎸夐挳鏂囧瓧鏇存崲
+ // cancelBtn:"鍙栨秷",//鍙栨秷鎸夐挳鏂囧瓧鏇存崲
+ showClose: true,//鏄惁鏄剧ず鍙充笂瑙掑叧闂寜閽�
+ type: "warning",//鎻愮ず绫诲瀷 success:鎴愬姛/info:淇℃伅/warning:璀﹀憡/error:鎶ラ敊
+ }).then(() => {
+ var ids = rows.map(x => {
+ return x.taskNum
+ })
+ this.http
+ .get("api/Task/Cancelinventory?TaskNum=" + ids, "鏁版嵁澶勭悊涓�...")
+ .then((x) => {
+ if (x.status) {
+ this.$Message.success('鎴愬姛.');
+ this.refresh();
+ } else {
+ return this.$error(x.message);
+ }
+ });
+ })
}
}
},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin"
index d19282f..fe748a2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin"
index 4a7a6b1..4aeeb92 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2"
index 88e88e0..aff05db 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4548147b-4e8e-4be7-a8f9-6cbcf5a1fd9c.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/035920fb-ad11-424e-b799-260b561f7c3d.vsidx"
similarity index 92%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4548147b-4e8e-4be7-a8f9-6cbcf5a1fd9c.vsidx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/035920fb-ad11-424e-b799-260b561f7c3d.vsidx"
index 59d75f2..90e0cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4548147b-4e8e-4be7-a8f9-6cbcf5a1fd9c.vsidx"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/035920fb-ad11-424e-b799-260b561f7c3d.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/12c301a2-bfb6-4763-8116-6fbd6da39f5f.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/12c301a2-bfb6-4763-8116-6fbd6da39f5f.vsidx"
deleted file mode 100644
index 84f44aa..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/12c301a2-bfb6-4763-8116-6fbd6da39f5f.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3a71424b-e03e-4581-9e9d-ac05e24a5ddb.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3a71424b-e03e-4581-9e9d-ac05e24a5ddb.vsidx"
new file mode 100644
index 0000000..ca419a9
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/3a71424b-e03e-4581-9e9d-ac05e24a5ddb.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/475c722e-4a7d-4ce9-b2cb-8439f297a32b.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/475c722e-4a7d-4ce9-b2cb-8439f297a32b.vsidx"
new file mode 100644
index 0000000..fd26973
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/475c722e-4a7d-4ce9-b2cb-8439f297a32b.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d09cd45d-2748-4158-94ad-8c23a7f59c5f.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d09cd45d-2748-4158-94ad-8c23a7f59c5f.vsidx"
deleted file mode 100644
index 49ac20d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d09cd45d-2748-4158-94ad-8c23a7f59c5f.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d0cf6bc7-4d07-43cc-959a-20c3d66cd7d9.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d0cf6bc7-4d07-43cc-959a-20c3d66cd7d9.vsidx"
deleted file mode 100644
index bc15e1d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d0cf6bc7-4d07-43cc-959a-20c3d66cd7d9.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d18985ab-0a96-4d3a-9b51-0ec52888d2ce.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d18985ab-0a96-4d3a-9b51-0ec52888d2ce.vsidx"
new file mode 100644
index 0000000..b8b951b
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d18985ab-0a96-4d3a-9b51-0ec52888d2ce.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
index 681a51b..965536d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
index 05ae3d3..6195df7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/obj/Debug/net6.0/WIDESEA_BasicRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/obj/Debug/net6.0/WIDESEA_BasicRepository.csproj.AssemblyReference.cache"
index d632a45..87a2a75 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/obj/Debug/net6.0/WIDESEA_BasicRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/obj/Debug/net6.0/WIDESEA_BasicRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/obj/Debug/net6.0/WIDESEA_BasicService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/obj/Debug/net6.0/WIDESEA_BasicService.csproj.AssemblyReference.cache"
index 0fb4475..fa26c2b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/obj/Debug/net6.0/WIDESEA_BasicService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/obj/Debug/net6.0/WIDESEA_BasicService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Debug/net6.0/WIDESEA_DTO.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Debug/net6.0/WIDESEA_DTO.csproj.AssemblyReference.cache"
index c60e3d0..508b752 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Debug/net6.0/WIDESEA_DTO.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Debug/net6.0/WIDESEA_DTO.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/obj/Debug/net6.0/WIDESEA_IBasicRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/obj/Debug/net6.0/WIDESEA_IBasicRepository.csproj.AssemblyReference.cache"
index c91f338..5382c7c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/obj/Debug/net6.0/WIDESEA_IBasicRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/obj/Debug/net6.0/WIDESEA_IBasicRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/obj/Debug/net6.0/WIDESEA_IBasicService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/obj/Debug/net6.0/WIDESEA_IBasicService.csproj.AssemblyReference.cache"
index 26d22f7..c89a3de 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/obj/Debug/net6.0/WIDESEA_IBasicService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/obj/Debug/net6.0/WIDESEA_IBasicService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/obj/Debug/net6.0/WIDESEA_IInboundRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/obj/Debug/net6.0/WIDESEA_IInboundRepository.csproj.AssemblyReference.cache"
index da2d08f..be7497b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/obj/Debug/net6.0/WIDESEA_IInboundRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundRepository/obj/Debug/net6.0/WIDESEA_IInboundRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/obj/Debug/net6.0/WIDESEA_IInboundService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/obj/Debug/net6.0/WIDESEA_IInboundService.csproj.AssemblyReference.cache"
index 0ed1fe9..bbdd53e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/obj/Debug/net6.0/WIDESEA_IInboundService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/obj/Debug/net6.0/WIDESEA_IInboundService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/obj/Debug/net6.0/WIDESEA_IOutboundRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/obj/Debug/net6.0/WIDESEA_IOutboundRepository.csproj.AssemblyReference.cache"
index 0b4aa37..f450be5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/obj/Debug/net6.0/WIDESEA_IOutboundRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundRepository/obj/Debug/net6.0/WIDESEA_IOutboundRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/obj/Debug/net6.0/WIDESEA_IOutboundService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/obj/Debug/net6.0/WIDESEA_IOutboundService.csproj.AssemblyReference.cache"
index 617582f..528f4a4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/obj/Debug/net6.0/WIDESEA_IOutboundService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/obj/Debug/net6.0/WIDESEA_IOutboundService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/obj/Debug/net6.0/WIDESEA_IRecordRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/obj/Debug/net6.0/WIDESEA_IRecordRepository.csproj.AssemblyReference.cache"
index 5b9c408..deb2e66 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/obj/Debug/net6.0/WIDESEA_IRecordRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordRepository/obj/Debug/net6.0/WIDESEA_IRecordRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/obj/Debug/net6.0/WIDESEA_IRecordService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/obj/Debug/net6.0/WIDESEA_IRecordService.csproj.AssemblyReference.cache"
index c615eae..6edf73a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/obj/Debug/net6.0/WIDESEA_IRecordService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/obj/Debug/net6.0/WIDESEA_IRecordService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/obj/Debug/net6.0/WIDESEA_IStockRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/obj/Debug/net6.0/WIDESEA_IStockRepository.csproj.AssemblyReference.cache"
index 5b9c408..deb2e66 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/obj/Debug/net6.0/WIDESEA_IStockRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockRepository/obj/Debug/net6.0/WIDESEA_IStockRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/obj/Debug/net6.0/WIDESEA_IStockService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/obj/Debug/net6.0/WIDESEA_IStockService.csproj.AssemblyReference.cache"
index f97e114..cd1e260 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/obj/Debug/net6.0/WIDESEA_IStockService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IStockService/obj/Debug/net6.0/WIDESEA_IStockService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/obj/Debug/net6.0/WIDESEA_ISystemRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/obj/Debug/net6.0/WIDESEA_ISystemRepository.csproj.AssemblyReference.cache"
index 35c5c3c..a39e911 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/obj/Debug/net6.0/WIDESEA_ISystemRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemRepository/obj/Debug/net6.0/WIDESEA_ISystemRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/obj/Debug/net6.0/WIDESEA_ISystemService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/obj/Debug/net6.0/WIDESEA_ISystemService.csproj.AssemblyReference.cache"
index 8684068..bb8889e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/obj/Debug/net6.0/WIDESEA_ISystemService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ISystemService/obj/Debug/net6.0/WIDESEA_ISystemService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoRepository/obj/Debug/net6.0/WIDESEA_ITaskInfoRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoRepository/obj/Debug/net6.0/WIDESEA_ITaskInfoRepository.csproj.AssemblyReference.cache"
index 054aba7..2ecd703 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoRepository/obj/Debug/net6.0/WIDESEA_ITaskInfoRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoRepository/obj/Debug/net6.0/WIDESEA_ITaskInfoRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
index 8c6afb6..965e756 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
@@ -40,7 +40,7 @@
WebResponseContent GenerateInboundTask(string stationCode, int taskType, string palletCode);
WebResponseContent InboundRequest(string stationCode, string palletCode);
- WebResponseContent TaskCompleted(int taskNum);
+ WebResponseContent TaskCompleted(int taskNum, int HowWorks);
WebResponseContent GenerateOutboundTask(int orderDetailId, List<StockSelectViewDTO> stockSelectViews);
@@ -62,7 +62,7 @@
WebResponseContent Empty_outbound(GenerateInv generate);
WebResponseContent Queryinventory(GenerateInv generate);
WebResponseContent PalletQueryinventory();
- WebResponseContent RelocationTaskCompleted(GenerateInv2 generate);
+ WebResponseContent RelocationInTaskCompleted(Dt_Task task);
WebResponseContent Rawmaterialout(GenerateInv3 generate);
WebResponseContent Cancelinventory(int taskNum);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.dll"
index 1260ce3..e209cd5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.pdb"
index b8eb8ef..bce1ed7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/WIDESEA_ITaskInfoService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/WIDESEA_ITaskInfoService.csproj.AssemblyReference.cache"
index b15708d..8bae37d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/WIDESEA_ITaskInfoService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/WIDESEA_ITaskInfoService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/WIDESEA_ITaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/WIDESEA_ITaskInfoService.dll"
index 1260ce3..e209cd5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/WIDESEA_ITaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/WIDESEA_ITaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/WIDESEA_ITaskInfoService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/WIDESEA_ITaskInfoService.pdb"
index b8eb8ef..bce1ed7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/WIDESEA_ITaskInfoService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/WIDESEA_ITaskInfoService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/ref/WIDESEA_ITaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/ref/WIDESEA_ITaskInfoService.dll"
index 1f74ec1..b42e763 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/ref/WIDESEA_ITaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/ref/WIDESEA_ITaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/refint/WIDESEA_ITaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/refint/WIDESEA_ITaskInfoService.dll"
index 1f74ec1..b42e763 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/refint/WIDESEA_ITaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/obj/Debug/net6.0/refint/WIDESEA_ITaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/obj/Debug/net6.0/WIDESEA_InboundRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/obj/Debug/net6.0/WIDESEA_InboundRepository.csproj.AssemblyReference.cache"
index 112bf34..933cec0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/obj/Debug/net6.0/WIDESEA_InboundRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundRepository/obj/Debug/net6.0/WIDESEA_InboundRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/obj/Debug/net6.0/WIDESEA_InboundService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/obj/Debug/net6.0/WIDESEA_InboundService.csproj.AssemblyReference.cache"
index ea4514f..8ed910f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/obj/Debug/net6.0/WIDESEA_InboundService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/obj/Debug/net6.0/WIDESEA_InboundService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Debug/net6.0/WIDESEA_Model.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Debug/net6.0/WIDESEA_Model.csproj.AssemblyReference.cache"
index 4743318..06859c2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Debug/net6.0/WIDESEA_Model.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Debug/net6.0/WIDESEA_Model.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/obj/Debug/net6.0/WIDESEA_OutboundRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/obj/Debug/net6.0/WIDESEA_OutboundRepository.csproj.AssemblyReference.cache"
index 59886a2..21854af 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/obj/Debug/net6.0/WIDESEA_OutboundRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundRepository/obj/Debug/net6.0/WIDESEA_OutboundRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/obj/Debug/net6.0/WIDESEA_OutboundService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/obj/Debug/net6.0/WIDESEA_OutboundService.csproj.AssemblyReference.cache"
index 8472a1b..7b0af91 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/obj/Debug/net6.0/WIDESEA_OutboundService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/obj/Debug/net6.0/WIDESEA_OutboundService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordRepository/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordRepository/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordRepository/obj/Debug/net6.0/WIDESEA_RecordRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordRepository/obj/Debug/net6.0/WIDESEA_RecordRepository.csproj.AssemblyReference.cache"
index 145d267..a1fb355 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordRepository/obj/Debug/net6.0/WIDESEA_RecordRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordRepository/obj/Debug/net6.0/WIDESEA_RecordRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/obj/Debug/net6.0/WIDESEA_RecordService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/obj/Debug/net6.0/WIDESEA_RecordService.csproj.AssemblyReference.cache"
index 6607b15..c182199 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/obj/Debug/net6.0/WIDESEA_RecordService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/obj/Debug/net6.0/WIDESEA_RecordService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/obj/Debug/net6.0/WIDESEA_StockRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/obj/Debug/net6.0/WIDESEA_StockRepository.csproj.AssemblyReference.cache"
index e5e1683..4161169 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/obj/Debug/net6.0/WIDESEA_StockRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/obj/Debug/net6.0/WIDESEA_StockRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs"
index c1920c5..64d0815 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs"
@@ -4,6 +4,7 @@
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using SqlSugar;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
@@ -13,6 +14,7 @@
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
+using WIDESEA_Core.Utilities;
using WIDESEA_DTO.Stock;
using WIDESEA_IBasicRepository;
using WIDESEA_IRecordRepository;
@@ -20,6 +22,7 @@
using WIDESEA_IStockRepository;
using WIDESEA_IStockService;
using WIDESEA_Model.Models;
+using WIDESEA_StockRepository;
namespace WIDESEA_StockService
{
@@ -184,6 +187,67 @@
residueQuantity = needQuantity;
return outStocks;
}
+ /// <summary>
+ /// 鍒犻櫎鏁版嵁
+ /// </summary>
+ /// <param name="keys">涓婚敭鏁扮粍</param>
+ /// <returns></returns>
+ public virtual WebResponseContent DeleteData(object[] keys)
+ {
+ try
+ {
+
+ List<Dt_StockInfo> stockList = BaseDal.QureyDataByIds(keys);
+
+ var stokd= stockList.Where(x=>x.StockStatus != (int)StockStatusEmun.缁勭洏鏆傚瓨).ToList();
+ if(stokd.Count > 0 )
+ {
+ return WebResponseContent.Instance.Error("鍒犻櫎澶辫触锛佸彧鑳藉垹闄も�滅粍鐩樻殏瀛樷�濈殑淇℃伅");
+ }
+ foreach (var item in stockList)
+ {
+ var stodet=_stockRepository.StockInfoDetailRepository.QueryFirst(x => x.StockId == item.Id);
+ _stockRepository.StockInfoDetailRepository.DeleteData(stodet);
+ }
+
+ if (typeof(Dt_StockInfodt).GetNavigatePro() == null)
+ return BaseDal.DeleteDataByIds(keys) ? WebResponseContent.Instance.OK() : WebResponseContent.Instance.Error();
+ else
+ {
+ if (keys != null)
+ {
+ Type detailType = typeof(Dt_StockInfodt).GetDetailType();
+ string name = typeof(Dt_StockInfodt).GetMainIdByDetail();
+ List<object> dynamicDelKeys = new List<object>();
+
+ for (int i = 0; i < keys.Length; i++)
+ {
+ dynamicDelKeys.Add(keys[i]);
+ }
+ ((SqlSugarClient)BaseDal.Db).BeginTran();
+
+ if (dynamicDelKeys.Count > 0)
+ BaseDal.Db.Deleteable<object>().AS(detailType.Name).Where($"{name} in (@id)", new { id = dynamicDelKeys.ToArray() }).ExecuteCommandHasChange();
+
+ BaseDal.DeleteDataByIds(keys);
+
+ ((SqlSugarClient)BaseDal.Db).CommitTran();
+
+ return WebResponseContent.Instance.OK();
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error("鍙傛暟閿欒");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ ((SqlSugarClient)BaseDal.Db).RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+
//瀵煎嚭
public override WebResponseContent Export(PageDataOptions options)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_StockService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_StockService.dll"
index 7137879..b2ab405 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_StockService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_StockService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_StockService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_StockService.pdb"
index 2930c79..1de6c9f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_StockService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/bin/Debug/net6.0/WIDESEA_StockService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/WIDESEA_StockService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/WIDESEA_StockService.csproj.AssemblyReference.cache"
index 2e94a2b..3afc96e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/WIDESEA_StockService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/WIDESEA_StockService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/WIDESEA_StockService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/WIDESEA_StockService.dll"
index 7137879..b2ab405 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/WIDESEA_StockService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/WIDESEA_StockService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/WIDESEA_StockService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/WIDESEA_StockService.pdb"
index 2930c79..1de6c9f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/WIDESEA_StockService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/WIDESEA_StockService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/ref/WIDESEA_StockService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/ref/WIDESEA_StockService.dll"
index 5fe1e1b..c1643df 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/ref/WIDESEA_StockService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/ref/WIDESEA_StockService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/refint/WIDESEA_StockService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/refint/WIDESEA_StockService.dll"
index 5fe1e1b..c1643df 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/refint/WIDESEA_StockService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/obj/Debug/net6.0/refint/WIDESEA_StockService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/obj/Debug/net6.0/WIDESEA_SystemRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/obj/Debug/net6.0/WIDESEA_SystemRepository.csproj.AssemblyReference.cache"
index a575c8c..bc596c0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/obj/Debug/net6.0/WIDESEA_SystemRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemRepository/obj/Debug/net6.0/WIDESEA_SystemRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/obj/Debug/net6.0/WIDESEA_SystemService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/obj/Debug/net6.0/WIDESEA_SystemService.csproj.AssemblyReference.cache"
index 83b5750..d503a63 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/obj/Debug/net6.0/WIDESEA_SystemService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/obj/Debug/net6.0/WIDESEA_SystemService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/obj/Debug/net6.0/WIDESEA_TaskInfoRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/obj/Debug/net6.0/WIDESEA_TaskInfoRepository.csproj.AssemblyReference.cache"
index db5cf83..ff13459 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/obj/Debug/net6.0/WIDESEA_TaskInfoRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/obj/Debug/net6.0/WIDESEA_TaskInfoRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
index 65d8860..48b9dfe 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
@@ -489,6 +489,7 @@
loca.Add(newLocation);
loca.Add(locationInfos);
_basicService.LocationInfoService.UpdateData(loca);
+ BaseDal.AddData(dt_Task);
_unitOfWorkManage.CommitTran();
return content = WebResponseContent.Instance.OK(data: dt_Task);
}
@@ -1285,6 +1286,7 @@
BaseDal.DeleteData(task);
BaseDal.DeleteAndMoveIntoHty(task, OperateType.浜哄伐鍒犻櫎);
WriteLog.GetLog("浠诲姟鏃ュ織").Write($"鍑哄簱浠诲姟鍙栨秷鎴愬姛锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"浠诲姟鍙栨秷");
+ WebResponseContent webResponseContent = HttpHelper.Post<WebResponseContent>(ReceiveWCSTask, task.TaskNum, "浠诲姟鍒犻櫎");
return content = WebResponseContent.Instance.Error($"鍑哄簱浠诲姟鍙栨秷鎴愬姛");
}
@@ -1307,6 +1309,42 @@
BaseDal.DeleteData(task);
BaseDal.DeleteAndMoveIntoHty(task, OperateType.浜哄伐鍒犻櫎);
WriteLog.GetLog("浠诲姟鏃ュ織").Write($"鍏ュ簱浠诲姟鍙栨秷鎴愬姛锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"浠诲姟鍙栨秷");
+ WebResponseContent webResponseContent = HttpHelper.Post<WebResponseContent>(ReceiveWCSTask, task.TaskNum, "浠诲姟鍒犻櫎");
+ return content = WebResponseContent.Instance.Error($"鍏ュ簱浠诲姟鍙栨秷鎴愬姛");
+ }
+ else if (task.TaskType == (int)TaskTypeEnum.RelocationIn) //搴撳唴绉诲簱
+ {
+ //澶勭悊鍑哄簱鐨勯�昏緫
+ Dt_LocationInfo locationinfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
+ if (locationinfo.LocationStatus == LocationStatusEnum.Lock.ObjToInt() || locationinfo.LocationStatus == LocationStatusEnum.PalletLock.ObjToInt())
+ {
+ locationinfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ }
+ _basicService.LocationInfoService.Repository.UpdateData(locationinfo);
+
+ Dt_LocationInfo locationinfo2 = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
+ if (locationinfo2.LocationStatus == LocationStatusEnum.Lock.ObjToInt())
+ {
+ locationinfo2.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ }
+ if (locationinfo2.LocationStatus == LocationStatusEnum.PalletLock.ObjToInt())
+ {
+ locationinfo2.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
+ }
+ _basicService.LocationInfoService.Repository.UpdateData(locationinfo2);
+ Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == task.PalletCode);
+ stockInfo.StockStatus = (int)StockStatusEmun.宸插叆搴�;
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ Dt_StockInfoDetail stocktdetail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == stockInfo.Id);
+ if (stocktdetail != null)
+ {
+ stocktdetail.Status = (int)StockStatusEmun.宸插叆搴�;
+ _stockService.StockInfoDetailService.Repository.UpdateData(stocktdetail);
+ }
+ BaseDal.DeleteData(task);
+ BaseDal.DeleteAndMoveIntoHty(task, OperateType.浜哄伐鍒犻櫎);
+ WriteLog.GetLog("浠诲姟鏃ュ織").Write($"鍏ュ簱浠诲姟鍙栨秷鎴愬姛锛屾墭鐩樻潯鐮侊細{task.PalletCode}", $"浠诲姟鍙栨秷");
+ WebResponseContent webResponseContent = HttpHelper.Post<WebResponseContent>(ReceiveWCSTask, task.TaskNum, "浠诲姟鍒犻櫎");
return content = WebResponseContent.Instance.Error($"鍏ュ簱浠诲姟鍙栨秷鎴愬姛");
}
else
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 5e8fb03..60367bd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -22,6 +22,7 @@
using Org.BouncyCastle.Asn1.Tsp;
using SqlSugar;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
@@ -80,13 +81,13 @@
_taskHtyService = taskHtyService;
_locationInfoService = locationInfoService;
}
-
+ public string ReceiveWCSTask = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWCSTask"];
/// <summary>
/// 浠诲姟瀹屾垚
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
- public WebResponseContent TaskCompleted(int taskNum)
+ public WebResponseContent TaskCompleted(int taskNum,int HowWorks)
{
try
{
@@ -94,6 +95,10 @@
if (task == null)
{
return WebResponseContent.Instance.Error("鏈壘鍒颁换鍔′俊鎭�");
+ }
+ if (HowWorks == 1)
+ {
+ WebResponseContent webResponseContent = HttpHelper.Post<WebResponseContent>(ReceiveWCSTask, task.TaskNum, "浠诲姟鍒犻櫎");
}
MethodInfo? methodInfo = GetType().GetMethod(((TaskTypeEnum)task.TaskType) + "TaskCompleted");
if (methodInfo != null)
@@ -305,12 +310,12 @@
return WebResponseContent.Instance.OK();
}
- public WebResponseContent RelocationTaskCompleted(GenerateInv2 generate)
+ public WebResponseContent RelocationInTaskCompleted(Dt_Task task)
{
- Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(generate.PalletCode);
+ Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);
- Dt_LocationInfo locationpoint = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == generate.SourceAddress);
- Dt_LocationInfo locationEnd = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == generate.TargetAddress);
+ Dt_LocationInfo locationpoint = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
+ Dt_LocationInfo locationEnd = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
List<Dt_LocationInfo> loca = new List<Dt_LocationInfo>();
stockInfo.LocationCode = locationEnd.LocationCode;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.dll"
index 1260ce3..e209cd5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.pdb"
index b8eb8ef..bce1ed7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_ITaskInfoService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_TaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_TaskInfoService.dll"
index d73cabc..793d9d3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_TaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_TaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_TaskInfoService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_TaskInfoService.pdb"
index c9e6218..82ad9b2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_TaskInfoService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/bin/Debug/net6.0/WIDESEA_TaskInfoService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/WIDESEA_TaskInfoService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/WIDESEA_TaskInfoService.csproj.AssemblyReference.cache"
index dee3d71..ba3ade3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/WIDESEA_TaskInfoService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/WIDESEA_TaskInfoService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/WIDESEA_TaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/WIDESEA_TaskInfoService.dll"
index d73cabc..793d9d3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/WIDESEA_TaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/WIDESEA_TaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/WIDESEA_TaskInfoService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/WIDESEA_TaskInfoService.pdb"
index c9e6218..82ad9b2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/WIDESEA_TaskInfoService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/WIDESEA_TaskInfoService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/ref/WIDESEA_TaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/ref/WIDESEA_TaskInfoService.dll"
index c1915b5..0c76185 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/ref/WIDESEA_TaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/ref/WIDESEA_TaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/refint/WIDESEA_TaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/refint/WIDESEA_TaskInfoService.dll"
index c1915b5..0c76185 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/refint/WIDESEA_TaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/obj/Debug/net6.0/refint/WIDESEA_TaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
index 3e5b703..32b1612 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
@@ -25,9 +25,9 @@
}
[HttpGet, Route("TaskCompleted"), AllowAnonymous]
- public WebResponseContent TaskCompleted(int taskNum)
+ public WebResponseContent TaskCompleted(int taskNum,int HowWorks)
{
- return Service.TaskCompleted(taskNum);
+ return Service.TaskCompleted(taskNum, HowWorks);
}
[HttpPost, Route("GenerateOutboundTask")]
@@ -104,10 +104,10 @@
{
return Service.PalletQueryinventory();
}
- [HttpPost, Route("RelocationTaskCompleted"), AllowAnonymous]
- public WebResponseContent RelocationTaskCompleted([FromBody] GenerateInv2 generate)
+ [HttpPost, Route("RelocationInTaskCompleted"), AllowAnonymous]
+ public WebResponseContent RelocationInTaskCompleted([FromBody] Dt_Task task)
{
- return Service.RelocationTaskCompleted(generate);
+ return Service.RelocationInTaskCompleted(task);
}
[HttpPost, Route("Rawmaterialout"), AllowAnonymous]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
index b25368f..7db2f95 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
@@ -1,5 +1,5 @@
{
- //"urls": "http://*:9290", //web鏈嶅姟绔彛锛屽鏋滅敤IIS閮ㄧ讲锛屾妸杩欎釜鍘绘帀
+ "urls": "http://*:9290", //web鏈嶅姟绔彛锛屽鏋滅敤IIS閮ㄧ讲锛屾妸杩欎釜鍘绘帀
"Logging": {
"LogLevel": {
"Default": "Information",
@@ -9,11 +9,12 @@
"dics": "inOrderType,outOrderType,inboundState,createType,enableEnum,enableStatusEnum,locationStatusEnum,locationTypeEnum,taskTypeEnum,taskStatusEnum,outboundStatusEnum,orderDetailStatusEnum,stockStatusEmun,stockChangeType,outStockStatus,InventoryMaterialType,InventoryMaterialStatus",
"AllowedHosts": "*",
"ReceiveWMSTask": "http://10.50.11.65:8099/api/Task/ReceiveTask", //鏌ヨ搴撳瓨锛岀‘璁ゅ叆搴撶珯鍙�
+ "ReceiveWCSTask": "http://127.0.0.1:9291/api/Task/ReceiveWCSTask", //鏌ヨ搴撳瓨锛岀‘璁ゅ叆搴撶珯鍙�
"ConnectionStringsEncryption": false,
"MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
//杩炴帴瀛楃涓�
//"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
- "ConnectionString": "Data Source=10.50.11.65;Initial Catalog=WIDESEAWMS_JSLK;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_JSLK;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//璺ㄥ煙
"Cors": {
"PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_Core.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_Core.dll"
index 5e0c5d6..81c5f0c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_Core.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_Core.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_Core.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_Core.pdb"
index 6a9dc76..1cb5cd3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_Core.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_Core.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_ITaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_ITaskInfoService.dll"
index 1260ce3..e209cd5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_ITaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_ITaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_ITaskInfoService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_ITaskInfoService.pdb"
index b8eb8ef..bce1ed7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_ITaskInfoService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_ITaskInfoService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_StockService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_StockService.dll"
index 7137879..b2ab405 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_StockService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_StockService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_StockService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_StockService.pdb"
index 2930c79..1de6c9f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_StockService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_StockService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_TaskInfoService.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_TaskInfoService.dll"
index d73cabc..793d9d3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_TaskInfoService.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_TaskInfoService.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_TaskInfoService.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_TaskInfoService.pdb"
index c9e6218..82ad9b2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_TaskInfoService.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_TaskInfoService.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_WMSServer.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_WMSServer.dll"
index 9ccdd67..d94a0ec 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_WMSServer.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_WMSServer.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_WMSServer.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_WMSServer.pdb"
index 5b27a50..774b08c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_WMSServer.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/WIDESEA_WMSServer.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/appsettings.json"
index 03ce36f..7db2f95 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/appsettings.json"
@@ -1,5 +1,5 @@
{
- //"urls": "http://*:9290", //web鏈嶅姟绔彛锛屽鏋滅敤IIS閮ㄧ讲锛屾妸杩欎釜鍘绘帀
+ "urls": "http://*:9290", //web鏈嶅姟绔彛锛屽鏋滅敤IIS閮ㄧ讲锛屾妸杩欎釜鍘绘帀
"Logging": {
"LogLevel": {
"Default": "Information",
@@ -9,6 +9,7 @@
"dics": "inOrderType,outOrderType,inboundState,createType,enableEnum,enableStatusEnum,locationStatusEnum,locationTypeEnum,taskTypeEnum,taskStatusEnum,outboundStatusEnum,orderDetailStatusEnum,stockStatusEmun,stockChangeType,outStockStatus,InventoryMaterialType,InventoryMaterialStatus",
"AllowedHosts": "*",
"ReceiveWMSTask": "http://10.50.11.65:8099/api/Task/ReceiveTask", //鏌ヨ搴撳瓨锛岀‘璁ゅ叆搴撶珯鍙�
+ "ReceiveWCSTask": "http://127.0.0.1:9291/api/Task/ReceiveWCSTask", //鏌ヨ搴撳瓨锛岀‘璁ゅ叆搴撶珯鍙�
"ConnectionStringsEncryption": false,
"MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
//杩炴帴瀛楃涓�
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.csproj.AssemblyReference.cache"
index aa2835c..d3efb47 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.dll"
index 9ccdd67..d94a0ec 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.pdb" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.pdb"
index 5b27a50..774b08c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.pdb"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/WIDESEA_WMSServer.pdb"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/ref/WIDESEA_WMSServer.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/ref/WIDESEA_WMSServer.dll"
index 2acbb4f..34b0645 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/ref/WIDESEA_WMSServer.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/ref/WIDESEA_WMSServer.dll"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/refint/WIDESEA_WMSServer.dll" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/refint/WIDESEA_WMSServer.dll"
index 2acbb4f..34b0645 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/refint/WIDESEA_WMSServer.dll"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Debug/net6.0/refint/WIDESEA_WMSServer.dll"
Binary files differ
diff --git "a/\350\265\204\346\226\231\347\256\241\347\220\206/\351\200\232\344\277\241\345\215\217\350\256\256/\345\244\251\351\200\232\345\207\257\347\253\213WCS_PLC\345\215\217\350\256\256.xls" "b/\350\265\204\346\226\231\347\256\241\347\220\206/\351\200\232\344\277\241\345\215\217\350\256\256/\345\244\251\351\200\232\345\207\257\347\253\213WCS_PLC\345\215\217\350\256\256.xls"
new file mode 100644
index 0000000..81d7f41
--- /dev/null
+++ "b/\350\265\204\346\226\231\347\256\241\347\220\206/\351\200\232\344\277\241\345\215\217\350\256\256/\345\244\251\351\200\232\345\207\257\347\253\213WCS_PLC\345\215\217\350\256\256.xls"
Binary files differ
diff --git "a/\350\265\204\346\226\231\347\256\241\347\220\206/\351\200\232\344\277\241\345\215\217\350\256\256/\345\260\226\345\261\261\345\240\206\345\236\233\346\234\272\351\200\232\344\277\241\345\215\217\350\256\256 11-08\050\346\226\260\345\242\236\345\215\217\350\256\256\051.xlsx" "b/\350\265\204\346\226\231\347\256\241\347\220\206/\351\200\232\344\277\241\345\215\217\350\256\256/\345\260\226\345\261\261\345\240\206\345\236\233\346\234\272\351\200\232\344\277\241\345\215\217\350\256\256 11-08\050\346\226\260\345\242\236\345\215\217\350\256\256\051.xlsx"
new file mode 100644
index 0000000..535716f
--- /dev/null
+++ "b/\350\265\204\346\226\231\347\256\241\347\220\206/\351\200\232\344\277\241\345\215\217\350\256\256/\345\260\226\345\261\261\345\240\206\345\236\233\346\234\272\351\200\232\344\277\241\345\215\217\350\256\256 11-08\050\346\226\260\345\242\236\345\215\217\350\256\256\051.xlsx"
Binary files differ
diff --git "a/\350\265\204\346\226\231\347\256\241\347\220\206/\351\241\271\347\233\256\346\226\207\344\273\266/\345\244\251\351\200\232\345\207\257\347\253\213 \346\223\215\344\275\234\346\211\213\345\206\214.docx" "b/\350\265\204\346\226\231\347\256\241\347\220\206/\351\241\271\347\233\256\346\226\207\344\273\266/\345\244\251\351\200\232\345\207\257\347\253\213 \346\223\215\344\275\234\346\211\213\345\206\214.docx"
new file mode 100644
index 0000000..ca1c59a
--- /dev/null
+++ "b/\350\265\204\346\226\231\347\256\241\347\220\206/\351\241\271\347\233\256\346\226\207\344\273\266/\345\244\251\351\200\232\345\207\257\347\253\213 \346\223\215\344\275\234\346\211\213\345\206\214.docx"
Binary files differ
diff --git "a/\350\265\204\346\226\231\347\256\241\347\220\206/\351\241\271\347\233\256\346\226\207\344\273\266/\345\260\226\345\261\261\345\240\206\345\236\233\346\234\272\351\200\232\344\277\241\345\215\217\350\256\256 11-08\0502\051.xlsx" "b/\350\265\204\346\226\231\347\256\241\347\220\206/\351\241\271\347\233\256\346\226\207\344\273\266/\345\260\226\345\261\261\345\240\206\345\236\233\346\234\272\351\200\232\344\277\241\345\215\217\350\256\256 11-08\0502\051.xlsx"
new file mode 100644
index 0000000..535716f
--- /dev/null
+++ "b/\350\265\204\346\226\231\347\256\241\347\220\206/\351\241\271\347\233\256\346\226\207\344\273\266/\345\260\226\345\261\261\345\240\206\345\236\233\346\234\272\351\200\232\344\277\241\345\215\217\350\256\256 11-08\0502\051.xlsx"
Binary files differ
diff --git "a/\350\265\204\346\226\231\347\256\241\347\220\206/\351\241\271\347\233\256\346\226\207\344\273\266/\346\226\260\345\244\251\345\212\233\345\230\211\345\205\264\347\253\213\345\272\223\347\263\273\347\273\237\345\215\207\347\272\247\346\233\277\346\215\242-\345\260\226\345\261\261\344\273\223\350\247\243\345\206\263\346\226\271\346\241\210-V1.0-20241130.docx" "b/\350\265\204\346\226\231\347\256\241\347\220\206/\351\241\271\347\233\256\346\226\207\344\273\266/\346\226\260\345\244\251\345\212\233\345\230\211\345\205\264\347\253\213\345\272\223\347\263\273\347\273\237\345\215\207\347\272\247\346\233\277\346\215\242-\345\260\226\345\261\261\344\273\223\350\247\243\345\206\263\346\226\271\346\241\210-V1.0-20241130.docx"
new file mode 100644
index 0000000..b975a87
--- /dev/null
+++ "b/\350\265\204\346\226\231\347\256\241\347\220\206/\351\241\271\347\233\256\346\226\207\344\273\266/\346\226\260\345\244\251\345\212\233\345\230\211\345\205\264\347\253\213\345\272\223\347\263\273\347\273\237\345\215\207\347\272\247\346\233\277\346\215\242-\345\260\226\345\261\261\344\273\223\350\247\243\345\206\263\346\226\271\346\241\210-V1.0-20241130.docx"
Binary files differ
diff --git "a/\350\265\204\346\226\231\347\256\241\347\220\206/\351\241\271\347\233\256\346\226\207\344\273\266/\346\265\201\347\250\213\345\233\276.vsdx" "b/\350\265\204\346\226\231\347\256\241\347\220\206/\351\241\271\347\233\256\346\226\207\344\273\266/\346\265\201\347\250\213\345\233\276.vsdx"
new file mode 100644
index 0000000..68a01d5
--- /dev/null
+++ "b/\350\265\204\346\226\231\347\256\241\347\220\206/\351\241\271\347\233\256\346\226\207\344\273\266/\346\265\201\347\250\213\345\233\276.vsdx"
Binary files differ
--
Gitblit v1.9.3