lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
高飞
2024-09-24 11:28:43 +08:00
parent 0865c7e41e 4e9832dc8a
commit 1e2fb71789
72 changed files with 10645 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+88
View File
@@ -304,6 +304,17 @@
<Content Include="BaseInfo\WorkStage.aspx" />
<Content Include="bin\FineUIPro.Web.dll" />
<Content Include="bin\FineUIPro.Web.pdb" />
<Content Include="CLGL\ArrivalStatistics.aspx" />
<Content Include="CLGL\OutPlanMaster.aspx" />
<Content Include="CLGL\OutPlanMasterEdit.aspx" />
<Content Include="CLGL\InPlanMaster.aspx" />
<Content Include="CLGL\InPlanMasterDataIn.aspx" />
<Content Include="CLGL\InPlanMasterEdit.aspx" />
<Content Include="CLGL\InputMaster.aspx" />
<Content Include="CLGL\InputMasterEdit.aspx" />
<Content Include="CLGL\MaterialStock.aspx" />
<Content Include="CLGL\OutputMaster.aspx" />
<Content Include="CLGL\OutputMasterEdit.aspx" />
<Content Include="common\main2.aspx" />
<Content Include="common\mainMenu_DigitalSite.aspx" />
<Content Include="common\mainMenu_HJGL.aspx" />
@@ -8013,6 +8024,83 @@
<Compile Include="BaseInfo\WorkStage.aspx.designer.cs">
<DependentUpon>WorkStage.aspx</DependentUpon>
</Compile>
<Compile Include="CLGL\ArrivalStatistics.aspx.cs">
<DependentUpon>ArrivalStatistics.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CLGL\ArrivalStatistics.aspx.designer.cs">
<DependentUpon>ArrivalStatistics.aspx</DependentUpon>
</Compile>
<Compile Include="CLGL\OutPlanMaster.aspx.cs">
<DependentUpon>OutPlanMaster.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CLGL\OutPlanMaster.aspx.designer.cs">
<DependentUpon>OutPlanMaster.aspx</DependentUpon>
</Compile>
<Compile Include="CLGL\OutPlanMasterEdit.aspx.cs">
<DependentUpon>OutPlanMasterEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CLGL\OutPlanMasterEdit.aspx.designer.cs">
<DependentUpon>OutPlanMasterEdit.aspx</DependentUpon>
</Compile>
<Compile Include="CLGL\InPlanMaster.aspx.cs">
<DependentUpon>InPlanMaster.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CLGL\InPlanMaster.aspx.designer.cs">
<DependentUpon>InPlanMaster.aspx</DependentUpon>
</Compile>
<Compile Include="CLGL\InPlanMasterDataIn.aspx.cs">
<DependentUpon>InPlanMasterDataIn.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CLGL\InPlanMasterDataIn.aspx.designer.cs">
<DependentUpon>InPlanMasterDataIn.aspx</DependentUpon>
</Compile>
<Compile Include="CLGL\InPlanMasterEdit.aspx.cs">
<DependentUpon>InPlanMasterEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CLGL\InPlanMasterEdit.aspx.designer.cs">
<DependentUpon>InPlanMasterEdit.aspx</DependentUpon>
</Compile>
<Compile Include="CLGL\InputMaster.aspx.cs">
<DependentUpon>InputMaster.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CLGL\InputMaster.aspx.designer.cs">
<DependentUpon>InputMaster.aspx</DependentUpon>
</Compile>
<Compile Include="CLGL\InputMasterEdit.aspx.cs">
<DependentUpon>InputMasterEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CLGL\InputMasterEdit.aspx.designer.cs">
<DependentUpon>InputMasterEdit.aspx</DependentUpon>
</Compile>
<Compile Include="CLGL\MaterialStock.aspx.cs">
<DependentUpon>MaterialStock.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CLGL\MaterialStock.aspx.designer.cs">
<DependentUpon>MaterialStock.aspx</DependentUpon>
</Compile>
<Compile Include="CLGL\OutputMaster.aspx.cs">
<DependentUpon>OutputMaster.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CLGL\OutputMaster.aspx.designer.cs">
<DependentUpon>OutputMaster.aspx</DependentUpon>
</Compile>
<Compile Include="CLGL\OutputMasterEdit.aspx.cs">
<DependentUpon>OutputMasterEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="CLGL\OutputMasterEdit.aspx.designer.cs">
<DependentUpon>OutputMasterEdit.aspx</DependentUpon>
</Compile>
<Compile Include="common\main2.aspx.cs">
<DependentUpon>main2.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>