From 5a3f34856055ffbbbe9c2519a52b8be50c6f4562 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周一, 25 11月 2024 13:59:28 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

---
 CC/iWareModel/iWareModel.csproj |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/CC/iWareModel/iWareModel.csproj b/CC/iWareModel/iWareModel.csproj
index 2b99e58..feeb416 100644
--- a/CC/iWareModel/iWareModel.csproj
+++ b/CC/iWareModel/iWareModel.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>iWareModel</RootNamespace>
     <AssemblyName>iWareModel</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -82,6 +83,7 @@
     <Compile Include="EnumType\EDevice\DeviceTaskStatusEnum.cs" />
     <Compile Include="EnumType\EDevice\EDeviceType.cs" />
     <Compile Include="EnumType\EDevice\EDevice.cs" />
+    <Compile Include="EnumType\EDevice\Station\StationLocationEnum.cs" />
     <Compile Include="EnumType\EDevice\Rgv\ERgvAlarm.cs" />
     <Compile Include="EnumType\EDevice\Rgv\ERgvCmd.cs" />
     <Compile Include="EnumType\EDevice\Rgv\ERgvEvent.cs" />
@@ -109,6 +111,15 @@
     <Compile Include="EnumType\Sys\ValidateIntEnum.cs" />
     <Compile Include="EnumType\TaskExcuteTypeEnum.cs" />
     <Compile Include="EnumType\ThreadDirectionEnum.cs" />
+    <Compile Include="EnumType\WMS\AreaCodeEnum.cs" />
+    <Compile Include="EnumType\WMS\PrintClassifyEnum.cs" />
+    <Compile Include="EnumType\WMS\PrintTypeEnum.cs" />
+    <Compile Include="EnumType\WMS\RbRunModeEnum.cs" />
+    <Compile Include="EnumType\WMS\RbTaskTypeEnum.cs" />
+    <Compile Include="EnumType\WMS\StockStatusEnum.cs" />
+    <Compile Include="EnumType\WMS\TaskStatusEnum.cs" />
+    <Compile Include="EnumType\WMS\UpiStatusEnum.cs" />
+    <Compile Include="EnumType\WMS\WmsPlaceEnum.cs" />
     <Compile Include="EnumType\XiGangPublicCommon\AddTransferTaskEnum.cs" />
     <Compile Include="EnumType\XiGangPublicCommon\MainInOutFlagEnum.cs" />
     <Compile Include="EnumType\XiGangPublicCommon\MainTaskTypeEnum.cs" />

--
Gitblit v1.9.3