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 |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index 306d65b..0fa6e54 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -61,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" />
@@ -76,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" />
@@ -225,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" />
@@ -552,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