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

zrg

2024-08-13 ba1fb184917b1651221a6decf1144911ff489f86

 WebTM/WebTM.csproj

@@ -252,6 +252,7 @@
    <Content Include="views\video\1.wav" />
    <Content Include="views\video\jingbao.wav" />
    <Content Include="views\video\success.wav" />
    <Content Include="views\WMS扫码模块\三点照合扫码记录单\WMS_CusBarCodeCheckBill_PDA.html" />
    <Content Include="views\WMS扫码模块\上料防错单\Sc_MaterToSourceBill_PDA.html" />
    <Content Include="views\WMS扫码模块\上料防错单\Sc_MaterToSourceBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBackBillList_PDA.html" />
@@ -271,6 +272,10 @@
    <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扫码模块\扫码验证\Gy_BarCodeConfirmBill_PDA.html" />
    <Content Include="views\WMS扫码模块\扫码验证\Gy_BarCodeConfirmBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\扫码验证\Gy_BarCodeConfirmBillList.html" />
    <Content Include="views\WMS扫码模块\扫码验证\Gy_BarCodeConfirmBillList_BarCodeList.html" />
    <Content Include="views\WMS扫码模块\条码出入库查询\Gy_BarCodeBillInOut__PDA.html" />
    <Content Include="views\WMS扫码模块\委外领料\Kf_EntrustOutBill_PDA.html" />
    <Content Include="views\WMS扫码模块\条码查询\Gy_BarCodeBill_QiaoYi_PDA.html" />
@@ -306,6 +311,7 @@
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_QiaoYi_PDA.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBillList_PDA.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBill_PDA.html" />
    <Content Include="views\仓存管理\三点照合扫码记录单\WMS_CusBarCodeCheckBillList.html" />
    <Content Include="views\仓存管理\仓库调拨\Add_Edit_Kf_MoveStockBill.html" />
    <Content Include="views\仓存管理\分步式调入单\Fb_StepFoldinBillEdit.html" />
    <Content Include="views\仓存管理\条码库存\KF_PonderationBillMain_Temp.html" />
@@ -335,12 +341,23 @@
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CheckNoteItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_MaintainLev.html" />
    <Content Include="views\基础资料\公用基础资料\SumAdd_Gy_RestDay.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_RestDay.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PreventErrMould.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ColorClassList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CheckNoteItem.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaintainLev.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_RestDay.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PreventErrMould.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_UnitConvertRateList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPayMentBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOOrderBillByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBillByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBillByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HSeOutStockBillListByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillListByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList2.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
@@ -354,8 +371,15 @@
    <Content Include="views\基础资料\基础资料\Gy_Maintain_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheck_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Process_Excel.html" />
    <Content Include="views\基础资料\隐藏列设置\Gy_GridView_Hide_New.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBill.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBillList.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldLifeUsePicReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldDotCheckTaskReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldMaintainTaskReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldRepairCheckTaskReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldRepairTaskReport.html" />
    <Content Include="views\应收管理\报表分析\Xs_SellOutMoneyRangeReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldResumeCheckQuery.html" />
    <Content Include="views\模治具管理\器具点检规程单\Sc_MouldDotCheckRuleBillList_PDA.html" />
    <Content Include="views\模治具管理\模具其他入库单\Sc_MouldOtherInBillList_PDA.html" />
@@ -390,6 +414,8 @@
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillType.html" />
    <Content Include="views\生产管理\报工台工序\开工\Sc_SwipeCardStart.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillOrProcessExchangeResumeList.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" />
@@ -399,14 +425,24 @@
    <Content Include="views\系统管理\多级审批\审批进度\Xt_CheckFlowProgressList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserRightQuery.html" />
    <Content Include="views\计划管理\工艺路线\Pay_ProcPriceTypeChangeReport.html" />
    <Content Include="views\设备管理\Sb_Add_EquipRepairSignBillList.html" />
    <Content Include="views\设备管理\Sb_EquipRepairSignBillMain.html" />
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBillList_PDA.html" />
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBill_PDA.html" />
    <Content Include="views\设备管理\设备工艺参数订单点检表\SB_EquipICMOTechParamBillList.html" />
    <Content Include="views\设备管理\设备工艺参数订单点检表\SB_EquipICMOTechParamBillEdit.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBillList_PDA.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBill_PDA.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipDotCheckTaskReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairMonthSumReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipMaintainTaskReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairCheckTaskReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipMaintainMonthSumReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairTaskReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipResumeCheckQuery.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairReport.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRule_Excel.html" />
    <Content Include="views\质量管理\巡检记录单\MES_QC_PatrolProcCheckOtherBillList_PDA.html" />
    <Content Include="views\质量管理\工作联系单\OA_WorkLinkSelfQuery.html" />
    <Content Include="views\质量管理\工作联系单\OA_Add_Edit_WorkLinkBill.html" />
    <Content Include="views\质量管理\工作联系单\OA_WorkLinkBillList.html" />
