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

zrg

2024-11-14 80abe55214667f5e39ef570d076cd31274801f8a

 WebTM/WebTM.csproj

@@ -284,6 +284,7 @@
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBillList_BarCodeList.html" />
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBill_PDA.html" />
    <Content Include="views\WMS扫码模块\客户条码扫描\Gy_getCusBarCodeBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\库存查询\KF_ICInventoryByCLD_PDA.html" />
    <Content Include="views\WMS扫码模块\扫码验证\Gy_BarCodeConfirmBill_PDA.html" />
    <Content Include="views\WMS扫码模块\扫码验证\Gy_BarCodeConfirmBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\扫码验证\Gy_BarCodeConfirmBillList.html" />
@@ -414,15 +415,18 @@
    <Content Include="views\基础资料\通用基础资料\Gy_CommonBaseData.html" />
    <Content Include="views\基础资料\隐藏列设置\Gy_GridView_Hide_New.html" />
    <Content Include="views\工资管理\定额申请\Pay_ProcPriceRequestBillCheckQuery.html" />
    <Content Include="views\工资管理\工资报表\Pay_PaymentEntryReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_PayWorkShopSumReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_PaymentDayCheckReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_PaymentMonthSumReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_PaymentTimeSumReport.html" />
    <Content Include="views\工资管理\工资报表\Pay_PaymentPieceSumReport.html" />
    <Content Include="views\工资管理\工资结算单%28个人%29\Pay_BatchCheck.html" />
    <Content Include="views\工资管理\工资运算\Pay_SalaryCalculate_New.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBill.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBillList.html" />
    <Content Include="views\应收管理\报表分析\Xs_OutDoorBillReport.html" />
    <Content Include="views\应收管理\报表分析\Xs_SellOutCompareToProductReport.html" />
    <Content Include="views\应收管理\报表分析\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
    <Content Include="views\条码明细\Kf_MateOutBillList_CodeDetail.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldLifeUsePicReport.html" />
@@ -437,6 +441,8 @@
    <Content Include="views\模治具管理\模具其他入库单\Sc_MouldOtherInBill_PDA_old.html" />
    <Content Include="views\模治具管理\模具其他出库单\Sc_MouldOtherOutBillList_PDA.html" />
    <Content Include="views\模治具管理\模具其他出库单\Sc_MouldOtherOutBill_PDA_old.html" />
    <Content Include="views\模治具管理\模具投产验收单\Sc_MouldBatchWorkCheckBillEdit.html" />
    <Content Include="views\模治具管理\模具投产验收单\Sc_MouldBatchWorkCheckBillList.html" />
    <Content Include="views\模治具管理\模具报废入库单\Sc_MouldScrapInBill_PDA.html" />
    <Content Include="views\模治具管理\模具报废入库单\Sc_MouldScrapInBill_PDA_old.html" />
    <Content Include="views\模治具管理\模具报废出库单\Sc_MouldScrapOutBill_PDA.html" />
@@ -479,6 +485,7 @@
    <Content Include="views\系统管理\用户管理\Gy_UserDeptList.html" />
    <Content Include="views\系统管理\多级审批\审批进度\Xt_CheckFlowProgressList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserRightQuery.html" />
    <Content Include="views\系统管理\系统配置\Xt_AutoLoadBillList.html" />
    <Content Include="views\计划管理\Excel\Gy_Group_Excel.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillCheckQuery.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillCloseList.html" />
@@ -512,6 +519,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_QualityDailyReprot_Sum.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityDailyReprot.html" />
    <Content Include="views\质量管理\质量报表\QC_FiveMenOneRingList.html" />
    <Content Include="views\质量管理\质量报表\QC_EquipMentCollectionTechParam.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRule_Excel.html" />
@@ -529,7 +538,7 @@
    <Content Include="views\质量管理\检验取样还样单\QC_BackSampleCheckBillMainList.html" />
    <Content Include="views\质量管理\检验取样还样单\QC_TakeSampleCheckBillMainList.html" />
    <Content Include="views\质量管理\检验取样还样单\QC_Add_TakeSampleCheckBill.html" />
    <Content Include="views\质量管理\质量报表\QC_ErrManagerLedgerReport_EquipTop3Issue.html" />
    <Content Include="views\质量管理\质量报表\QC_BadReasonTop3Report.html" />
    <Content Include="views\质量管理\质量报表\QC_ErrManagerLedgerReport_Issue.html" />
    <Content Include="views\质量管理\质量报表\QC_ErrManagerLedgerReport_SourceOfTheProblem.html" />
    <Content Include="views\质量管理\质量报表\QC_ErrManagerLedgerReport_Source.html" />
@@ -549,6 +558,7 @@
    <Content Include="views\质量管理\质量报表\QC_SkillExamMonthSumReport.html" />
    <Content Include="views\质量管理\质量报表\SB_TechnologyParameterList.html" />
    <Content Include="views\质量管理\质量报表\QC_ProcessPerformanceFirstPass.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityMonthReport.html" />
    <Content Include="views\质量管理\质量报表\Sc_StationOutBil_HProc.html" />
    <Content Include="views\质量管理\质量月度目标单\QC_MonthTarGetBill.html" />
    <Content Include="views\质量管理\质量月度目标单\QC_MonthTarGetBillList.html" />
@@ -559,6 +569,7 @@
    <Content Include="views\车间管理\产线\Gy_WorkDay.html" />
    <Content Include="views\车间管理\产线\MES_AssemblyTraceability.html" />
    <Content Include="views\车间管理\产线\MES_AssemblyTraceabilityList.html" />
    <Content Include="views\车间管理\产线\MES_BarcodeWhiteLabelReport.html" />
    <Content Include="views\车间管理\产线\MES_ProductionLinePackaging_MXG.html" />
    <Content Include="views\车间管理\产线\MES_ProductionLinePackaging.html" />
    <Content Include="views\车间管理\产线\MES_ProductionLinePackagingList.html" />
@@ -589,6 +600,7 @@
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_BatchSplit.html" />
    <Content Include="views\车间管理\报表分析\Cj_HeatTreatmentTemperatureCurveChart.html" />
    <Content Include="views\车间管理\报表分析\Cj_SPCOscillationCurve.html" />
    <Content Include="views\车间管理\报表分析\Cj_TemperatureCurveDryingMachine.html" />
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterNoOutReport.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBill.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBillList.html" />
@@ -1152,6 +1164,7 @@
    <Content Include="views\grf\送货单.grf" />
    <Content Include="views\grf\取样卡.grf" />
    <Content Include="views\grf\15白标打印.grf" />
    <Content Include="views\grf\追溯码.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>