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

yusijie

2024-12-17 a912f4944c5028cc0700c6d189bb3a7c728551b3

 WebTM/WebTM.csproj

@@ -97,6 +97,7 @@
    <Content Include="layuiadmin\ckou.js" />
    <Content Include="layuiadmin\echarts.min.js" />
    <Content Include="layuiadmin\grwebapp.js" />
    <Content Include="layuiadmin\SetColumn.js" />
    <Content Include="layuiadmin\modules\tableFilter2.js" />
    <Content Include="layuiadmin\PlateBinding.js" />
    <Content Include="layuiadmin\PageTitle.js" />
@@ -155,6 +156,8 @@
    <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_ErrMsgBackType.html" />
    <Content Include="views\Baseset\基础资料\Gy_Shifts.html" />
    <Content Include="views\Baseset\基础资料\Gy_GroupList.html" />
    <Content Include="views\Baseset\基础资料\Gy_Source.html" />
    <Content Include="views\Baseset\基础资料\Gy_ProcessList.html" />
@@ -266,6 +269,7 @@
    <Content Include="views\WMS扫码模块\上料防错单\Sc_MaterToSourceBill_PDA.html" />
    <Content Include="views\WMS扫码模块\上料防错单\Sc_MaterToSourceBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBackBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBill_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\其他出库\Kf_OtherOutBill_PDA.html" />
@@ -299,16 +303,25 @@
    <Content Include="views\WMS扫码模块\生产汇报\Sc_ICMOReportBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产补料\Kf_MateReplenishOutBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产补料\Kf_MateReplenishOutBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBillList_Mould_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBill_CusBar_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBill_Mould_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockStepInBill_Mould_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockStepInBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockStepOutBillList_Mould_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockStepOutBill_CusBar_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockStepOutBill_Mould_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" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBackBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBackBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBill_PDA.html" />
    <Content Include="views\WMS扫码模块\采购入库\Kf_POStockInBackBill_PDA.html" />
    <Content Include="views\WMS扫码模块\采购入库\Kf_POStockInBill_Mould_PDA.html" />
    <Content Include="views\WMS扫码模块\采购入库\Kf_POStockInBill_PDA.html" />
    <Content Include="views\WMS扫码模块\采购入库\Kf_POStockInBackBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\采购入库\Kf_POStockInBillList_PDA.html" />
@@ -317,6 +330,9 @@
    <Content Include="views\WMS扫码模块\生产管理\生产组托单\Sc_PackUnionBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\调拨换托\Kf_MoveStockBill_HuanTuo_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\调拨换托\Kf_MoveStockBillList_HuanTuo_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBillList_Mould_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_CusBar_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_Mould_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBackBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBillList_PDA.html" />
@@ -441,6 +457,7 @@
    <Content Include="views\应收管理\报表分析\Xs_SellOutMoneyRangeReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldResumeCheckQuery.html" />
    <Content Include="views\模治具管理\器具点检规程单\Sc_MouldDotCheckRuleBillList_PDA.html" />
    <Content Include="views\模治具管理\器具点检规程单\Sc_MouldDotCheckRuleBill_Excel.html" />
    <Content Include="views\模治具管理\模具其他入库单\Sc_MouldOtherInBillList_PDA.html" />
    <Content Include="views\模治具管理\模具其他入库单\Sc_MouldOtherInBill_PDA_old.html" />
    <Content Include="views\模治具管理\模具其他出库单\Sc_MouldOtherOutBillList_PDA.html" />
@@ -457,6 +474,12 @@
    <Content Include="views\模治具管理\模具改制入库单\Sc_MouldRepairInBill_PDA_old.html" />
    <Content Include="views\模治具管理\模具改制出库单\Sc_MouldRepairOutBillList_PDA.html" />
    <Content Include="views\模治具管理\模具改制出库单\Sc_MouldRepairOutBill_PDA_old.html" />
    <Content Include="views\模治具管理\模具故障维修单PDA\Sc_MouldRepairWorkBill_PDAEdit.html" />
    <Content Include="views\模治具管理\模具故障维修单PDA\Sc_MouldRepairWorkBillList_PDA.html" />
    <Content Include="views\模治具管理\模具故障维修单PDA\Sc_MouldRepairWorkBill_PDA.html" />
    <Content Include="views\模治具管理\模具故障维修单PDA\Sc_MouldConkBookBill_PDAEdit.html" />
    <Content Include="views\模治具管理\模具故障维修单PDA\Sc_MouldConkBookBillList_PDA.html" />
    <Content Include="views\模治具管理\模具故障维修单PDA\Sc_MouldConkBookBill_PDA.html" />
    <Content Include="views\模治具管理\模具生产退库单\Sc_MouldProdBackBillList_PDA.html" />
    <Content Include="views\模治具管理\模具生产退库单\Sc_MouldProdBackBill_PDA_old.html" />
    <Content Include="views\模治具管理\模具生产领用单\Sc_MouldProdOutBillList_PDA.html" />
