From 582d7ab9eb6879f4b5f3e1b1b7d162f3d53a0e39 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 27 十月 2024 14:12:32 +0800
Subject: [PATCH] Merge branch 'master' into master_ben
---
Tiger.Model.Net/Tiger.Model.Net.csproj | 108 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 97 insertions(+), 11 deletions(-)
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index ddf1040..c8a8462 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -9,13 +9,20 @@
<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>
- <SccProjectName>SAK</SccProjectName>
- <SccLocalPath>SAK</SccLocalPath>
- <SccAuxPath>SAK</SccAuxPath>
- <SccProvider>SAK</SccProvider>
+ <SccProjectName>
+ </SccProjectName>
+ <SccLocalPath>
+ </SccLocalPath>
+ <SccAuxPath>
+ </SccAuxPath>
+ <SccProvider>
+ </SccProvider>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -54,8 +61,8 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="SqlSugar, Version=5.1.4.149, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\SqlSugar.5.1.4.149\lib\SqlSugar.dll</HintPath>
+ <Reference Include="SqlSugar, Version=5.1.4.168, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\SqlSugar.5.1.4.169\lib\SqlSugar.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -70,6 +77,7 @@
<ItemGroup>
<Compile Include="Base\DbEntityBase.cs" />
<Compile Include="DTO\MESDTO.cs" />
+ <Compile Include="Entitys\Api\Base.cs" />
<Compile Include="Entitys\Automate\SNInfo.cs" />
<Compile Include="Entitys\Automate\Vechicle.cs" />
<Compile Include="Entitys\Automate\WIP_SN.cs" />
@@ -79,6 +87,14 @@
<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_ITEM_CUST.cs" />
+ <Compile Include="Entitys\BAS\BAS_ITEM_EXT.cs" />
+ <Compile Include="Entitys\BAS\BAS_LABEL_PV.cs" />
+ <Compile Include="Entitys\BAS\BAS_LABEL_TEMP.cs" />
+ <Compile Include="Entitys\BAS\BAS_LABEL_VAR.cs" />
+ <Compile Include="Entitys\BAS\BAS_PKG_PROD.cs" />
+ <Compile Include="Entitys\BAS\BAS_WIP_EXT.cs" />
+ <Compile Include="Entitys\BAS\V_BAS_PKG_DTL.cs" />
<Compile Include="Entitys\BAS\BAS_PKG_DTL.cs" />
<Compile Include="Entitys\BAS\BAS_PKG_RULE.cs" />
<Compile Include="Entitys\BAS\BAS_PKG_SN.cs" />
@@ -98,11 +114,31 @@
<Compile Include="Entitys\DigitalTwin\Sharetronic\OperateConfigConfirmEntity.cs" />
<Compile Include="Entitys\DigitalTwin\Sharetronic\OperateConfigEntity.cs" />
<Compile Include="Entitys\DigitalTwin\Sharetronic\ShelfApiResult.cs" />
+ <Compile Include="Entitys\EMS\EMS_EQM_TYPE.cs" />
+ <Compile Include="Entitys\EMS\EMS_EQUIPMENT.cs" />
+ <Compile Include="Entitys\EMS\EMS_FAULT.cs" />
+ <Compile Include="Entitys\EMS\EMS_INS_DTL.cs" />
+ <Compile Include="Entitys\EMS\EMS_INS_ITEM.cs" />
+ <Compile Include="Entitys\EMS\EMS_INS_ORDER.cs" />
+ <Compile Include="Entitys\EMS\EMS_INS_PLAN.cs" />
+ <Compile Include="Entitys\EMS\EMS_INS_PLAN_ITEM.cs" />
+ <Compile Include="Entitys\EMS\EMS_MTN_DTL.cs" />
+ <Compile Include="Entitys\EMS\EMS_MTN_ITEM.cs" />
+ <Compile Include="Entitys\EMS\EMS_MTN_ORDER.cs" />
+ <Compile Include="Entitys\EMS\EMS_MTN_PLAN.cs" />
+ <Compile Include="Entitys\EMS\EMS_MTN_PLAN_ITEM.cs" />
+ <Compile Include="Entitys\EMS\EMS_REPAIR.cs" />
+ <Compile Include="Entitys\BAS\BAS_LABEL_VAR_WO.cs" />
<Compile Include="Entitys\MES\BIZ_MES_WO.cs" />
+ <Compile Include="Entitys\MES\BIZ_MES_WO_BATCH.cs" />
+ <Compile Include="Entitys\MES\BIZ_MES_WO_SN.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_CUSTOM_ACT.cs" />
+ <Compile Include="Entitys\MES\MES_CUST_SN.cs" />
+ <Compile Include="Entitys\MES\MES_PROD_ACTION.cs" />
+ <Compile Include="Entitys\MES\MES_PROD_OPER.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" />
@@ -110,11 +146,32 @@
<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_ASSY.cs" />
<Compile Include="Entitys\MES\MES_WIP_DATA.cs" />
+ <Compile Include="Entitys\MES\MES_WIP_DFT.cs" />
+ <Compile Include="Entitys\MES\MES_WIP_EXT.cs" />
<Compile Include="Entitys\MES\MES_WIP_HIS.cs" />
+ <Compile Include="Entitys\MES\MES_WIP_PKG.cs" />
+ <Compile Include="Entitys\MES\MES_WO_ACTION.cs" />
+ <Compile Include="Entitys\MES\MES_WO_EDGE.cs" />
+ <Compile Include="Entitys\MES\MES_WO_NODE.cs" />
+ <Compile Include="Entitys\MES\MES_WO_NODE_ACT.cs" />
+ <Compile Include="Entitys\MES\MES_WO_NODE_DFTG.cs" />
+ <Compile Include="Entitys\MES\MES_WO_NODE_POST.cs" />
+ <Compile Include="Entitys\MES\MES_WO_OPER.cs" />
<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\DoUnPackParameter.cs" />
+ <Compile Include="Entitys\MES\ParameterEntity\CodeVerificationParameter.cs" />
+ <Compile Include="Entitys\MES\ParameterEntity\BizMesWoParameter.cs" />
+ <Compile Include="Entitys\MES\ParameterEntity\BasLabelTempParameter.cs" />
<Compile Include="Entitys\MES\ParameterEntity\SmtLoadingReturn.cs" />
<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" />
<Compile Include="Entitys\MES\SMT_FEEDER_TYPE.cs" />
@@ -126,13 +183,45 @@
<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_BAS_PROD_R.cs" />
+ <Compile Include="Entitys\MES\V_BAS_PROD.cs" />
+ <Compile Include="Entitys\MES\V_MES_ROUTE_NDS.cs" />
+ <Compile Include="Entitys\MES\V_MES_ROUTE_NES.cs" />
+ <Compile Include="Entitys\MES\V_MES_ROUTE_NLV.cs" />
+ <Compile Include="Entitys\MES\V_MES_ROUTE_NOE_POST.cs" />
+ <Compile Include="Entitys\MES\V_MES_ROUTE_PTREE.cs" />
+ <Compile Include="Entitys\MES\V_MES_WO_BATCH.cs" />
+ <Compile Include="Entitys\MES\V_MES_WO_NODE_POST.cs" />
+ <Compile Include="Entitys\MES\V_MES_WO_PTREE.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\MES\Weigh.cs" />
+ <Compile Include="Entitys\MES\YadaU9\mes_BomComponent.cs" />
+ <Compile Include="Entitys\MES\YadaU9\mes_BomDetail.cs" />
+ <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_ItemMaster.cs" />
+ <Compile Include="Entitys\MES\YadaU9\mes_Mo.cs" />
+ <Compile Include="Entitys\MES\YadaU9\mes_MoBarCode.cs" />
+ <Compile Include="Entitys\MES\YadaU9\mes_MOPickList.cs" />
+ <Compile Include="Entitys\MES\YadaU9\mes_Organization.cs" />
+ <Compile Include="Entitys\MES\YadaU9\mes_ProductType.cs" />
+ <Compile Include="Entitys\MES\YadaU9\mes_Supplier.cs" />
+ <Compile Include="Entitys\QMS\QMS_AQL_PLAN.cs" />
+ <Compile Include="Entitys\QMS\QMS_AQL_STD.cs" />
+ <Compile Include="Entitys\QMS\QMS_INS_CTGY.cs" />
+ <Compile Include="Entitys\QMS\QMS_INS_DTL.cs" />
+ <Compile Include="Entitys\QMS\QMS_INS_ITEM.cs" />
+ <Compile Include="Entitys\QMS\QMS_INS_STD.cs" />
+ <Compile Include="Entitys\QMS\QMS_SAMPLE_RULE.cs" />
<Compile Include="Entitys\SYS\LOG_CS_LOGIN.cs" />
+ <Compile Include="Entitys\SYS\LOG_LABEL_PRINT.cs" />
<Compile Include="Entitys\SYS\LOG_PDA_LOGIN.cs" />
<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\Resell.cs" />
<Compile Include="Entitys\WMS\Api\InFinished.cs" />
@@ -482,9 +571,6 @@
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
- <ItemGroup>
- <Folder Include="Entitys\EMS\" />
- <Folder Include="Entitys\QMS\" />
- </ItemGroup>
+ <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
--
Gitblit v1.9.3