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

yangle

2024-09-19 fb404fae615087a8dfca3c31ea85ecb5f8874e12

 WebTM/WebTM.csproj

@@ -141,6 +141,7 @@
    <Content Include="layuiadmin\treeTable.js" />
    <Content Include="layuiadmin\PubCustom.js" />
    <Content Include="layuiadmin\PubJs\PubCheck.js" />
    <Content Include="layuiadmin\HideButton_New.js" />
    <Content Include="views\Baseset\HBarPlanPrint.html" />
    <Content Include="views\Baseset\SRM_OpenTmpList_GXPG.html" />
    <Content Include="views\Baseset\基础资料\Gy_BadCountDevelopWHList.html" />
@@ -346,6 +347,13 @@
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CheckNoteItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_TechnologyParameterType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_MaintainLev.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectBasis_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectInstruMent_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QualityStd_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectMethod_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_CheckItem_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectValue_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QCCheckClass_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterType.html" />
    <Content Include="views\基础资料\公用基础资料\SumAdd_Gy_RestDay.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_RestDay.html" />
@@ -357,6 +365,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_PreventErrMould.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_UnitConvertRateList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPayMentBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOOrderBillByID.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOStockInBillByID.aspx" />
@@ -366,6 +375,7 @@
    <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_QC_TakeSampleCheckBillMainList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlSRM_Web_BarCodeBillList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemMethodEdit.html" />
@@ -377,10 +387,13 @@
    <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_CommonBaseData.html" />
    <Content Include="views\基础资料\隐藏列设置\Gy_GridView_Hide_New.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillEdit.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBill.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBillList.html" />
    <Content Include="views\应收管理\报表分析\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
    <Content Include="views\条码明细\Kf_MateOutBillList_CodeDetail.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldLifeUsePicReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldDotCheckTaskReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldMaintainTaskReport.html" />
@@ -416,6 +429,7 @@
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA_OLD.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldMaintainBill_PDA.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBillList_PDA.html" />
    <Content Include="views\车间管理\关键件绑定\Sc_KeyElementBinding.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackSignBill_BrushCard.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillResumeList.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillType.html" />
@@ -433,6 +447,8 @@
    <Content Include="views\系统管理\用户管理\Gy_UserDeptList.html" />
    <Content Include="views\系统管理\多级审批\审批进度\Xt_CheckFlowProgressList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserRightQuery.html" />
    <Content Include="views\计划管理\Excel\Gy_Group_Excel.html" />
    <Content Include="views\计划管理\Excel\Gy_RoutingGroup_Excel.html" />
    <Content Include="views\计划管理\工艺路线\Pay_ProcPriceTypeChangeReport.html" />
    <Content Include="views\设备管理\Sb_Add_EquipRepairSignBillList.html" />
    <Content Include="views\设备管理\Sb_EquipRepairSignBillList_PDA.html" />
@@ -518,12 +534,15 @@
    <Content Include="views\车间管理\产线\test.html" />
    <Content Include="views\车间管理\单品过站\SingleItemTransitList.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkBeginDotCheckBill.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkDotCheckBillList_Day.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkBeginDotCheckBillList.html" />
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBill.html" />
    <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\车间管理\工序流转\MES_CenterCheckBill.html" />
    <Content Include="views\车间管理\工序流转\MES_CenterCheckBillList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillList_Source.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeArrangement_PG.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_BatchSplit.html" />
@@ -560,6 +579,9 @@
    <Content Include="views\采购管理\采购报表\Cg_POOrderBillProcessSumReport.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillCheckQuery.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillQuery.html" />
    <Content Include="views\销售管理\发货通知单\Xs_SeOutStockBillQuery.html" />
    <Content Include="views\销售管理\应收单\Xs_ReceivableBillQuery.html" />
    <Content Include="views\销售管理\收款单\YS_ReceiveBillQuery.html" />
    <Content Include="views\销售管理\销售合同\Add_Edit_Xs_ContractBillList.html" />
    <Content Include="views\销售管理\销售合同\Xs_ContractBillList.html" />
    <Content Include="views\销售管理\销售订单\Xs_SeOrderBillQuery.html" />
@@ -683,7 +705,7 @@
    <Content Include="views\工资管理\工资结算单%28个人%29\Pay_SingleBalBillEdit_old.html" />
    <Content Include="views\工资管理\工资结算单%28个人%29\Pay_SingleBalBillList.html" />
    <Content Include="views\工资管理\工资结算单%28个人%29\Pay_SingleBalBillEdit.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillEdit.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillEdit_old.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillList.html" />
    <Content Include="views\工资管理\工资计算\Pay_SalaryCalculate.html" />
    <Content Include="views\工资管理\异常工时申请单\Pay_ErrWorkTimesRequestBill.html" />
@@ -2046,10 +2068,12 @@
    <Content Include="views\领料发货\委外补料\Kf_EntrustReplenishOutBill_Check_New.html" />
    <Content Include="views\领料发货\委外补料\Kf_EntrustReplenishOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Check.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast_TK.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast_AR.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast.html" />
    <Content Include="views\领料发货\生产补料\Kf_MateReplenishOutBill_Check_New.html" />
    <Content Include="views\领料发货\生产补料\Kf_MateReplenishOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillQuery.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillList_LookDown.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_CheckList_New.html" />
@@ -2206,6 +2230,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx.cs">
      <DependentUpon>xmlLBM_Gy_StockPlaceList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_StockPlaceList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardChangeType.aspx.cs">
      <DependentUpon>xmlLBM_HGy_CardChangeType.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -2332,6 +2363,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOReportBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ICMOReportBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QC_TakeSampleCheckBillMainList.aspx.cs">
      <DependentUpon>xmlLBM_QC_TakeSampleCheckBillMainList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_QC_TakeSampleCheckBillMainList.aspx.designer.cs">
      <DependentUpon>xmlLBM_QC_TakeSampleCheckBillMainList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Xs_SellOutChangeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Xs_SellOutChangeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>