MES-WEB-LayUI.git

			@@ -192,6 +192,8 @@
			<Content Include="views\Baseset\基础资料\Gy_EnvironmentTestItem.html" />
			<Content Include="views\Baseset\基础资料\Gy_ErrMsgBackType.html" />
			<Content Include="views\Baseset\基础资料\Gy_EnvironmentTestSchemeBillList.html" />
			<Content Include="views\WMS扫码模块\委外领料\Kf_EntrustOutBackBill_CheckList_PDA.html" />
			<Content Include="views\WMS扫码模块\委外领料\Kf_EntrustOutBackBill_Check_PDA.html" />
			<Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBackBill_Check_PDA.html" />
			<Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBackBill_CheckList_PDA.html" />
			<Content Include="views\WMS扫码模块\库存转移\KF_ICInventory_WorkShop_PDA.html" />
			@@ -482,6 +484,7 @@
			<Content Include="views\基础资料\公用基础资料\Gy_CostItemFixRate.html" />
			<Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CostItemAverageType.html" />
			<Content Include="views\基础资料\公用基础资料\Gy_CostItemAverageType.html" />
			<Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_XBarcode.aspx" />
			<Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_ZB.aspx" />
			<Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
			<Content Include="views\基础资料\公用基础资料\xmlLBM_Cj_StationOutBillList_HZ.aspx" />
			@@ -649,8 +652,13 @@
			<Content Include="views\应收管理\报表分析\Xs_SellOutCompareToProductReport.html" />
			<Content Include="views\应收管理\报表分析\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
			<Content Include="views\应收管理\报表分析\YS_CusShouldIncomeMaterEntryReport.html" />
			<<<<<<< HEAD
			<Content Include="views\成本管理\成本费用单\CB_ItemMoneyBillList.html" />
			<Content Include="views\成本管理\成本费用单\CB_ItemMoneyBillEdit.html" />
			=======
			<Content Include="views\成本管理\费用单引入\CB_CostProjectImport.html" />
			<Content Include="views\成本管理\费用单引入\CB_ItemMoneyBillImport.html" />
			>>>>>>> 3744dfa85c558f1131afa9cf3cb6054884678c3c
			<Content Include="views\条码明细\Kf_MateOutBillList_CodeDetail.html" />
			<Content Include="views\案例代码\华远\HY_HistogramReport_ForPCSCheckNote.html" />
			<Content Include="views\案例代码\华远\HY_HistogramReport.html" />
			@@ -966,6 +974,7 @@
			<Content Include="views\车间管理\关键件绑定\Sc_KeyElementBindingList.html" />
			<Content Include="views\车间管理\关键件绑定\Sc_KeyElementBinding.html" />
			<Content Include="views\车间管理\单品过站\SingleItemTransitList.html" />
			<Content Include="views\车间管理\单品过站_小卫\Cj_zuituoxiaowei_cacheList.html" />
			<Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_ShippingExport.html" />
			<Content Include="views\车间管理\单品过站_小卫\Cj_SaveSNByICMO.html" />
			<Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_generateSNCode.html" />
			@@ -2725,6 +2734,24 @@
			<Compile Include="App_Data\MssqlReportData.cs" />
			<Compile Include="App_Data\ReportData.cs" />
			<Compile Include="Properties\AssemblyInfo.cs" />
			<Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
			<DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
			<SubType>ASPXCodeBehind</SubType>
			</Compile>
			<Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.designer.cs">
			<DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
			</Compile>
			<Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_XBarcode.aspx.cs">
			<DependentUpon>xmlLBM_HGy_BarCodeBill_XBarcode.aspx</DependentUpon>
			<SubType>ASPXCodeBehind</SubType>
			</Compile>
			<Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_ZB.aspx.cs">
			<DependentUpon>xmlLBM_HGy_BarCodeBill_ZB.aspx</DependentUpon>
			<SubType>ASPXCodeBehind</SubType>
			</Compile>
			<Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_ZB.aspx.designer.cs">
			<DependentUpon>xmlLBM_HGy_BarCodeBill_ZB.aspx</DependentUpon>
			</Compile>
			<Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_HZ.aspx.cs">
			<DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_HZ.aspx</DependentUpon>
			<SubType>ASPXCodeBehind</SubType>