From 4361513fb831fdd416356e576682358bd72a121c Mon Sep 17 00:00:00 2001
From: Cloud Zhang <941187371@qq.com>
Date: 星期四, 16 五月 2024 14:20:36 +0800
Subject: [PATCH] 合并

---
 Tiger.Model.Net/Tiger.Model.Net.csproj |   42 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index e574063..9805eb6 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -54,8 +54,8 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SqlSugar, Version=5.1.4.94, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SqlSugar.5.1.4.95\lib\SqlSugar.dll</HintPath>
+    <Reference Include="SqlSugar, Version=5.1.4.149, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SqlSugar.5.1.4.149\lib\SqlSugar.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -75,6 +75,13 @@
     <Compile Include="Entitys\Automate\WIP_SN.cs" />
     <Compile Include="Entitys\Automate\WIP_SNHis.cs" />
     <Compile Include="Entitys\Automate\WIP_SNResult.cs" />
+    <Compile Include="Entitys\BAS\BAS_DEFECT.cs" />
+    <Compile Include="Entitys\BAS\BAS_DEFECT_GRP.cs" />
+    <Compile Include="Entitys\BAS\BAS_DFT_DUTY.cs" />
+    <Compile Include="Entitys\BAS\BAS_DFT_LOC.cs" />
+    <Compile Include="Entitys\BAS\BAS_REASON.cs" />
+    <Compile Include="Entitys\BAS\BAS_REASON_GRP.cs" />
+    <Compile Include="Entitys\BAS\BAS_SOLUTION.cs" />
     <Compile Include="Entitys\DigitalTwin\Sharetronic\GetOperateChuteChangeInfoEntity.cs" />
     <Compile Include="Entitys\DigitalTwin\Sharetronic\OperateTowerLightEntity.cs" />
     <Compile Include="Entitys\DigitalTwin\Sharetronic\DownSingleEntity.cs" />
@@ -87,9 +94,36 @@
     <Compile Include="Entitys\DigitalTwin\Sharetronic\OperateConfigConfirmEntity.cs" />
     <Compile Include="Entitys\DigitalTwin\Sharetronic\OperateConfigEntity.cs" />
     <Compile Include="Entitys\DigitalTwin\Sharetronic\ShelfApiResult.cs" />
+    <Compile Include="Entitys\MES\BIZ_MES_WO.cs" />
     <Compile Include="Entitys\MES\C_Stock_Info_t.cs" />
     <Compile Include="Entitys\MES\C_Stock_Pallet_T.cs" />
+    <Compile Include="Entitys\MES\edge.cs" />
+    <Compile Include="Entitys\MES\MES_PROD_NODE_ACT.cs" />
+    <Compile Include="Entitys\MES\MES_ROUTE_NODE_ACT.cs" />
+    <Compile Include="Entitys\MES\MES_ROUTE_NODE_DFTG.cs" />
+    <Compile Include="Entitys\MES\MES_ROUTE_NODE_POST.cs" />
+    <Compile Include="Entitys\MES\MES_SHIFT.cs" />
+    <Compile Include="Entitys\MES\MES_SHIFT_PRD.cs" />
+    <Compile Include="Entitys\MES\MES_SHIFT_SYS.cs" />
+    <Compile Include="Entitys\MES\MES_WIP_ACT.cs" />
+    <Compile Include="Entitys\MES\MES_WIP_DATA.cs" />
+    <Compile Include="Entitys\MES\MES_WIP_HIS.cs" />
+    <Compile Include="Entitys\MES\node.cs" />
     <Compile Include="Entitys\MES\R_Wip_Tracking_T.cs" />
+    <Compile Include="Entitys\MES\SMT_FEEDER.cs" />
+    <Compile Include="Entitys\MES\SMT_FEEDER_TYPE.cs" />
+    <Compile Include="Entitys\MES\SMT_LOADING.cs" />
+    <Compile Include="Entitys\MES\SMT_LOAD_HIS.cs" />
+    <Compile Include="Entitys\MES\SMT_MAINTAIN.cs" />
+    <Compile Include="Entitys\MES\SMT_MT_DTL.cs" />
+    <Compile Include="Entitys\MES\SMT_MT_PROJECT.cs" />
+    <Compile Include="Entitys\MES\SMT_PROD_TABLE.cs" />
+    <Compile Include="Entitys\MES\SMT_SOLDER.cs" />
+    <Compile Include="Entitys\MES\SMT_SOLDER_HIS.cs" />
+    <Compile Include="Entitys\MES\V_SMT_TOOL.cs" />
+    <Compile Include="Entitys\MES\SMT_TOOL.cs" />
+    <Compile Include="Entitys\MES\SMT_TOOL_HIS.cs" />
+    <Compile Include="Entitys\MES\SMT_WO_TABLE.cs" />
     <Compile Include="Entitys\SYS\LOG_CS_LOGIN.cs" />
     <Compile Include="Entitys\SYS\LOG_PDA_LOGIN.cs" />
     <Compile Include="Entitys\SYS\SYS_CS_LOGIN.cs" />
@@ -211,10 +245,6 @@
     <Compile Include="Entitys\MES\MES_ROUTE.cs" />
     <Compile Include="Entitys\MES\MES_ROUTE_EDGE.cs" />
     <Compile Include="Entitys\MES\MES_ROUTE_NODE.cs" />
-    <Compile Include="Entitys\MES\MES_SHIFT.cs" />
-    <Compile Include="Entitys\MES\MES_SHIFT_PRD.cs" />
-    <Compile Include="Entitys\MES\MES_SHIFT_SYS.cs" />
-    <Compile Include="Entitys\MES\MES_SMT_TABLE.cs" />
     <Compile Include="Entitys\MES\MES_WORKSHOP.cs" />
     <Compile Include="Entitys\MES\V_PROD_TREE.cs" />
     <Compile Include="Entitys\MES\V_PROD_UNIT.cs" />

--
Gitblit v1.9.3