From 4405a1a3a5444795c19eb8a577f27078f0b810fa Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 12 十月 2021 10:30:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 95 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 95 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 6f888cc..49c3861 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -116,6 +116,12 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter_Add_Edit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MouldType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\b.grf" />
+ <Content Include="views\grf\鍣ㄥ叿閲囪喘鍏ュ簱鍗�.grf" />
+ <Content Include="views\grf\瀹瑰櫒閲囪喘鍏ュ簱.grf" />
+ <Content Include="views\grf\鍣ㄥ叿鍒嗘寮忚皟鍏ュ崟.grf" />
+ <Content Include="views\grf\鍣ㄥ叿鍒嗘寮忚皟鍑哄崟.grf" />
+ <Content Include="views\grf\鍣ㄥ叿棰嗙敤閫�搴撳崟.grf" />
+ <Content Include="views\grf\鍣ㄥ叿棰嗙敤鍑哄簱鍗�.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -524,6 +530,17 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdInStockBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldRepairOutStockBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldRepairInStockBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldScrapInStockBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldScrapOutStockBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdBackStockBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldMoveStockStepInStockBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldMoveStockStepOutStockBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldOtherInStockBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldOtherOutStockBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdMoveStockBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdOutStockBill.aspx" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceList.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group_Add_Edit.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPrice.html" />
@@ -565,6 +582,7 @@
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBill.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Kf_BarCodeEditDlg.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿瀵垮懡璋冩暣鍗昞Sc_MouldLifeChangeBill_PDA.html" />
@@ -826,6 +844,83 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdInStockBill.aspx.designer.cs">
<DependentUpon>xmlLBM_MouldProdInStockBill.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldRepairOutStockBill.aspx.cs">
+ <DependentUpon>xmlLBM_MouldRepairOutStockBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldRepairOutStockBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_MouldRepairOutStockBill.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldRepairInStockBill.aspx.cs">
+ <DependentUpon>xmlLBM_MouldRepairInStockBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldRepairInStockBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_MouldRepairInStockBill.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldScrapInStockBill.aspx.cs">
+ <DependentUpon>xmlLBM_MouldScrapInStockBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldScrapInStockBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_MouldScrapInStockBill.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldScrapOutStockBill.aspx.cs">
+ <DependentUpon>xmlLBM_MouldScrapOutStockBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldScrapOutStockBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_MouldScrapOutStockBill.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdBackStockBill.aspx.cs">
+ <DependentUpon>xmlLBM_MouldProdBackStockBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdBackStockBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_MouldProdBackStockBill.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldMoveStockStepInStockBill.aspx.cs">
+ <DependentUpon>xmlLBM_MouldMoveStockStepInStockBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldMoveStockStepInStockBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_MouldMoveStockStepInStockBill.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldMoveStockStepOutStockBill.aspx.cs">
+ <DependentUpon>xmlLBM_MouldMoveStockStepOutStockBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldMoveStockStepOutStockBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_MouldMoveStockStepOutStockBill.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldOtherInStockBill.aspx.cs">
+ <DependentUpon>xmlLBM_MouldOtherInStockBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldOtherInStockBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_MouldOtherInStockBill.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldOtherOutStockBill.aspx.cs">
+ <DependentUpon>xmlLBM_MouldOtherOutStockBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldOtherOutStockBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_MouldOtherOutStockBill.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdMoveStockBill.aspx.cs">
+ <DependentUpon>xmlLBM_MouldProdMoveStockBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdMoveStockBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_MouldProdMoveStockBill.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdOutStockBill.aspx.cs">
+ <DependentUpon>xmlLBM_MouldProdOutStockBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdOutStockBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_MouldProdOutStockBill.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx.cs">
<DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1