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

yusijie

2023-10-26 c890c969f056b949edae59c91b57cea2ccae3d06

 WebTM/WebTM.csproj

@@ -120,6 +120,8 @@
    <Content Include="views\Baseset\基础资料\Gy_BadWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjGroupEdit.html" />
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ConveyCompList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ConveyTypeList.html" />
    <Content Include="views\Baseset\基础资料\Gy_EquipFileBillMainList.html" />
    <Content Include="views\Baseset\基础资料\Gy_GetProcNoList.html" />
    <Content Include="views\Baseset\基础资料\Gy_InspectInstruMentList.html" />
@@ -141,6 +143,7 @@
    <Content Include="views\Baseset\基础资料\Gy_TechParameterUnitList.html" />
    <Content Include="views\Baseset\基础资料\Gy_StockPlaceListNew.html" />
    <Content Include="views\Baseset\基础资料\Gy_UnitGroup.html" />
    <Content Include="views\Baseset\基础资料\Gy_CustomerListNew.html" />
    <Content Include="views\Baseset\基础资料\Gy_WarehouseListNew.html" />
    <Content Include="views\Baseset\基础资料\Gy_WasterWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WHList.html" />
@@ -148,6 +151,7 @@
    <Content Include="views\Baseset\基础资料\Gy_WWWasterWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WarehouseList_JIT.html" />
    <Content Include="views\Baseset\基础资料\OtherOutRequestBillList.html" />
    <Content Include="views\Baseset\基础资料\Sc_ICMOBillListView3.html" />
    <Content Include="views\Baseset\基础资料\Sc_ICMOBillListView2.html" />
    <Content Include="views\Baseset\基础资料\Sc_ProcessExchangeBillListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckItemListView.html" />
@@ -205,6 +209,7 @@
    <Content Include="views\video\1.wav" />
    <Content Include="views\video\jingbao.wav" />
    <Content Include="views\video\success.wav" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产管理\删托单\Sc_DeletePackUnionBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产管理\生产组托单\Sc_PackUnionBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产管理\生产组托单\Sc_PackUnionBill_PDA.html" />
@@ -222,6 +227,13 @@
    <Content Include="views\人事管理\离职申请\HR_EmpDimissionBillList.html" />
    <Content Include="views\人事管理\职员异动单\HR_EmpChangeBill.html" />
    <Content Include="views\人事管理\职员异动单\HR_EmpChangeBillList.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_BadClass.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_Material.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_Emp.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_Dept.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_Customer.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_Sum.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill_KaiBei.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_TemporaryArea.html" />
@@ -230,6 +242,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_TemporaryArea.html" />
    <Content Include="views\基础资料\公用基础资料\HBarPlanPrint_GXPG.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeArrangement.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_MateOutBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_OtherOutBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_WarehouseList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_EmployeeList.aspx" />
@@ -238,6 +251,7 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcCommPrice.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcCommPriceList.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Souce_Excel.html" />
    <Content Include="views\工资管理\加班申请\Pay_OverApplyBill.html" />
    <Content Include="views\工资管理\加班申请\Pay_OverApplyBillList.html" />
    <Content Include="views\工资管理\定额申请\Pay_ProcPriceRequestBill.html" />
@@ -259,11 +273,15 @@
    <Content Include="views\工资管理\请假申请\Pay_OutApplyBill.html" />
    <Content Include="views\工资管理\请假申请\Pay_OutApplyBillList.html" />
    <Content Include="views\条码明细\Kf_BarCodeDetailQuery.html" />
    <Content Include="views\生产管理\作业指导书\Gy_SOPBill_Video.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_Reply_MESExecptFeedBackBill.html" />
    <Content Include="views\生产管理\日计划基础资料\Cg_PODemandPlanConfigBill_Excel.html" />
    <Content Include="views\生产管理\日计划报表\MaterialShorAnalysisReport.html" />
    <Content Include="views\生产管理\生产工位\Gy_SourceWorkStationSet.html" />
    <Content Include="views\生产管理\生产工位\Gy_SourceWorkStationSetList.html" />
    <Content Include="views\生产管理\生产计划平台\Sc_ShopCalendar.html" />
    <Content Include="views\生产管理\订单状态分布\Sc_OrderStateDistribution.html" />
    <Content Include="views\生产管理\齐套分析\JIT_CompleteMaterlDetailList.html" />
    <Content Include="views\系统管理\快捷方式自定义\Xt_UserFastMenu.html" />
    <Content Include="views\系统管理\快捷方式自定义\Xt_UserFastMenu_IconSet.html" />
    <Content Include="views\系统管理\按钮设置\Xt_ModuleButtonSet.html" />
@@ -274,6 +292,12 @@
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillListQuery.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillList_His.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillSubList.html" />
    <Content Include="views\质量管理\工序检验单\MES_ProcessCheckBillList_PDA.html" />
    <Content Include="views\质量管理\工序检验单\MES_ProcessCheckBill_PDA.html" />
    <Content Include="views\质量管理\首件检验单\QC_FirstPieceCheckReport_ZDQX.html" />
    <Content Include="views\车间管理\工序流转\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
    <Content Include="views\车间管理\报表分析\Sc_ProcessErrStationReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_MateOutSumReport_QiaoYi.html" />
    <Content Include="views\车间管理\报表分析\Kf_BrushingOutReport.html" />
    <Content Include="views\车间管理\产线组装追溯\Cj_AssemblyTraceability.html" />
    <Content Include="views\车间管理\产线组装追溯\Cj_AssemblyTraceabilityList.html" />