@@ -416,7 +452,31 @@
    <Content Include="views\质量管理\库存检验单\QC_Add_Edit_StockCheckBill.html" />
    <Content Include="views\质量管理\库存检验单\QC_StockCheckBillList.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackSelfQuery.html" />
    <Content Include="views\质量管理\检验取样还样单\QC_Add_BackSampleCheckBill.html" />
    <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_ErrManagerLedgerReport_Issue.html" />
    <Content Include="views\质量管理\质量报表\QC_ErrManagerLedgerReport_SourceOfTheProblem.html" />
    <Content Include="views\质量管理\质量报表\QC_ErrManagerLedgerReport_Source.html" />
    <Content Include="views\质量管理\质量报表\QC_ErrMsgBackBillList.html" />
    <Content Include="views\质量管理\质量报表\QC_BadProductsReport.html" />
    <Content Include="views\质量管理\质量报表\QC_InspectionFormReport.html" />
    <Content Include="views\质量管理\质量报表\QC_MoistureContentDataLedger.html" />
    <Content Include="views\质量管理\质量报表\QC_PerformanceScrapLedger.html" />
    <Content Include="views\质量管理\质量报表\QC_ProcessPerformancePass.html" />
    <Content Include="views\质量管理\质量报表\QC_ErrManagerLedgerReport.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityStatisticsDailyReport.html" />
    <Content Include="views\质量管理\质量报表\QC_RegistrationForTestingReport.html" />
    <Content Include="views\质量管理\质量报表\QC_MoistureContentDataLedger.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityStatisticsDailyReport.html" />
    <Content Include="views\质量管理\质量报表\QC_TechnologyParameterClass.html" />
    <Content Include="views\质量管理\质量报表\SB_TechnologyParameterList.html" />
    <Content Include="views\质量管理\质量报表\QC_ProcessPerformanceFirstPass.html" />
    <Content Include="views\质量管理\质量报表\Sc_StationOutBil_HProc.html" />
    <Content Include="views\质量管理\质量月度目标单\QC_MonthTarGetBill.html" />
    <Content Include="views\质量管理\质量月度目标单\QC_MonthTarGetBillList.html" />
    <Content Include="views\质量管理\车间自检单\QC_Add_Edit_WorkSelfCheckBill.html" />
    <Content Include="views\质量管理\车间自检单\QC_WorkSelfCheckBillList.html" />
    <Content Include="views\车间管理\产线\222.jpg" />
@@ -441,13 +501,20 @@
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBillList.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBill.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBillList.html" />
    <Content Include="views\质量管理\巡检记录单\MES_QC_PatrolProcCheckOtherBill_PDA.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillList_Source.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeArrangement_PG.html" />
    <Content Include="views\车间管理\报表分析\Cj_SPCOscillationCurve.html" />
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterNoOutReport.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBill.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBillList.html" />
    <Content Include="views\车间管理\报表分析\Sc_CompareOrderToSelloutReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_HICMMaterStatisticsList.html" />
    <Content Include="views\车间管理\报表分析\Sc_ProductedRateReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_HMaterYieldStatisticsList.html" />
    <Content Include="views\车间管理\报表分析\Sc_RetentionTimeReport.html" />
    <Content Include="views\车间管理\车间在制品期初单\CJ_WIPBeginStockBill.html" />
    <Content Include="views\车间管理\车间在制品期初单\CJ_WIPBeginStockBillList.html" />
    <Content Include="views\车间管理\防错验证\Gy_MaterPreventErrMouldBill.html" />
    <Content Include="views\车间管理\防错验证\Gy_MaterPreventErrMouldBillList.html" />
    <Content Include="views\车间管理\防错验证\Qc_PreventErrMouldCheckBill.html" />
@@ -984,6 +1051,7 @@
    <Content Include="views\grf\送货单%28A4纸%29.grf" />
    <Content Include="views\grf\送货单%28标签纸%29.grf" />
    <Content Include="views\grf\送货单.grf" />
    <Content Include="views\grf\取样卡.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -2138,6 +2206,48 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_FixCard.aspx.designer.cs">
      <DependentUpon>xmlLBM_HGy_FixCard.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPayMentBill.aspx.cs">
      <DependentUpon>xmlLBM_HPayMentBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPayMentBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_HPayMentBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOOrderBillByID.aspx.cs">
      <DependentUpon>xmlLBM_HPOOrderBillByID.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOOrderBillByID.aspx.designer.cs">
      <DependentUpon>xmlLBM_HPOOrderBillByID.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBillByID.aspx.cs">
      <DependentUpon>xmlLBM_HPOStockInBillByID.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBillByID.aspx.designer.cs">
      <DependentUpon>xmlLBM_HPOStockInBillByID.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBill.aspx.cs">
      <DependentUpon>xmlLBM_HPOStockInBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_HPOStockInBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBillByID.aspx.cs">
      <DependentUpon>xmlLBM_HPOInStockBillByID.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBillByID.aspx.designer.cs">
      <DependentUpon>xmlLBM_HPOInStockBillByID.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HSeOutStockBillListByID.aspx.cs">
      <DependentUpon>xmlLBM_HSeOutStockBillListByID.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HSeOutStockBillListByID.aspx.designer.cs">
      <DependentUpon>xmlLBM_HSeOutStockBillListByID.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_ICStockBackBillList.aspx.cs">
      <DependentUpon>xmlLBM_Kf_ICStockBackBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -2145,6 +2255,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_ICStockBackBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_ICStockBackBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillListByID.aspx.cs">
      <DependentUpon>xmlLBM_Kf_SellOutBillListByID.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillListByID.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_SellOutBillListByID.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx.cs">
      <DependentUpon>xmlLBM_Kf_SellOutBillList_BarCodeNote_ByCusDefine.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>