From 27d2cf1a76f6df0731c2fe850e1920ce88d14f33 Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期六, 28 十二月 2024 16:06:00 +0800 Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024 --- Tiger.Model.Net/Tiger.Model.Net.csproj | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj index fa97bd6..0fa6e54 100644 --- a/Tiger.Model.Net/Tiger.Model.Net.csproj +++ b/Tiger.Model.Net/Tiger.Model.Net.csproj @@ -9,6 +9,9 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>Tiger.Model</RootNamespace> <AssemblyName>Tiger.Model</AssemblyName> + <Company>娣卞湷甯傞挍鏍间簯绉戞妧鏈夐檺鍏徃 (SZ TigerClouds Technology Co.,Ltd.)</Company> + <Authors>TigerClouds Team</Authors> + <Copyright>Copyright 漏 2020-2025 SZ TigerClouds Technology Co.,Ltd.. All rights reserved.</Copyright> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> <Deterministic>true</Deterministic> @@ -58,8 +61,8 @@ <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> - <Reference Include="SqlSugar, Version=5.1.4.168, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\SqlSugar.5.1.4.169\lib\SqlSugar.dll</HintPath> + <Reference Include="SqlSugar, Version=5.1.4.170, Culture=neutral, processorArchitecture=MSIL"> + <HintPath>..\packages\SqlSugar.5.1.4.171-preview11\lib\SqlSugar.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.ComponentModel.DataAnnotations" /> @@ -73,7 +76,17 @@ </ItemGroup> <ItemGroup> <Compile Include="Base\DbEntityBase.cs" /> + <Compile Include="Base\TraceDebug.cs" /> <Compile Include="DTO\MESDTO.cs" /> + <Compile Include="Entitys\MES\MES_ROUTE_ACT_VAR.cs" /> + <Compile Include="Entitys\MES\MES_WIP_ACT_VAR.cs" /> + <Compile Include="Entitys\MES\MES_WO_ACT_VAR.cs" /> + <Compile Include="Entitys\MES\ParameterEntity\BizPrintInstoreDocParameter.cs" /> + <Compile Include="Entitys\BAS\BAS_ITEM_DOC.cs" /> + <Compile Include="Entitys\MES\YadaU9\mes_Bin.cs" /> + <Compile Include="Entitys\MES\YadaU9\mes_MaterialBarCode.cs" /> + <Compile Include="Entitys\MES\YadaU9\mes_Wh.cs" /> + <Compile Include="Entitys\MQTTEntity.cs" /> <Compile Include="Entitys\Api\Base.cs" /> <Compile Include="Entitys\Automate\SNInfo.cs" /> <Compile Include="Entitys\Automate\Vechicle.cs" /> @@ -159,6 +172,7 @@ <Compile Include="Entitys\MES\node.cs" /> <Compile Include="Entitys\MES\ParameterEntity\BizMesWoBatchParameter.cs" /> <Compile Include="Entitys\MES\ParameterEntity\BizBasPkgRuleParameter.cs" /> + <Compile Include="Entitys\MES\ParameterEntity\U9CParameter.cs" /> <Compile Include="Entitys\MES\ParameterEntity\DoUnPackParameter.cs" /> <Compile Include="Entitys\MES\ParameterEntity\CodeVerificationParameter.cs" /> <Compile Include="Entitys\MES\ParameterEntity\BizMesWoParameter.cs" /> @@ -167,6 +181,7 @@ <Compile Include="Entitys\MES\ParameterEntity\SmtLoadingInput.cs" /> <Compile Include="Entitys\MES\ParameterEntity\PositionParameter.cs" /> <Compile Include="Entitys\MES\ParameterEntity\RouteInput.cs" /> + <Compile Include="Entitys\MES\ParameterEntity\TskParameter.cs" /> <Compile Include="Entitys\MES\ParameterEntity\U9C_MES_Input.cs" /> <Compile Include="Entitys\MES\R_Wip_Tracking_T.cs" /> <Compile Include="Entitys\MES\SMT_FEEDER.cs" /> @@ -199,6 +214,7 @@ <Compile Include="Entitys\MES\YadaU9\mes_BomMaster.cs" /> <Compile Include="Entitys\MES\YadaU9\mes_Customer.cs" /> <Compile Include="Entitys\MES\YadaU9\mes_HisBoxBarCode.cs" /> + <Compile Include="Entitys\MES\YadaU9\mes_ShipList.cs" /> <Compile Include="Entitys\MES\YadaU9\mes_ItemMaster.cs" /> <Compile Include="Entitys\MES\YadaU9\mes_Mo.cs" /> <Compile Include="Entitys\MES\YadaU9\mes_MoBarCode.cs" /> @@ -219,6 +235,8 @@ <Compile Include="Entitys\SYS\SYS_CS_LOGIN.cs" /> <Compile Include="Entitys\SYS\SYS_LOW_CODE.cs" /> <Compile Include="Entitys\SYS\SYS_PDA_LOGIN.cs" /> + <Compile Include="Entitys\WMS\Api\Input_Entitys.cs" /> + <Compile Include="Entitys\WMS\Api\Output_Entitys.cs" /> <Compile Include="Entitys\WMS\Api\Resell.cs" /> <Compile Include="Entitys\WMS\Api\InFinished.cs" /> <Compile Include="Entitys\WMS\Api\InReceiptCheckingInput.cs" /> @@ -238,6 +256,7 @@ <Compile Include="Entitys\MengQi\Customer.cs" /> <Compile Include="Entitys\MengQi\TestData.cs" /> <Compile Include="Entitys\MengQi\User.cs" /> + <Compile Include="Entitys\WMS\BIZ_ERP_PROD_IN_BTH.cs" /> <Compile Include="Entitys\WMS\V_MONTH_IN_SUM.cs" /> <Compile Include="Entitys\WMS\V_WH_ITEM_SUM.cs" /> <Compile Include="Entitys\WMS\V_WMS_ITEM_Y.cs" /> @@ -545,7 +564,6 @@ <Compile Include="Entitys\DigitalTwin\SeaStone\WebHook.cs" /> <Compile Include="Entitys\SYS\USER.cs" /> <Compile Include="Entitys\AnonymousEntity.cs" /> - <Compile Include="Entitys\Barcode.cs" /> <Compile Include="Entitys\ImportEntity.cs" /> <Compile Include="Entitys\WMS\AgvActionResult.cs" /> <Compile Include="Entitys\WMS\KanBan\WareHousing.cs" /> -- Gitblit v1.9.3