@@ -470,6 +493,7 @@
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA_OLD.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldMaintainBill_PDA.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFile_Excel.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBill_Excel.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBillList_PDA.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackSignBill_BrushCard.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillResumeList.html" />
@@ -481,6 +505,7 @@
    <Content Include="views\生产管理\生产报表\Sc_NutInspectionCCDPassRate.html" />
    <Content Include="views\生产管理\生产报表\Sc_QualityReportBillMonth.html" />
    <Content Include="views\生产管理\生产报表\Sc_QualityReportBillDay.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_TK.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_BCP.html" />
    <Content Include="views\生产管理\质量汇报单\Sc_QualityReportBill_PDA.html" />
    <Content Include="views\生产管理\质量汇报单\Sc_QualityReportBillSumSave.html" />
@@ -521,6 +546,7 @@
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairReport.html" />
    <Content Include="views\设备管理\设备报表\编辑页面\Edit_Sb_EquipMentCollectionTechParam.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFile_Excel.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipMaintainRuleBill_Excel.html" />
    <Content Include="views\质量管理\基础建模\Gy_ErrMsgBackType_Excel.html" />
    <Content Include="views\质量管理\基础建模\Gy_ErrType_Excel.html" />
    <Content Include="views\质量管理\异常反馈\OA_ErrMsgBackSelfQuery_BGT.html" />
@@ -615,6 +641,7 @@
    <Content Include="views\车间管理\报表分析\Sc_MouldRequirementDay.html" />
    <Content Include="views\车间管理\报表分析\Sc_CompareOrderToSelloutReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_HICMMaterStatisticsList.html" />
    <Content Include="views\车间管理\报表分析\Sc_OEEReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_PlanAchievementRateReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_ProductedRateReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_HMaterYieldStatisticsList.html" />
@@ -630,6 +657,7 @@
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterNoOutReport.html" />
    <Content Include="views\采购管理\付款单\YF_PayMentBillQuery.html" />
    <Content Include="views\采购管理\应付单\Cg_PayableBillQuery.html" />
    <Content Include="views\采购管理\应付单\Cg_PayableBillCheckQuery.html" />
    <Content Include="views\采购管理\收料通知单\Cg_POInStockBillQuery.html" />
    <Content Include="views\采购管理\采购报表\Gy_SupplierPayPlanReport.html" />
    <Content Include="views\采购管理\采购合同\Add_Edit_Cg_ContractBillList.html" />
@@ -640,6 +668,7 @@
    <Content Include="views\采购管理\采购报表\Cg_POInStockBillSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POMaterialPriceReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderBillProcessSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderInStockSumReport.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillCheckQuery.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillQuery.html" />
    <Content Include="views\销售管理\出门确认单_新\Xs_OutDoorBill.html" />
@@ -649,6 +678,7 @@
    <Content Include="views\销售管理\收款单\YS_ReceiveBillQuery.html" />
    <Content Include="views\销售管理\销售合同\Add_Edit_Xs_ContractBillList.html" />
    <Content Include="views\销售管理\销售合同\Xs_ContractBillList.html" />
    <Content Include="views\销售管理\销售报表\Xs_SeOrderOutStockSumReport.html" />
    <Content Include="views\销售管理\销售订单\Xs_SeOrderBillQuery.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_PM_CustomerProInfoBill.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_TaskClass.html" />
@@ -2090,6 +2120,8 @@
    <Content Include="views\项目管理\周计划\PM_WorkReportWeekBillMainList.html" />
    <Content Include="views\项目管理\周计划\PM_WorkTaskWeekBillList.html" />
    <Content Include="views\项目管理\周计划\PM_WorkTaskWeekBill.html" />
    <Content Include="views\项目管理\基础建模\Gy_ProjectClass.html" />
    <Content Include="views\项目管理\基础建模\Gy_TaskClass.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskBill_AutoLoadBillMain.html" />
    <Content Include="views\项目管理\工程项目\PM_CustomerProInfoBillMainList.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskMoneyBOMBill.html" />