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

yangle

2024-03-05 b8a40376426fc110ae50da97144848146080e16c

 WebTM/WebTM.csproj

@@ -243,6 +243,8 @@
    <Content Include="views\WMS扫码模块\生产入库\Kf_ProductInBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产汇报\Sc_ICMOReportBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产汇报\Sc_ICMOReportBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockStepInBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockStepOutBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockStepInBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockStepOutBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBillList_PDA.html" />
@@ -322,6 +324,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_MaterTypeEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TemporaryArea.html" />
    <Content Include="views\基础资料\公用基础资料\HBarPlanPrint_GXPG.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Pay_WorkTimesBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_MyTicke.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlPM_WorkTaskBillMyList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlPM_ProjectBillMainMy.aspx" />
@@ -397,6 +400,7 @@
    <Content Include="views\模治具管理\器具报表\Sc_MouldMaintainBillMainReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldRepairWorkBillReport.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_SplitBarCode.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MaterialMouldBillMainList.html" />
    <Content Include="views\生产管理\作业指导书\Gy_SOPBill_Video.html" />
    <Content Include="views\生产管理\工单\Sc_MyTicketList.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_Reply_MESExecptFeedBackBill.html" />
@@ -441,6 +445,9 @@
    <Content Include="views\计划管理\产线质检平台\Sc_ICMOBillQualityStatus_Tmp.html" />
    <Content Include="views\计划管理\产线返修平台\Sc_SourceLineRepairBill.html" />
    <Content Include="views\计划管理\产线返修平台\Sc_SourceLineRepairBill_ChangeMater.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MaterialMouldBillMain.html" />
    <Content Include="views\计划管理\工艺路线\Gy_MaterialTechParamBillMainList.html" />
    <Content Include="views\计划管理\工艺路线\Gy_MaterialTechParamBillMain.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillListQuery.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillList_His.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillSubList.html" />
@@ -1577,6 +1584,8 @@
    <Content Include="views\采购管理\采购退料单\Cg_PurchaseReturn_Add_Up.html" />
    <Content Include="views\销售管理\信用额度申请单\Xs_CusRatingChangeBill.html" />
    <Content Include="views\销售管理\信用额度申请单\Xs_CusRatingChangeBillList.html" />
    <Content Include="views\销售管理\其他应收单\YS_ReceiveOtherBillMain.htmlList.html" />
    <Content Include="views\销售管理\其他应收单\YS_ReceiveOtherBillMain.html" />
    <Content Include="views\销售管理\发货通知单\Add_Edit_Xs_SeOutStockBillList.html" />
    <Content Include="views\采购管理\应付退款单\YF_PayMentBackBill.html" />
    <Content Include="views\采购管理\应付退款单\YF_PayMentBackBillList.html" />
@@ -1611,6 +1620,10 @@
    <Content Include="views\项目管理\工作任务\PM_WorkTaskBillList.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskBill.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskBillMainMy.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectBeginBillMain.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectBeginBillMainList.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectEndBillMain.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectEndBillMainList.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectMoneyBillMainList.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectMoneyBillMain.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectBill.html" />
@@ -1793,6 +1806,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Pay_WorkTimesBillList.aspx.cs">
      <DependentUpon>xmlLBM_Pay_WorkTimesBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Pay_WorkTimesBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Pay_WorkTimesBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_MyTicke.aspx.cs">
      <DependentUpon>xmlLBM_Sc_MyTicke.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>