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

yxj

2025-01-09 6c9374527ee469085907f6b4a44c51dadea29e86

 WebTM/WebTM.csproj

@@ -104,6 +104,8 @@
    <Content Include="layuiadmin\ext\tableFilter.js" />
    <Content Include="layuiadmin\ext\tableMerge.js" />
    <Content Include="layuiadmin\grwebapp.js" />
    <Content Include="layuiadmin\layui\layui.js" />
    <Content Include="layuiadmin\modules\treeTable.js" />
    <Content Include="layuiadmin\resize\ResizeLeftRight.css" />
    <Content Include="layuiadmin\resize\ResizeLeftRight.js" />
    <Content Include="layuiadmin\QueryScheme.js" />
@@ -127,7 +129,6 @@
    <None Include="Properties\PublishProfiles\JFTM.pubxml" />
    <Content Include="layuiadmin\layui\images\device.png" />
    <Content Include="layuiadmin\layui\images\erro.png" />
    <Content Include="layuiadmin\layui\layui.js" />
    <Content Include="layuiadmin\layui\layui1.js" />
    <Content Include="layuiadmin\layui\lay\modules\table-副本.js" />
    <Content Include="layuiadmin\layui\lay\modules\table.js" />
@@ -416,6 +417,8 @@
    <Content Include="views\基础资料\公用基础资料\excel\Gy_InspectValue_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QCCheckClass_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QualityStd_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BadPhenomena_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_SupType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CheckNoteItem_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EnvironmentTestItem.html" />
@@ -423,6 +426,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_Material_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PreventErrMould_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MouldType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CusType_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterType.html" />
    <Content Include="views\基础资料\公用基础资料\SumAdd_Gy_RestDay.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_RestDay.html" />
@@ -449,18 +453,24 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_OutDoorBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlSRM_Web_BarCodeBillList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemMethod_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemMethodEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemClassEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemMethodList.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemClassList.html" />
    <Content Include="views\基础资料\基础资料\Gy_ConkReasonList_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemClass_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_RepairCheck_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_Repair_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_Maintain_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheck_Excel.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_WorkType_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_ProcMul.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_BadReason_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_ScrapReason_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_BadType_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_DisposeWay_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_BadResult_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_ProcMul.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_PostSkill_Excel.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Post_Excel.html" />
@@ -470,6 +480,7 @@
    <Content Include="views\基础资料\通用基础资料\Gy_CommonBaseData.html" />
    <Content Include="views\基础资料\通用基础资料\Gy_CommonBaseDataCheck.html" />
    <Content Include="views\基础资料\通用基础资料\Gy_GeneralLookDown.html" />
    <Content Include="views\基础资料\采购基础资料\Gy_Supplier_Excel.html" />
    <Content Include="views\基础资料\隐藏列设置\Gy_GridView_Hide_New.html" />
    <Content Include="views\工资管理\定额申请\Pay_ProcPriceRequestBillCheckQuery.html" />
    <Content Include="views\工资管理\工资报表\Pay_PayrollReportByKD.html" />
@@ -541,6 +552,7 @@
    <Content Include="views\生产管理\报工平台功能页\LineBind_Button.html" />
    <Content Include="views\生产管理\班次开班单\Sc_ShiftsBeginInfoBillList.html" />
    <Content Include="views\生产管理\班次开班单\Sc_ShiftsBeginInfoBill_Add_Edit.html" />
    <Content Include="views\生产管理\提料计划\JIT_PickUpCalculate.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillOrProcessExchangeResumeList.html" />
    <Content Include="views\生产管理\生产开工单\Sc_MESBeginWorkBillList_PDA.html" />
    <Content Include="views\生产管理\生产报表\Sc_ProductionInProgressReport.html" />
@@ -551,6 +563,7 @@
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_BCP.html" />
    <Content Include="views\生产管理\订单状态分布\Sc_EquipmentProcessList.html" />
    <Content Include="views\生产管理\订单状态分布\Sc_OEEStatusReport.html" />
    <Content Include="views\生产管理\生产计划平台\Sc_BulkEditWorkTime.html" />
    <Content Include="views\生产管理\质量汇报单\Sc_QualityReportBill_PDA.html" />
    <Content Include="views\生产管理\质量汇报单\Sc_QualityReportBillSumSave.html" />
    <Content Include="views\看板\采购收料\KB_CGSL.html" />
@@ -561,9 +574,11 @@
    <Content Include="views\系统管理\用户管理\Xt_UserRightQuery.html" />
    <Content Include="views\系统管理\系统配置\Xt_AutoLoadBillList.html" />
    <Content Include="views\计划管理\Excel\Gy_Group_Excel.html" />
    <Content Include="views\计划管理\工艺路线\Gy_BulkEditWorkQty.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillCheckQuery.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillCloseList.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillToInvalidatedList.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillWorkQty.html" />
    <Content Include="views\计划管理\工艺路线\Pay_ProcPriceTypeChangeReport.html" />
    <Content Include="views\计划管理\工艺路线\Gy_MaterialTechParamBill_Excel.html" />
    <Content Include="views\设备管理\Sb_Add_EquipRepairSignBillList.html" />