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

zrg

2024-04-16 f8bc4bc7d2cdaa03d7dfd11cb766e5b7e2795d87

 WebTM/WebTM.csproj

@@ -127,6 +127,7 @@
    <Content Include="views\Baseset\基础资料\Gy_ConveyCompList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ConveyTypeList.html" />
    <Content Include="views\Baseset\基础资料\Gy_GroupList.html" />
    <Content Include="views\Baseset\基础资料\Gy_Source.html" />
    <Content Include="views\Baseset\基础资料\Gy_SupplierListNew.html" />
    <Content Include="views\Baseset\基础资料\Gy_EquipFileBillMainList.html" />
    <Content Include="views\Baseset\基础资料\Gy_GetProcNoList.html" />
@@ -269,6 +270,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\仓存管理\仓库调拨\Add_Edit_Kf_MoveStockBill.html" />
    <Content Include="views\仓存管理\分步式调入单\Fb_StepFoldinBillEdit.html" />
    <Content Include="views\仓存管理\条码库存\KF_PonderationBillMain_Temp.html" />
    <Content Include="views\仓存管理\条码报表\Kf_MaterOutInReport.html" />
@@ -294,6 +296,7 @@
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectBasis.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PoStockStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CusType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_BadPhenomena.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_StockCheckItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ProjectMoney.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_SupType.html" />
@@ -310,6 +313,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_InspectBasis.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_AreaSet.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CusType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BadPhenomena.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_StockCheckItem.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ProjectMoney.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_SupType.html" />
@@ -334,6 +338,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" />
@@ -354,6 +359,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderChangeBillList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_RepairCheckList_PDA.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPrice_Excel.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_WorkTypeEdit.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_WorkPayTypeEdit.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ClassTimePrjGroupEdit.html" />
@@ -377,6 +383,8 @@
    <Content Include="views\基础资料\生产基础资料\Gy_DisposeWayList.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_ScrapReasonList.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Souce_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_ShiftsList.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_ShiftsEdit.html" />
    <Content Include="views\基础资料\设备基础资料\Gy_CardAddress.html" />
    <Content Include="views\基础资料\设备基础资料\Gy_CardChangeType.html" />
    <Content Include="views\基础资料\设备基础资料\Gy_CardStatus.html" />
@@ -388,8 +396,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" />
@@ -406,6 +418,7 @@
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesSumQueryBillList.html" />
    <Content Include="views\工资管理\请假申请\Pay_OutApplyBill.html" />
    <Content Include="views\工资管理\请假申请\Pay_OutApplyBillList.html" />
    <Content Include="views\应收管理\报表分析\Kf_SellOutEntryReport.html" />
    <Content Include="views\应收管理\报表分析\Xs_CusBalanceReport.html" />
    <Content Include="views\应收管理\报表分析\Xs_CusBalanceReport_HIsUsingBalanceEntry.html" />
    <Content Include="views\应收管理\报表分析\YS_ContactBalReport_ImportByExcel.html" />
@@ -415,15 +428,41 @@
    <Content Include="views\条码明细\Kf_BarCodeDetailQuery.html" />
    <Content Include="views\案例代码\普通基础资料\Gy_DepartmentEdit.html" />
    <Content Include="views\案例代码\普通基础资料\Gy_DepartmentList.html" />
    <Content Include="views\模治具管理\上模单\Sc_MouldLowerBillEdit.html" />
    <Content Include="views\模治具管理\上模单\Sc_MouldLowerBillEdit_PDA.html" />
    <Content Include="views\模治具管理\上模单\Sc_MouldLowerBillList.html" />
    <Content Include="views\模治具管理\上模单\Sc_MouldLowerBillList_PDA.html" />
    <Content Include="views\模治具管理\上模单\Sc_MouldUpperBillEdit.html" />
    <Content Include="views\模治具管理\上模单\Sc_MouldUpperBillEdit_PDA.html" />
    <Content Include="views\模治具管理\上模单\Sc_MouldUpperBillList.html" />
    <Content Include="views\模治具管理\上模单\Sc_MouldUpperBillList_PDA.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldConkBookBillMainReport.html" />
    <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\生产工序管理\增加不良评审单\QC_NoPassProdConclusionBillMain.html" />
    <Content Include="views\生产工序管理\增加不良评审单\QC_NoPassProdConclusionBillMainList.html" />
    <Content Include="views\生产工序管理\增加不良评审单\QC_NoPassProdDisposeCheckBillMain.html" />
    <Content Include="views\生产工序管理\增加不良评审单\QC_NoPassProdDisposeBillMain.html" />
    <Content Include="views\生产工序管理\增加不良评审单\QC_NoPassProdDisposeCheckBillMainList.html" />
    <Content Include="views\生产工序管理\增加不良评审单\QC_NoPassProdDisposeBillMainList.html" />
    <Content Include="views\生产工序管理\增加不良评审单\QC_NoPassProdRequestBillMainList.html" />
    <Content Include="views\生产工序管理\增加不良评审单\QC_NoPassProdRequestBillMain.html" />
    <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_QualityReportStepBillList_New.html" />
    <Content Include="views\生产管理\报工台工序\不良采集\Sc_QualityReportStepBill_New.html" />
    <Content Include="views\生产管理\报工台工序\产量汇报\Sc_ICMOBillQualityStatus_TmpList.html" />
    <Content Include="views\生产管理\报工台工序\产量汇报\Sc_ICMOBillWorkQtyStatus_TmpList.html" />
    <Content Include="views\生产管理\日计划基础资料\Cg_PODemandPlanConfigBill_Excel.html" />
@@ -435,6 +474,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" />
@@ -479,20 +519,39 @@
    <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_EquipRunningStatusReport.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\质量管理\工序检验单\QC_ProcessCheckBillList2.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackCheckBillList_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackHandleBillList_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackCheckBill_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackSignBillList_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackReceiveBillList_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackBillList_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackHandleBill_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackSignBill_PDA.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackReceiveBill_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" />
@@ -500,6 +559,7 @@
    <Content Include="views\质量管理\质量报表\QC_QualityTraceabilityReport.html" />
    <Content Include="views\质量管理\质量报表\QC_ProdBadReasonStatistics_Sum.html" />
    <Content Include="views\质量管理\首件检验单\MES_ColorRecordBillList_PDA.html" />
    <Content Include="views\质量管理\首件检验单\QC_FirstPieceCheckBillList2.html" />
    <Content Include="views\车间管理\单品过站\BadQueryReport.html" />
    <Content Include="views\质量管理\首件检验单\QC_Add_Edit_FirstPieceCheckBill - 复制.html" />
    <Content Include="views\车间管理\单品过站\Cj_CollectionOfSingleProductDefects.html" />
@@ -729,6 +789,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>
@@ -1625,6 +1687,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" />
@@ -1671,6 +1737,7 @@
    <Content Include="views\项目管理\项目阶段\PM_ProjectReportBill.html" />
    <Content Include="views\项目管理\项目阶段\PM_ProjectStageBillList.html" />
    <Content Include="views\项目管理\项目阶段\PM_ProjectStageBill.html" />
    <Content Include="views\领料发货\其他出库\Add_Edit_Kf_OtherOutBill.html" />
    <Content Include="views\领料发货\其他出库\Kf_OtherOutBill_Check.html" />
    <Content Include="views\领料发货\分步式调出单\Fb_StepFoldOutBillEdit.html" />
    <Content Include="views\领料发货\分步式调出单\Fb_StepFoldOutBillList.html" />
@@ -1700,6 +1767,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" />
@@ -1885,6 +1953,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>