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

wtt

2024-12-04 e635716b36b3b4eebb5364e7579c056ad1079429

 WebTM/WebTM.csproj

@@ -97,6 +97,7 @@
    <Content Include="layuiadmin\ckou.js" />
    <Content Include="layuiadmin\echarts.min.js" />
    <Content Include="layuiadmin\grwebapp.js" />
    <Content Include="layuiadmin\SetColumn.js" />
    <Content Include="layuiadmin\modules\tableFilter2.js" />
    <Content Include="layuiadmin\PlateBinding.js" />
    <Content Include="layuiadmin\PageTitle.js" />
@@ -266,6 +267,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 +357,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,15 +420,19 @@
    <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" />
    <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" />
@@ -438,6 +447,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" />
@@ -467,11 +478,13 @@
    <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" />
    <Content Include="views\生产管理\生产报表\Sc_QualityReportBillDay.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_BCP.html" />
    <Content Include="views\生产管理\质量汇报单\Sc_QualityReportBill_PDA.html" />
    <Content Include="views\生产管理\质量汇报单\Sc_QualityReportBillSumSave.html" />
    <Content Include="views\看板\采购收料\KB_CGSL.html" />
    <Content Include="views\看板\销售发货\KB_XSFH.html" />
@@ -479,6 +492,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 +526,10 @@
    <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" />
    <Content Include="views\质量管理\质量报表\QC_EquipMentCollectionTechParam.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRule_Excel.html" />
@@ -529,7 +547,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 +567,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 +578,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 +609,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" />
@@ -596,10 +617,13 @@
    <Content Include="views\车间管理\报表分析\Sc_MouldRequirementDay.html" />
    <Content Include="views\车间管理\报表分析\Sc_CompareOrderToSelloutReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_HICMMaterStatisticsList.html" />
    <Content Include="views\车间管理\报表分析\Sc_OEEReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_PlanAchievementRateReport.html" />
    <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" />
@@ -619,6 +643,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" />
@@ -628,6 +653,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" />
@@ -1152,6 +1178,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>
@@ -2068,6 +2095,8 @@
    <Content Include="views\项目管理\周计划\PM_WorkReportWeekBillMainList.html" />
    <Content Include="views\项目管理\周计划\PM_WorkTaskWeekBillList.html" />
    <Content Include="views\项目管理\周计划\PM_WorkTaskWeekBill.html" />
    <Content Include="views\项目管理\基础建模\Gy_ProjectClass.html" />
    <Content Include="views\项目管理\基础建模\Gy_TaskClass.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskBill_AutoLoadBillMain.html" />
    <Content Include="views\项目管理\工程项目\PM_CustomerProInfoBillMainList.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskMoneyBOMBill.html" />