From d55da67a8b4bda5b9c8dc9e8d0313272c89c620c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 03 七月 2025 13:22:38 +0800
Subject: [PATCH] Merge branch 'dev'
---
WebTM/WebTM.csproj | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7491068..a539d4d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -326,6 +326,7 @@
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBillList_BarCodeList_Batch.html" />
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\瀹㈡埛鏉＄爜鎵弿\Gy_getCusBarCodeBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\灏忚溅閿佸畾\Kf_TrolleyPositionBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventoryByWorkShop_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\搴撳瓨鏌ヨ\KF_ICInventoryByCLD_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鎵爜楠岃瘉\Gy_BarCodeConfirmBill_PDA.html" />
@@ -348,6 +349,10 @@
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇鍏ュ簱\Kf_ProductInBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇姹囨姤\Sc_ICMOReportBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇姹囨姤\Sc_ICMOReportBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鍒犳墭鍗昞Sc_UnPackUnionBill_Pallet_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鍒犳墭鍗昞Sc_UnPackUnionBill_Packing_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBill_Pallet_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBill_Packing_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_Check_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_PDA.html" />
@@ -423,6 +428,8 @@
<Content Include="views\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillList.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鎶ヨ〃\Kf_ICInvBalList.html" />
<Content Include="views\浠撳瓨绠＄悊\鐢熶骇鍏ュ簱鍗昞Kf_ProductInBillList.html" />
+ <Content Include="views\浠撳瓨绠＄悊\缁勬墭鍗昞Sc_PackUnionBillMain_Setto.html" />
+ <Content Include="views\浠撳瓨绠＄悊\瑁呯鍗昞Sc_PackUnionBillMain_Packing.html" />
<Content Include="views\鍏叡椤甸潰\Kf_ChaoBaoEditDlg.html" />
<Content Include="views\鍏叡椤甸潰\Kf_SourceBillEditDlg_PDA.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_BadClass.html" />
@@ -642,6 +649,7 @@
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_LockRequestBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\ReportPODemandPlanBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\ReportPODemandPlanBillList_S.html" />
+ <Content Include="views\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagBarCodeList.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagInfoExcel.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagInfoEdit.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagInfoList.html" />
--
Gitblit v1.9.1