From 71faf0845365a3605dcac015d93bebc06aba976f Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 07 十一月 2023 09:25:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8341766..46cf85a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -118,6 +118,7 @@
<Content Include="views\Baseset\SRM_OpenTmpList_GXPG.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadCountDevelopWHList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadWHList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_BankList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjGroupEdit.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ConveyCompList.html" />
@@ -213,6 +214,7 @@
<Content Include="views\video\jingbao.wav" />
<Content Include="views\video\success.wav" />
<Content Include="views\WMS鎵爜妯″潡\鍏朵粬鍏ュ簱\Kf_OtherInBill_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鏉＄爜鏌ヨ\Gy_BarCodeBill_QiaoYi_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鍒犳墭鍗昞Sc_DeletePackUnionBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBill_PDA.html" />
@@ -285,6 +287,8 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_ShopCalendar.html" />
<Content Include="views\鐢熶骇绠＄悊\璁㈠崟鐘舵�佸垎甯僜Sc_OrderStateDistribution.html" />
<Content Include="views\鐢熶骇绠＄悊\榻愬鍒嗘瀽\JIT_CompleteMaterlDetailList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁㈠崟鍙樻洿鍗昞Sc_ICMOChangeBill.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁㈠崟鍙樻洿鍗昞Sc_ICMOChangeBillList.html" />
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu.html" />
<Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu_IconSet.html" />
<Content Include="views\绯荤粺绠＄悊\鎸夐挳璁剧疆\Xt_ModuleButtonSet.html" />
@@ -307,6 +311,8 @@
<Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckReport_ZTFB.html" />
<Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckReport_ZDQX.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationInBillList_PDA_QiaoYi.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationOutBillList_PDA_QiaoYi.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ProcessErrStationReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_MateOutSumReport_QiaoYi.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_BrushingOutReport.html" />
@@ -1375,9 +1381,19 @@
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillList.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘閫�鏂欏崟\Cg_PurchaseReturnList.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘閫�鏂欏崟\Cg_PurchaseReturn_Add_Up.html" />
+ <Content Include="views\閿�鍞鐞哱淇＄敤棰濆害鐢宠鍗昞Xs_CusRatingChangeBill.html" />
+ <Content Include="views\閿�鍞鐞哱淇＄敤棰濆害鐢宠鍗昞Xs_CusRatingChangeBillList.html" />
<Content Include="views\閿�鍞鐞哱鍙戣揣閫氱煡鍗昞Add_Edit_Xs_SeOutStockBillList.html" />
+ <Content Include="views\閿�鍞鐞哱搴旀敹閫�娆惧崟\YS_ReceiveBackBill.html" />
+ <Content Include="views\閿�鍞鐞哱搴旀敹閫�娆惧崟\YS_ReceiveBackBillList.html" />
+ <Content Include="views\閿�鍞鐞哱鏀舵鍗昞YS_ReceiveBill.html" />
+ <Content Include="views\閿�鍞鐞哱鏀舵鍗昞YS_ReceiveBillList.html" />
+ <Content Include="views\閿�鍞鐞哱鐗规壒鐢宠鍗昞Xs_ExceptiveCheckRequestBill.html" />
+ <Content Include="views\閿�鍞鐞哱鐗规壒鐢宠鍗昞Xs_ExceptiveCheckRequestBillList.html" />
<Content Include="views\閿�鍞鐞哱閫�璐ч�氱煡鍗昞Xs_SeOutStockBackBill.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBillDyColList.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞鍗曞彉鏇村崟\Xs_SeOrderChangeBill.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞鍗曞彉鏇村崟\Xs_SeOrderChangeBillList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞��璐у崟\Add_Edit_Kf_ICStockBillMainList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞��璐у崟\Kf_ICStockBillMainList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Add_Edit_Xs_SeOrderBillList.html" />
--
Gitblit v1.9.1