From d944fda9f2fbf27d83e8fdf880e8fe5267e1f541 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期三, 04 六月 2025 17:24:13 +0800
Subject: [PATCH] 优化空托空箱入库兼容出库容器回库场景，修复货位容器绑定的类型丢失问题
---
HH.WCS.Mobox3.DSZSH.csproj | 136 +++++++++++++++++++--------------------------
1 files changed, 57 insertions(+), 79 deletions(-)
diff --git a/HH.WCS.Mobox3.DSZSH.csproj b/HH.WCS.Mobox3.DSZSH.csproj
index 40f6db6..12ce7fb 100644
--- a/HH.WCS.Mobox3.DSZSH.csproj
+++ b/HH.WCS.Mobox3.DSZSH.csproj
@@ -224,96 +224,76 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <Compile Include="App_Start\Config.cs" />
- <Compile Include="App_Start\SwaggerConfig.cs" />
- <Compile Include="Consts\AgvStateCode.cs" />
- <Compile Include="Consts\AgvStateName.cs" />
- <Compile Include="Consts\AreaName.cs" />
- <Compile Include="Consts\LockStateCode.cs" />
- <Compile Include="Consts\LockStateName.cs" />
- <Compile Include="Consts\SpotStateCode.cs" />
- <Compile Include="Consts\TaskName.cs" />
- <Compile Include="Controllers\DebugController.cs" />
- <Compile Include="Controllers\ErpController.cs" />
- <Compile Include="Controllers\MoboxController.cs" />
- <Compile Include="Controllers\AgvController.cs" />
+ <Compile Include="api\ApiHelper.cs" />
+ <Compile Include="api\ApiModel.cs" />
+ <Compile Include="api\DebugController.cs" />
+ <Compile Include="api\ErpController.cs" />
+ <Compile Include="api\MesController.cs" />
+ <Compile Include="api\MoboxController.cs" />
+ <Compile Include="api\AgvController.cs" />
<Compile Include="App_Start\SwaggerControllerDescProvider.cs" />
- <Compile Include="Models\DebugModel.cs" />
- <Compile Include="Dtos\Request\DebugRequest.cs" />
- <Compile Include="Dtos\Response\DebugResponse.cs" />
- <Compile Include="Helpers\AgvHelper.cs" />
- <Compile Include="Helpers\ExprHelper.cs" />
- <Compile Include="Helpers\PathHelper.cs" />
- <Compile Include="Helpers\ResultHelper.cs" />
- <Compile Include="Helpers\DbHelper.cs" />
- <Compile Include="Models\TN_CNTR_ITEM.cs" />
- <Compile Include="Models\TN_Check_Detail.cs" />
- <Compile Include="Models\TN_Check_Order.cs" />
- <Compile Include="Models\TN_Inbound_Order.cs" />
- <Compile Include="Models\TN_Order_Task.cs" />
- <Compile Include="Models\TN_Outbound_Order.cs" />
- <Compile Include="Models\TN_Outbound_Detail.cs" />
- <Compile Include="Models\TN_Shift_Detail.cs" />
- <Compile Include="Models\TN_Shift_Order.cs" />
- <Compile Include="ServiceCore\CheckCore.cs" />
- <Compile Include="ServiceCore\OutboundCore.cs" />
- <Compile Include="ServiceCore\ShiftCore.cs" />
- <Compile Include="Services\DebugService.cs" />
- <Compile Include="Devices\ProductionLineDevice.cs" />
- <Compile Include="Devices\ModbusHelper.cs" />
- <Compile Include="Devices\OpcUaHelper.cs" />
- <Compile Include="Devices\PlcHelper.cs" />
- <Compile Include="Devices\S7Helper.cs" />
- <Compile Include="Devices\TcpClient.cs" />
- <Compile Include="Devices\TcpServer.cs" />
- <Compile Include="Dispatch\GZRobot.cs" />
- <Compile Include="Dispatch\HanAo.cs" />
- <Compile Include="Dispatch\NDC.cs" />
- <Compile Include="ServiceCore\OfflineCore.cs" />
- <Compile Include="Dispatch\NDCApi.cs" />
- <Compile Include="Dtos\Request\AgvRequest.cs" />
- <Compile Include="Dtos\Request\MoboxRequest.cs" />
- <Compile Include="Dtos\Response\AgvResponse.cs" />
- <Compile Include="Dtos\Response\MoboxResponse.cs" />
- <Compile Include="Models\BaseModel.cs" />
- <Compile Include="Models\TN_CG_Detail.cs" />
- <Compile Include="Models\TN_CAR_IN.cs" />
- <Compile Include="Models\TN_Container.cs" />
- <Compile Include="Models\TN_Location.cs" />
- <Compile Include="Models\TN_Loc_Container.cs" />
- <Compile Include="Models\TN_WorkOrder.cs" />
- <Compile Include="Models\TN_Task.cs" />
- <Compile Include="Models\TN_Task_Action.cs" />
- <Compile Include="Helpers\DeviceProcess.cs" />
- <Compile Include="ServiceCore\TaskCore.cs" />
- <Compile Include="Controllers\WmsController.cs" />
- <Compile Include="Dispatch\HostToAGV.cs" />
- <Compile Include="Helpers\TaskHelper.cs" />
- <Compile Include="Services\AgvService.cs" />
- <Compile Include="Services\MoboxService.cs" />
- <Compile Include="Helpers\LogHelper.cs" />
- <Compile Include="Helpers\ContainerHelper.cs" />
- <Compile Include="Helpers\LocationHelper.cs" />
- <Compile Include="Helpers\SysHelper.cs" />
+ <Compile Include="core\Monitor.cs" />
+ <Compile Include="core\WCSCore.cs" />
+ <Compile Include="core\WMSCore.cs" />
+ <Compile Include="device\TcpClientHelper.cs" />
+ <Compile Include="models\TN_Record_Table.cs" />
+ <Compile Include="models\TN_RelocationList_Detail.cs" />
+ <Compile Include="models\TN_Relocation_List.cs" />
+ <Compile Include="models\TN_Shipping_Order.cs" />
+ <Compile Include="models\TN_SpotCheck_Detail.cs" />
+ <Compile Include="models\TN_Spot_Check.cs" />
+ <Compile Include="process\TaskProcess.cs" />
+ <Compile Include="util\SqlHelper.cs" />
+ <Compile Include="models\TN_Container_ItemType.cs" />
+ <Compile Include="models\TN_Outbound_Order.cs" />
+ <Compile Include="models\TN_Outbound_Detail.cs" />
+ <Compile Include="device\ProductionLineDevice.cs" />
+ <Compile Include="device\ModbusHelper.cs" />
+ <Compile Include="device\OpcUaHelper.cs" />
+ <Compile Include="device\PlcHelper.cs" />
+ <Compile Include="device\S7Helper.cs" />
+ <Compile Include="device\TcpClient.cs" />
+ <Compile Include="device\TcpServer.cs" />
+ <Compile Include="dispatch\GZRobot.cs" />
+ <Compile Include="dispatch\HanAo.cs" />
+ <Compile Include="dispatch\NDC.cs" />
+ <Compile Include="dispatch\NDCApi.cs" />
+ <Compile Include="models\BaseModel.cs" />
+ <Compile Include="models\TN_CG_Detail.cs" />
+ <Compile Include="models\TN_CAR_IN.cs" />
+ <Compile Include="models\TN_Container.cs" />
+ <Compile Include="models\TN_Location.cs" />
+ <Compile Include="models\TN_Loc_Container.cs" />
+ <Compile Include="models\TN_Task.cs" />
+ <Compile Include="models\TN_Task_Action.cs" />
+ <Compile Include="process\DeviceProcess.cs" />
+ <Compile Include="api\WMSController.cs" />
+ <Compile Include="dispatch\HostToAGV.cs" />
+ <Compile Include="util\LogHelper.cs" />
+ <Compile Include="wms\ContainerHelper.cs" />
+ <Compile Include="wms\LocationHelper.cs" />
+ <Compile Include="wms\SYSHelper.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="App_Start\Settings.cs" />
+ <Compile Include="util\Settings.cs" />
<Compile Include="App_Start\Startup.cs" />
- <Compile Include="Dispatch\NDCHelper.cs" />
- <Compile Include="Helpers\HttpHelper.cs" />
+ <Compile Include="dispatch\NDCHelper.cs" />
+ <Compile Include="util\HttpHelper.cs" />
+ <Compile Include="wms\WCSHelper.cs" />
+ <Compile Include="wms\WMSHelper.cs" />
</ItemGroup>
<ItemGroup>
<None Include=".editorconfig" />
<None Include="App.config" />
+ <None Include="config\config.comment.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
<None Include="config\config.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
- <None Include="debug\loc_cntr_cg.csv" />
- <None Include="debug\task.csv" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <None Include="debug\outbound_order.csv" />
<Content Include="readme.md" />
<EmbeddedResource Include="swagger.js">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -331,8 +311,6 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
- <ItemGroup>
- <Folder Include="Dtos\Internal\" />
- </ItemGroup>
+ <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
--
Gitblit v1.9.1