Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2024-01-10 89b8e2e3743ac13afaa0393a8c791dd8647036f0

 WebTM/WebTM.csproj

@@ -123,6 +123,7 @@
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ConveyCompList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ConveyTypeList.html" />
    <Content Include="views\Baseset\基础资料\Gy_SupplierListNew.html" />
    <Content Include="views\Baseset\基础资料\Gy_EquipFileBillMainList.html" />
    <Content Include="views\Baseset\基础资料\Gy_GetProcNoList.html" />
    <Content Include="views\Baseset\基础资料\Gy_InspectInstruMentList.html" />
@@ -271,6 +272,12 @@
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectBasis.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PoStockStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CusType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_StockCheckItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_SupType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_SellStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_AreaSet.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectInstruMent.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_StockOutStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_StockInStyle.html" />
@@ -280,6 +287,12 @@
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectValue.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_TemporaryArea.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_InspectBasis.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_AreaSet.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CusType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_StockCheckItem.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_SupType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_SellStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PoStockStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_InspectInstruMent.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_StockOutStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_StockInStyle.html" />
@@ -344,6 +357,9 @@
    <Content Include="views\条码明细\Kf_BarCodeDetailQuery.html" />
    <Content Include="views\案例代码\普通基础资料\Gy_DepartmentEdit.html" />
    <Content Include="views\案例代码\普通基础资料\Gy_DepartmentList.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldConkBookBillMainReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldMaintainBillMainReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldRepairWorkBillReport.html" />
    <Content Include="views\生产管理\作业指导书\Gy_SOPBill_Video.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_Reply_MESExecptFeedBackBill.html" />
    <Content Include="views\生产管理\报工台工序\产量汇报\Sc_ICMOBillQualityStatus_TmpList.html" />
@@ -366,6 +382,8 @@
    <Content Include="views\系统管理\按钮设置\Xt_ModuleButtonSet.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserCustomerList.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserCustomerList_Edit.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserMaterList.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserStockRelation.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserProcessList.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserCustomer_ImportByExcel.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserEmployee_Excel.html" />
@@ -421,6 +439,7 @@
    <Content Include="views\车间管理\工序流转\MES_StationInBillList_PDA_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转\MES_StationOutBillList_PDA_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillList_LookDown.html" />
    <Content Include="views\车间管理\工序进站接收单\Cj_StationInBillList_QiaoYi.html" />
    <Content Include="views\车间管理\报表分析\Sc_BadReasonReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_ProcessErrStationReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_MateOutSumReport_QiaoYi.html" />
@@ -463,6 +482,7 @@
    <Content Include="views\车间管理\报表分析\sc_ICOMReport.html" />
    <Content Include="views\车间管理\报表分析\sc_ICOMRKBanReport.html" />
    <Content Include="views\车间管理\报表分析\sc_ICOMRKReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_ProcExchangeNoInReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_WorkShopProcessWIPSumReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_WorkShopProcessWIPReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_EmployeePieceWorkReport.html" />