From 791453617b93d367db37862068c5f7a674a1d69e Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 15 三月 2024 15:55:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 74 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 3 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index f2df268..4307ed4 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -230,6 +230,8 @@
<Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍑哄簱\Kf_OtherOutBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍑哄簱\Kf_OtherOutBackBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍑哄簱\Kf_OtherOutBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鍑洪棬纭鍗昞Xs_OutDoorCheckBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鍑洪棬纭鍗昞Xs_OutDoorCheckBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\濮斿鍏ュ簱\Kf_EntrustInBackBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\濮斿鍏ュ簱\Kf_EntrustInBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\濮斿鍏ュ簱\Kf_EntrustInBill_PDA.html" />
@@ -267,6 +269,8 @@
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBill_QiaoYi_PDA.html" />
<Content Include="views\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBillList_PDA.html" />
<Content Include="views\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBill_PDA.html" />
+ <Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Add_Edit_Kf_MoveStockBill.html" />
+ <Content Include="views\浠撳瓨绠＄悊\鍒嗘寮忚皟鍏ュ崟\Fb_StepFoldinBillEdit.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_PonderationBillMain_Temp.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鎶ヨ〃\Kf_MaterOutInReport.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鎶ヨ〃\Kf_ICInventory_Mater.html" />
@@ -324,8 +328,14 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterTypeEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_TemporaryArea.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardChangeType.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardStatus.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardAddress.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardType.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_FixCard.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Pay_WorkTimesBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_MyTicke.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLYS_ReceiveOtherBillMainList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_WorkTaskBillMyList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_ProjectBillMainMy.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList.aspx" />
@@ -368,6 +378,14 @@
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_DisposeWayList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ScrapReasonList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Souce_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardAddress.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardChangeType.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardStatus.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardChangeTypeList.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardType.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardAddressList.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardStatusList.html" />
+ <Content Include="views\鍩虹璧勬枡\璁惧鍩虹璧勬枡\Gy_CardTypeList.html" />
<Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_QueryCondition.html" />
<Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBillList.html" />
@@ -472,6 +490,8 @@
<Content Include="views\璁惧绠＄悊\Sb_EquipMaintainBill_PDA.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipRepairCheckBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipRepairCheckBill_PDA.html" />
+ <Content Include="views\璁惧绠＄悊\鍥哄畾璧勪骇鍗＄墖\Gy_FixCardBill.html" />
+ <Content Include="views\璁惧绠＄悊\鍥哄畾璧勪骇鍗＄墖\Gy_FixCardBillList.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipConkBookBillReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipRepairWorkBillReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipDotCheckBillReport.html" />
@@ -717,6 +737,7 @@
<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>
@@ -1596,10 +1617,11 @@
<Content Include="views\閲囪喘绠＄悊\閲囪喘閫�鏂欏崟\Cg_PurchaseReturn_Add_Up.html" />
<Content Include="views\閿�鍞鐞哱淇＄敤棰濆害鐢宠鍗昞Xs_CusRatingChangeBill.html" />
<Content Include="views\閿�鍞鐞哱淇＄敤棰濆害鐢宠鍗昞Xs_CusRatingChangeBillList.html" />
- <Content Include="views\閿�鍞鐞哱鍏朵粬搴斾粯鍗昞YF_PayMentOtherBillMain.html" />
- <Content Include="views\閿�鍞鐞哱鍏朵粬搴斾粯鍗昞YF_PayMentOtherBillMainList.html" />
- <Content Include="views\閿�鍞鐞哱鍏朵粬搴旀敹鍗昞YS_ReceiveOtherBillMain.htmlList.html" />
+ <Content Include="views\閲囪喘绠＄悊\鍏朵粬搴斾粯鍗昞YF_PayMentOtherBillMain.html" />
+ <Content Include="views\閲囪喘绠＄悊\鍏朵粬搴斾粯鍗昞YF_PayMentOtherBillMainList.html" />
+ <Content Include="views\閿�鍞鐞哱鍏朵粬搴旀敹鍗昞YS_ReceiveOtherBillMainList.html" />
<Content Include="views\閿�鍞鐞哱鍏朵粬搴旀敹鍗昞YS_ReceiveOtherBillMain.html" />
+ <Content Include="views\閿�鍞鐞哱鍑洪棬纭鍗昞Xs_OutDoorCheckBillList.html" />
<Content Include="views\閿�鍞鐞哱鍙戣揣閫氱煡鍗昞Add_Edit_Xs_SeOutStockBillList.html" />
<Content Include="views\閲囪喘绠＄悊\搴斾粯閫�娆惧崟\YF_PayMentBackBill.html" />
<Content Include="views\閲囪喘绠＄悊\搴斾粯閫�娆惧崟\YF_PayMentBackBillList.html" />
@@ -1618,6 +1640,8 @@
<Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBillDyColList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗曞彉鏇村崟\Xs_SeOrderChangeBill.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗曞彉鏇村崟\Xs_SeOrderChangeBillList.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞皟浠峰崟\Xs_SellOutChangeBill.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞皟浠峰崟\Xs_SellOutChangeBillList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞��璐у崟\Add_Edit_Kf_ICStockBillMainList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞��璐у崟\Kf_ICStockBackBill.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞��璐у崟\Kf_ICStockBackBillList.html" />
@@ -1656,6 +1680,7 @@
<Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\PM_ProjectReportBill.html" />
<Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\PM_ProjectStageBillList.html" />
<Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\PM_ProjectStageBill.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Add_Edit_Kf_OtherOutBill.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBill_Check.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍒嗘寮忚皟鍑哄崟\Fb_StepFoldOutBillEdit.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍒嗘寮忚皟鍑哄崟\Fb_StepFoldOutBillList.html" />
@@ -1686,6 +1711,7 @@
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_StockOutRequestBillList.html" />
<Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ICStockBillSub_WMS_List.html" />
<Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
+ <Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Add_Edit_Kf_OtherInBill.html" />
<Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Kf_ProductInBillList.html" />
<Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherOutBill_Check_New.html" />
@@ -1820,6 +1846,41 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipTypeBill.aspx.designer.cs">
<DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardChangeType.aspx.cs">
+ <DependentUpon>xmlLBM_HGy_CardChangeType.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardChangeType.aspx.designer.cs">
+ <DependentUpon>xmlLBM_HGy_CardChangeType.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardStatus.aspx.cs">
+ <DependentUpon>xmlLBM_HGy_CardStatus.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardStatus.aspx.designer.cs">
+ <DependentUpon>xmlLBM_HGy_CardStatus.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardAddress.aspx.cs">
+ <DependentUpon>xmlLBM_HGy_CardAddress.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardAddress.aspx.designer.cs">
+ <DependentUpon>xmlLBM_HGy_CardAddress.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardType.aspx.cs">
+ <DependentUpon>xmlLBM_HGy_CardType.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_CardType.aspx.designer.cs">
+ <DependentUpon>xmlLBM_HGy_CardType.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_FixCard.aspx.cs">
+ <DependentUpon>xmlLBM_HGy_FixCard.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_FixCard.aspx.designer.cs">
+ <DependentUpon>xmlLBM_HGy_FixCard.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Pay_WorkTimesBillList.aspx.cs">
<DependentUpon>xmlLBM_Pay_WorkTimesBillList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1834,6 +1895,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_MyTicke.aspx.designer.cs">
<DependentUpon>xmlLBM_Sc_MyTicke.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLYS_ReceiveOtherBillMainList.aspx.cs">
+ <DependentUpon>xmlLYS_ReceiveOtherBillMainList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLYS_ReceiveOtherBillMainList.aspx.designer.cs">
+ <DependentUpon>xmlLYS_ReceiveOtherBillMainList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_WorkTaskBillMyList.aspx.cs">
<DependentUpon>xmlPM_WorkTaskBillMyList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1