@@ -291,14 +315,27 @@
    <Content Include="views\车间管理\工序流转卡\WW_EntrustWorkOrderBillList.html" />
    <Content Include="views\车间管理\工序进站接收单\Cj_StationInBillSubList.html" />
    <Content Include="views\车间管理\报表分析\Kf_ColorBlankLustringOutReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_EmbossingOutReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_FinalizeOutReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_FinalizeTheDesignOutReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_LustringOutReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_LustringReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_ShrinkBrushOutReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_ShrinkBrushReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_DigitalSprayPaintingReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_DryFinalizeOutReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_HairtipReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterOutReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_ProdProcessEntryReport_DyeColor.html" />
    <Content Include="views\车间管理\报表分析\Kf_ProdProcessSumReport_DyeColor.html" />
    <Content Include="views\车间管理\报表分析\Kf_ProdProcessSumReport_DyeColor_third.html" />
    <Content Include="views\车间管理\报表分析\Kf_ShrinkBrushTeReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_SizingFinalizeOutReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_StereoscopicFlowerOutReport.html" />
    <Content Include="views\车间管理\报表分析\SC_DayRkReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_ICOMProBarCodeReport.html" />
    <Content Include="views\车间管理\报表分析\sc_ICOMReport.html" />
    <Content Include="views\车间管理\报表分析\sc_ICOMRKBanReport.html" />
    <Content Include="views\车间管理\报表分析\sc_ICOMRKReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_WorkShopProcessWIPSumReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_WorkShopProcessWIPReport.html" />
@@ -445,6 +482,9 @@
    <Content Include="views\grf\出库码单.grf" />
    <Content Include="views\grf\流转卡.grf" />
    <Content Include="views\grf\cs10.grf" />
    <Content Include="views\grf\指引卡1.grf" />
    <Content Include="views\grf\生产领料单.grf" />
    <Content Include="views\grf\工序在制报表.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -1312,6 +1352,7 @@
    <Content Include="views\车间管理\报表分析\ProductionPlanReportList.html" />
    <Content Include="views\车间管理\报表分析\Sc_StationInBillList.html" />
    <Content Include="views\车间管理\报表分析\Sc_StationOutSumReport.html" />
    <Content Include="views\车间管理\报表分析\SemiFinishedProductsReport.html" />
    <Content Include="views\车间管理\车间收料\JIT_SendGoodsBillList.html" />
    <Content Include="views\采购管理\报价单\Sup_QuotePriceBillEdit.html" />
    <Content Include="views\采购管理\报价单\Sup_QuotePriceBillList.html" />
@@ -1324,18 +1365,24 @@
    <Content Include="views\采购管理\采购退料单\Cg_PurchaseReturnList.html" />
    <Content Include="views\采购管理\采购退料单\Cg_PurchaseReturn_Add_Up.html" />
    <Content Include="views\销售管理\发货通知单\Add_Edit_Xs_SeOutStockBillList.html" />
    <Content Include="views\销售管理\退货通知单\Xs_SeOutStockBackBill.html" />
    <Content Include="views\销售管理\销售订单\Xs_SeOrderBillDyColList.html" />
    <Content Include="views\销售管理\销售退货单\Add_Edit_Kf_ICStockBillMainList.html" />
    <Content Include="views\销售管理\销售退货单\Kf_ICStockBillMainList.html" />
    <Content Include="views\销售管理\销售订单\Add_Edit_Xs_SeOrderBillList.html" />
    <Content Include="views\项目管理\业绩指标\PM_YearEmployeeMoneyBillList.html" />
    <Content Include="views\项目管理\业绩指标\PM_YearEmployeeMoneyBill.html" />
    <Content Include="views\项目管理\周计划\PM_WorkTaskWeekBillList.html" />
    <Content Include="views\项目管理\周计划\PM_WorkTaskWeekBill.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskReportBillList.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskReportBill.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskBillList.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskBill.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectBill.html" />
    <Content Include="views\项目管理\工程项目\PM_ProjectBillList.html" />
    <Content Include="views\项目管理\报表分析\PM_WorkTaskReportMonthSumReport.html" />
    <Content Include="views\项目管理\报表分析\PM_ProjectWorkDaysSumReport.html" />
    <Content Include="views\项目管理\报表分析\PM_ProjectWorkDaysEntryReport.html" />
    <Content Include="views\项目管理\项目阶段\Add_Edit_Gy_ProjectStage.html" />
    <Content Include="views\项目管理\项目阶段\Gy_ProjectStage.html" />
    <Content Include="views\项目管理\项目阶段\PM_ProjectReportBillList.html" />
@@ -1354,8 +1401,10 @@
    <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_SellOutBill.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_Check_New.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutRequestBill.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBackBillEdit.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBackBill_Fast.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBillLEdit.html" />
@@ -1363,6 +1412,7 @@
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_FastCheck.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_Check_New.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutRequestBillList.html" />
    <Content Include="views\领料发货\领料出库\Kf_StockOutRequestBill.html" />
    <Content Include="views\领料发货\领料出库\Kf_StockOutRequestBillList.html" />
    <Content Include="views\验收入库\产品入库\Kf_ICStockBillSub_WMS_List.html" />
@@ -1507,6 +1557,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeArrangement.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeArrangement.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_MateOutBillList.aspx.cs">
      <DependentUpon>xmlLBM_Kf_MateOutBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_MateOutBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_MateOutBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_OtherOutBillList.aspx.cs">
      <DependentUpon>xmlLBM_Kf_OtherOutBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>