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

yangle

2024-11-28 03cc5d52bcd95ebd6c06cc279a8c240097b74e7d

 WebTM/WebTM.csproj

@@ -266,6 +266,7 @@
    <Content Include="views\WMS扫码模块\上料防错单\Sc_MaterToSourceBill_PDA.html" />
    <Content Include="views\WMS扫码模块\上料防错单\Sc_MaterToSourceBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBackBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBill_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\其他出库\Kf_OtherOutBill_PDA.html" />
@@ -355,17 +356,20 @@
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CheckNoteItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_EnvironmentTestItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_TechnologyParameterType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_MaintainLev.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_CheckItem_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectBasis_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectInstruMent_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectMethod_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_EnvironmentTestItem_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectValue_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QCCheckClass_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QualityStd_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CheckNoteItem_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EnvironmentTestItem.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Material_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PreventErrMould_Excel.html" />
@@ -415,6 +419,7 @@
    <Content Include="views\基础资料\通用基础资料\Gy_CommonBaseData.html" />
    <Content Include="views\基础资料\隐藏列设置\Gy_GridView_Hide_New.html" />
    <Content Include="views\工资管理\定额申请\Pay_ProcPriceRequestBillCheckQuery.html" />
    <Content Include="views\工资管理\工资报表\Pay_PayrollReportByKD.html" />
    <Content Include="views\工资管理\工资报表\Pay_PaymentEntryReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_PayWorkShopSumReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_PaymentDayCheckReport.html" />
@@ -472,6 +477,7 @@
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillType.html" />
    <Content Include="views\生产管理\报工台工序\开工\Sc_SwipeCardStart.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillOrProcessExchangeResumeList.html" />
    <Content Include="views\生产管理\生产开工单\Sc_MESBeginWorkBillList_PDA.html" />
    <Content Include="views\生产管理\生产报表\Sc_ProductionInProgressReport.html" />
    <Content Include="views\生产管理\生产报表\Sc_NutInspectionCCDPassRate.html" />
    <Content Include="views\生产管理\生产报表\Sc_QualityReportBillMonth.html" />
@@ -519,6 +525,8 @@
    <Content Include="views\质量管理\基础建模\Gy_ErrMsgBackType_Excel.html" />
    <Content Include="views\质量管理\基础建模\Gy_ErrType_Excel.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackSelfQuery_BGT.html" />
    <Content Include="views\质量管理\环境检测单\QC_EnvironmentTestDotCheckBillEdit.html" />
    <Content Include="views\质量管理\环境检测单\QC_EnvironmentTestDotCheckBillList.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityDailyReprot_Sum.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityDailyReprot.html" />
    <Content Include="views\质量管理\质量报表\QC_FiveMenOneRingList.html" />
@@ -612,6 +620,8 @@
    <Content Include="views\车间管理\报表分析\Sc_ProductedRateReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_HMaterYieldStatisticsList.html" />
    <Content Include="views\车间管理\报表分析\Sc_RetentionTimeReport.html" />
    <Content Include="views\质量管理\基础建模\Gy_EnvironmentTestSchemeBillEdit.html" />
    <Content Include="views\质量管理\基础建模\Gy_EnvironmentTestSchemeBillList.html" />
    <Content Include="views\车间管理\车间在制品期初单\CJ_WIPBeginStockBill.html" />
    <Content Include="views\车间管理\车间在制品期初单\CJ_WIPBeginStockBillList.html" />
    <Content Include="views\车间管理\防错验证\Gy_MaterPreventErrMouldBill.html" />
@@ -631,6 +641,7 @@
    <Content Include="views\采购管理\采购报表\Cg_POInStockBillSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POMaterialPriceReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderBillProcessSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderInStockSumReport.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillCheckQuery.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillQuery.html" />
    <Content Include="views\销售管理\出门确认单_新\Xs_OutDoorBill.html" />
@@ -640,6 +651,7 @@
    <Content Include="views\销售管理\收款单\YS_ReceiveBillQuery.html" />
    <Content Include="views\销售管理\销售合同\Add_Edit_Xs_ContractBillList.html" />
    <Content Include="views\销售管理\销售合同\Xs_ContractBillList.html" />
    <Content Include="views\销售管理\销售报表\Xs_SeOrderOutStockSumReport.html" />
    <Content Include="views\销售管理\销售订单\Xs_SeOrderBillQuery.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_PM_CustomerProInfoBill.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_TaskClass.html" />