From f0c246df70e22025be7f59e215f2716fcdcb8e25 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 02 四月 2024 17:29:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 5d6fc31..be5ac9d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -335,6 +335,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_FixCard.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Pay_WorkTimesBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_MyTicke.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SellOutChangeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLYS_ReceiveOtherBillMainList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_WorkTaskBillMyList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlPM_ProjectBillMainMy.aspx" />
@@ -390,8 +391,12 @@
<Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_QueryCondition.html" />
<Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鍔犵彮鐢宠\Pay_OverApplyBillList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\鍛樺伐鎶�鑳芥竻鍗昞HR_EmployeeSkillBill.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\鍛樺伐鎶�鑳芥竻鍗昞HR_EmployeeSkillBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\瀹氶鐢宠\Pay_ProcPriceRequestBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\瀹氶鐢宠\Pay_ProcPriceRequestBillList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宀椾綅鎶�鑳芥竻鍗昞HR_PostSkillBill.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宀椾綅鎶�鑳芥竻鍗昞HR_PostSkillBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鍗昞Pay_PayMentBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鍗昞Pay_PayMentBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillEdit.html" />
@@ -434,6 +439,14 @@
<Content Include="views\鐢熶骇绠＄悊\浣滀笟鎸囧涔Gy_SOPBill_Video.html" />
<Content Include="views\鐢熶骇绠＄悊\宸ュ崟\Sc_CurrentTicket.html" />
<Content Include="views\鐢熶骇绠＄悊\宸ュ崟\Sc_MyTicketList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackCheckBillMain.html" />
+ <Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackHandleBillMain.html" />
+ <Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackCheckBillMainList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackHandleBillMainList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBillMainList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBillMain.html" />
+ <Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackReceiveBillMain.html" />
+ <Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackReceiveBillMainList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_Reply_MESExecptFeedBackBill.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫浜ч噺姹囨姤\Sc_ICMOBillQualityStatus_TmpList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫浜ч噺姹囨姤\Sc_ICMOBillWorkQtyStatus_TmpList.html" />
@@ -446,6 +459,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_InventoryAgeReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎶ヨ〃\Sc_ProdOrderPickingStatusReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_ShopCalendar.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnEdit.html" />
<Content Include="views\鐢熶骇绠＄悊\璁㈠崟鐘舵�佸垎甯僜Sc_OrderStateDistribution.html" />
<Content Include="views\鐢熶骇绠＄悊\榻愬鍒嗘瀽\JIT_CompleteMaterlDetailList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁㈠崟鍙樻洿鍗昞Sc_ICMOChangeBill.html" />
@@ -490,20 +504,28 @@
<Content Include="views\璁惧绠＄悊\Sb_EquipDotCheckBill_PDA.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipMaintainBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipMaintainBill_PDA.html" />
+ <Content Include="views\璁惧绠＄悊\鍥哄畾璧勪骇鍗＄墖\Gy_FixCardChangeBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipRepairCheckBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipRepairCheckBill_PDA.html" />
+ <Content Include="views\璁惧绠＄悊\鍥哄畾璧勪骇鍗＄墖\Gy_FixCardChangeBill_PDA.html" />
+ <Content Include="views\璁惧绠＄悊\鍥哄畾璧勪骇鍗＄墖\Gy_FixCardChangeBill.html" />
<Content Include="views\璁惧绠＄悊\鍥哄畾璧勪骇鍗＄墖\Gy_FixCardBill.html" />
+ <Content Include="views\璁惧绠＄悊\鍥哄畾璧勪骇鍗＄墖\Gy_FixCardChangeBillList.html" />
<Content Include="views\璁惧绠＄悊\鍥哄畾璧勪骇鍗＄墖\Gy_FixCardBillList.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipConkBookBillReport.html" />
+ <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipmentLoadReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipRepairWorkBillReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipDotCheckBillReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipMaintainBillReport.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRuleList_PDA.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipMaintainRuleList_PDA.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_ErrMsgBackType.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\Add_Edit_Gy_ErrType.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\Gy_ErrMsgBackType.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\Gy_ErrType.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBillList_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDA.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\寮傚父鍙嶉\OA_ErrMsgBackBill_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_FirstPassRateReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_FirstPassRateWeekReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ProdBadReasonStatistics.html" />
@@ -740,6 +762,8 @@
<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>
@@ -1636,6 +1660,10 @@
<Content Include="views\閿�鍞鐞哱鐗规壒鐢宠鍗昞Xs_ExceptiveCheckRequestBill.html" />
<Content Include="views\閿�鍞鐞哱鐗规壒鐢宠鍗昞Xs_ExceptiveCheckRequestBillList.html" />
<Content Include="views\閿�鍞鐞哱閫�璐ч�氱煡鍗昞Xs_SeOutStockBackBill.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞姤琛╘Xs_SellOutStockSumReport.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞姤琛╘Xs_SeOrderBillProcessSumReport.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞姤琛╘Xs_SeOrderSendDaySumReport.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞姤琛╘Xs_SeOrderBillProfitReport.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞姤琛╘Xe_SeOutReport.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞姤琛╘Xs_SeOutStockReport.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBill_LookDown.html" />
@@ -1712,6 +1740,7 @@
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_StockOutRequestBill.html" />
<Content Include="views\棰嗘枡鍙戣揣\棰嗘枡鍑哄簱\Kf_StockOutRequestBillList.html" />
<Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ICStockBillSub_WMS_List.html" />
+ <Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillEdit.html" />
<Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
<Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Add_Edit_Kf_OtherInBill.html" />
<Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
@@ -1897,6 +1926,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_MyTicke.aspx.designer.cs">
<DependentUpon>xmlLBM_Sc_MyTicke.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SellOutChangeBillList.aspx.cs">
+ <DependentUpon>xmlLBM_Xs_SellOutChangeBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SellOutChangeBillList.aspx.designer.cs">
+ <DependentUpon>xmlLBM_Xs_SellOutChangeBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLYS_ReceiveOtherBillMainList.aspx.cs">
<DependentUpon>xmlLYS_ReceiveOtherBillMainList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1