From 3ccf32f224519ba7e1f38b8d5b0f4d1e7a8cffaf Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 27 十一月 2023 10:09:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 768f411..603ecb6 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -221,6 +221,7 @@
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\璋冩嫧鎹㈡墭\Kf_MoveStockBill_HuanTuo_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\璋冩嫧鎹㈡墭\Kf_MoveStockBillList_HuanTuo_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBillList_QiaoYi_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\閿�鍞嚭搴揬Kf_SellOutBill_QiaoYi_PDA.html" />
<Content Include="views\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBillList_PDA.html" />
<Content Include="views\浜轰簨绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackBill_PDA.html" />
@@ -290,6 +291,8 @@
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesSumQueryBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\璇峰亣鐢宠\Pay_OutApplyBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\璇峰亣鐢宠\Pay_OutApplyBillList.html" />
+ <Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeEntryReport.html" />
+ <Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeReport.html" />
<Content Include="views\鏉＄爜鏄庣粏\Kf_BarCodeDetailQuery.html" />
<Content Include="views\鐢熶骇绠＄悊\浣滀笟鎸囧涔Gy_SOPBill_Video.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_Reply_MESExecptFeedBackBill.html" />
@@ -531,6 +534,11 @@
<Content Include="views\grf\閿�鍞鍗曞彉鏇村崟1.grf" />
<Content Include="views\grf\淇＄敤棰濆害鐢宠鍗�1.grf" />
<Content Include="views\grf\閿�鍞嚭搴撳崟1.grf" />
+ <Content Include="views\grf\淇＄敤棰濆害鐢宠鍗�2.grf" />
+ <Content Include="views\grf\鐗规壒鐢宠鍗�2.grf" />
+ <Content Include="views\grf\閿�鍞嚭搴撳崟2.grf" />
+ <Content Include="views\grf\閿�鍞鍗�2.grf" />
+ <Content Include="views\grf\閿�鍞鍗曞彉鏇村崟2.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -1400,12 +1408,16 @@
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_StationOutSumReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\SemiFinishedProductsReport.html" />
<Content Include="views\杞﹂棿绠＄悊\杞﹂棿鏀舵枡\JIT_SendGoodsBillList.html" />
+ <Content Include="views\閲囪喘绠＄悊\浠樻鍗昞YF_PayMentBill.html" />
+ <Content Include="views\閲囪喘绠＄悊\浠樻鍗昞YF_PayMentBillList.html" />
<Content Include="views\閲囪喘绠＄悊\鎶ヤ环鍗昞Sup_QuotePriceBillEdit.html" />
<Content Include="views\閲囪喘绠＄悊\鎶ヤ环鍗昞Sup_QuotePriceBillList.html" />
<Content Include="views\閲囪喘绠＄悊\鏀舵枡閫氱煡鍗昞Add_Edit_Cg_POInStockBillList.html" />
<Content Include="views\閲囪喘绠＄悊\璇环鍗昞Sup_AskPriceBillEdit.html" />
<Content Include="views\閲囪喘绠＄悊\璇环鍗昞Sup_AskPriceBillList.html" />
<Content Include="views\閲囪喘绠＄悊\閫�鏂欓�氱煡鍗昞Add_Edit_Cg_POInStockBackBillList.html" />
+ <Content Include="views\閲囪喘绠＄悊\閲囪喘鐢宠鍗昞Cg_PORequestBill.html" />
+ <Content Include="views\閲囪喘绠＄悊\閲囪喘鐢宠鍗昞Cg_PORequestBillList.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillEdit.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillList.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘閫�鏂欏崟\Cg_PurchaseReturnList.html" />
@@ -1413,6 +1425,8 @@
<Content Include="views\閿�鍞鐞哱淇＄敤棰濆害鐢宠鍗昞Xs_CusRatingChangeBill.html" />
<Content Include="views\閿�鍞鐞哱淇＄敤棰濆害鐢宠鍗昞Xs_CusRatingChangeBillList.html" />
<Content Include="views\閿�鍞鐞哱鍙戣揣閫氱煡鍗昞Add_Edit_Xs_SeOutStockBillList.html" />
+ <Content Include="views\閲囪喘绠＄悊\搴斾粯閫�娆惧崟\YF_PayMentBackBill.html" />
+ <Content Include="views\閲囪喘绠＄悊\搴斾粯閫�娆惧崟\YF_PayMentBackBillList.html" />
<Content Include="views\閿�鍞鐞哱搴旀敹閫�娆惧崟\YS_ReceiveBackBill.html" />
<Content Include="views\閿�鍞鐞哱搴旀敹閫�娆惧崟\YS_ReceiveBackBillList.html" />
<Content Include="views\閿�鍞鐞哱鏀舵鍗昞YS_ReceiveBill.html" />
@@ -1420,6 +1434,7 @@
<Content Include="views\閿�鍞鐞哱鐗规壒鐢宠鍗昞Xs_ExceptiveCheckRequestBill.html" />
<Content Include="views\閿�鍞鐞哱鐗规壒鐢宠鍗昞Xs_ExceptiveCheckRequestBillList.html" />
<Content Include="views\閿�鍞鐞哱閫�璐ч�氱煡鍗昞Xs_SeOutStockBackBill.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBill_LookDown.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBillDyColList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗曞彉鏇村崟\Xs_SeOrderChangeBill.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗曞彉鏇村崟\Xs_SeOrderChangeBillList.html" />
--
Gitblit v1.9.1