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

zrg

2024-04-02 f0c246df70e22025be7f59e215f2716fcdcb8e25

 WebTM/WebTM.csproj

@@ -335,6 +335,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_FixCard.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Pay_WorkTimesBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_MyTicke.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SellOutChangeBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLYS_ReceiveOtherBillMainList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlPM_WorkTaskBillMyList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlPM_ProjectBillMainMy.aspx" />
@@ -390,8 +391,12 @@
    <Content Include="views\基础资料\隐藏列设置\Gy_QueryCondition.html" />
    <Content Include="views\工资管理\加班申请\Pay_OverApplyBill.html" />
    <Content Include="views\工资管理\加班申请\Pay_OverApplyBillList.html" />
    <Content Include="views\工资管理\员工技能清单\HR_EmployeeSkillBill.html" />
    <Content Include="views\工资管理\员工技能清单\HR_EmployeeSkillBillList.html" />
    <Content Include="views\工资管理\定额申请\Pay_ProcPriceRequestBill.html" />
    <Content Include="views\工资管理\定额申请\Pay_ProcPriceRequestBillList.html" />
    <Content Include="views\工资管理\岗位技能清单\HR_PostSkillBill.html" />
    <Content Include="views\工资管理\岗位技能清单\HR_PostSkillBillList.html" />
    <Content Include="views\工资管理\工资单\Pay_PayMentBill.html" />
    <Content Include="views\工资管理\工资单\Pay_PayMentBillList.html" />
    <Content Include="views\工资管理\工资结算单%28个人%29\Pay_SingleBalBillEdit.html" />
@@ -434,6 +439,14 @@
    <Content Include="views\生产管理\作业指导书\Gy_SOPBill_Video.html" />
    <Content Include="views\生产管理\工单\Sc_CurrentTicket.html" />
    <Content Include="views\生产管理\工单\Sc_MyTicketList.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackCheckBillMain.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackHandleBillMain.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackCheckBillMainList.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackHandleBillMainList.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackSignBillMainList.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackSignBillMain.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackReceiveBillMain.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackReceiveBillMainList.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_Reply_MESExecptFeedBackBill.html" />
    <Content Include="views\生产管理\报工台工序\产量汇报\Sc_ICMOBillQualityStatus_TmpList.html" />
    <Content Include="views\生产管理\报工台工序\产量汇报\Sc_ICMOBillWorkQtyStatus_TmpList.html" />
@@ -446,6 +459,7 @@
    <Content Include="views\生产管理\生产报表\Sc_InventoryAgeReport.html" />
    <Content Include="views\生产管理\生产报表\Sc_ProdOrderPickingStatusReport.html" />
    <Content Include="views\生产管理\生产计划平台\Sc_ShopCalendar.html" />
    <Content Include="views\生产管理\生产退库单\Sc_ProductionReturnEdit.html" />
    <Content Include="views\生产管理\订单状态分布\Sc_OrderStateDistribution.html" />
    <Content Include="views\生产管理\齐套分析\JIT_CompleteMaterlDetailList.html" />
    <Content Include="views\生产管理\生产订单变更单\Sc_ICMOChangeBill.html" />
@@ -490,20 +504,28 @@
    <Content Include="views\设备管理\Sb_EquipDotCheckBill_PDA.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainBillList_PDA.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainBill_PDA.html" />
    <Content Include="views\设备管理\固定资产卡片\Gy_FixCardChangeBillList_PDA.html" />
    <Content Include="views\设备管理\Sb_EquipRepairCheckBillList_PDA.html" />
    <Content Include="views\设备管理\Sb_EquipRepairCheckBill_PDA.html" />
    <Content Include="views\设备管理\固定资产卡片\Gy_FixCardChangeBill_PDA.html" />
    <Content Include="views\设备管理\固定资产卡片\Gy_FixCardChangeBill.html" />
    <Content Include="views\设备管理\固定资产卡片\Gy_FixCardBill.html" />
    <Content Include="views\设备管理\固定资产卡片\Gy_FixCardChangeBillList.html" />
    <Content Include="views\设备管理\固定资产卡片\Gy_FixCardBillList.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipConkBookBillReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipmentLoadReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairWorkBillReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipDotCheckBillReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipMaintainBillReport.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRuleList_PDA.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipMaintainRuleList_PDA.html" />
    <Content Include="views\质量管理\基础建模\Add_Edit_Gy_ErrMsgBackType.html" />
    <Content Include="views\质量管理\基础建模\Add_Edit_Gy_ErrType.html" />
    <Content Include="views\质量管理\基础建模\Gy_ErrMsgBackType.html" />
    <Content Include="views\质量管理\基础建模\Gy_ErrType.html" />
    <Content Include="views\质量管理\工序检验单\MES_ProcessCheckBillList_PDA.html" />
    <Content Include="views\质量管理\工序检验单\MES_ProcessCheckBill_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackBill_PDA.html" />
    <Content Include="views\质量管理\质量报表\QC_FirstPassRateReport.html" />
    <Content Include="views\质量管理\质量报表\QC_FirstPassRateWeekReport.html" />
    <Content Include="views\质量管理\质量报表\QC_ProdBadReasonStatistics.html" />
@@ -740,6 +762,8 @@
    <Content Include="views\grf\我的工单.grf" />
    <Content Include="views\grf\我的任务.grf" />
    <Content Include="views\grf\其他应收单.grf" />
    <Content Include="views\grf\销售调价单不含税.grf" />
    <Content Include="views\grf\销售调价单含税（仅限含税打印）.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -1636,6 +1660,10 @@
    <Content Include="views\销售管理\特批申请单\Xs_ExceptiveCheckRequestBill.html" />
    <Content Include="views\销售管理\特批申请单\Xs_ExceptiveCheckRequestBillList.html" />
    <Content Include="views\销售管理\退货通知单\Xs_SeOutStockBackBill.html" />
    <Content Include="views\销售管理\销售报表\Xs_SellOutStockSumReport.html" />
    <Content Include="views\销售管理\销售报表\Xs_SeOrderBillProcessSumReport.html" />
    <Content Include="views\销售管理\销售报表\Xs_SeOrderSendDaySumReport.html" />
    <Content Include="views\销售管理\销售报表\Xs_SeOrderBillProfitReport.html" />
    <Content Include="views\销售管理\销售报表\Xe_SeOutReport.html" />
    <Content Include="views\销售管理\销售报表\Xs_SeOutStockReport.html" />
    <Content Include="views\销售管理\销售订单\Xs_SeOrderBill_LookDown.html" />
@@ -1712,6 +1740,7 @@
    <Content Include="views\领料发货\领料出库\Kf_StockOutRequestBill.html" />
    <Content Include="views\领料发货\领料出库\Kf_StockOutRequestBillList.html" />
    <Content Include="views\验收入库\产品入库\Kf_ICStockBillSub_WMS_List.html" />
    <Content Include="views\验收入库\产品入库\Kf_ProductInBillEdit.html" />
    <Content Include="views\验收入库\产品入库\Kf_ProductInBillList.html" />
    <Content Include="views\验收入库\其他入库\Add_Edit_Kf_OtherInBill.html" />
    <Content Include="views\验收入库\其他入库\Kf_OtherInBillList.html" />
@@ -1897,6 +1926,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_MyTicke.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_MyTicke.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Xs_SellOutChangeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Xs_SellOutChangeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Xs_SellOutChangeBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Xs_SellOutChangeBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLYS_ReceiveOtherBillMainList.aspx.cs">
      <DependentUpon>xmlLYS_ReceiveOtherBillMainList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>