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

yxj

2024-01-18 5ebd6758ee61497b0d485c2145c2d49b33951ed3

 WebTM/WebTM.csproj

@@ -93,6 +93,8 @@
    <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" />
    <Content Include="layuiadmin\layui\zgqlayui.js" />
    <Content Include="layuiadmin\lib\extend\echarts.min.js" />
    <Content Include="layuiadmin\lineBreakTransformer.js" />
@@ -272,6 +274,12 @@
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <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_StockCheckItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_SupType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_SellStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_AreaSet.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectInstruMent.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_StockOutStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_StockInStyle.html" />
@@ -281,6 +289,12 @@
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectValue.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_TemporaryArea.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_InspectBasis.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_AreaSet.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CusType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_StockCheckItem.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_SupType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_SellStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PoStockStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_InspectInstruMent.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_StockOutStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_StockInStyle.html" />
@@ -295,6 +309,7 @@
    <Content Include="views\基础资料\公用基础资料\HBarPlanPrint_GXPG.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBackBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOChangeBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeArrangement.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_MateOutBillList.aspx" />
@@ -317,10 +332,14 @@
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_PostSkillList.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_BadResult.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_BadType.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_DisposeWay.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_ScrapReason.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Post.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_PostSkillList.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_BadResult.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_BadType.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_DisposeWayList.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_ScrapReasonList.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Souce_Excel.html" />
    <Content Include="views\工资管理\加班申请\Pay_OverApplyBill.html" />
    <Content Include="views\工资管理\加班申请\Pay_OverApplyBillList.html" />
@@ -347,6 +366,9 @@
    <Content Include="views\条码明细\Kf_BarCodeDetailQuery.html" />
    <Content Include="views\案例代码\普通基础资料\Gy_DepartmentEdit.html" />
    <Content Include="views\案例代码\普通基础资料\Gy_DepartmentList.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldConkBookBillMainReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldMaintainBillMainReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldRepairWorkBillReport.html" />
    <Content Include="views\生产管理\作业指导书\Gy_SOPBill_Video.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_Reply_MESExecptFeedBackBill.html" />
    <Content Include="views\生产管理\报工台工序\产量汇报\Sc_ICMOBillQualityStatus_TmpList.html" />
@@ -367,14 +389,20 @@
    <Content Include="views\系统管理\快捷方式自定义\Xt_UserFastMenu.html" />
    <Content Include="views\系统管理\快捷方式自定义\Xt_UserFastMenu_IconSet.html" />
    <Content Include="views\系统管理\按钮设置\Xt_ModuleButtonSet.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserByUserList.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserByWorkStationList.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserCustomerList.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserCustomerList_Edit.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserMaterList.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserStockRelation.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserProcessList.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserCustomer_ImportByExcel.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserEmployee_Excel.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserProcess_Excel.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserSuplies_Excel.html" />
    <Content Include="views\系统管理\菜单自定义\Xt_DefineMenuDisplay.html" />
    <Content Include="views\系统管理\过滤方案设置\Xt_FastICScheme.html" />
    <Content Include="views\系统管理\过滤方案设置\Xt_FastICSchemeList.html" />
    <Content Include="views\计划管理\产线质检平台\Sc_ICMOBillQualityStatus_Tmp.html" />
    <Content Include="views\计划管理\产线返修平台\Sc_SourceLineRepairBill.html" />
    <Content Include="views\计划管理\产线返修平台\Sc_SourceLineRepairBill_ChangeMater.html" />
@@ -421,6 +449,7 @@
    <Content Include="views\车间管理\工序流转\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
    <Content Include="views\车间管理\工序流转\MES_StationInBillList_PDA_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转\MES_StationOutBillList_PDA_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转卡\Gy_ProcessBatchReport.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillList_LookDown.html" />
    <Content Include="views\车间管理\工序进站接收单\Cj_StationInBillList_QiaoYi.html" />
    <Content Include="views\车间管理\报表分析\Sc_BadReasonReport.html" />
@@ -465,6 +494,7 @@
    <Content Include="views\车间管理\报表分析\sc_ICOMReport.html" />
    <Content Include="views\车间管理\报表分析\sc_ICOMRKBanReport.html" />
    <Content Include="views\车间管理\报表分析\sc_ICOMRKReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_ProcExchangeNoInReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_WorkShopProcessWIPSumReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_WorkShopProcessWIPReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_EmployeePieceWorkReport.html" />
@@ -625,6 +655,8 @@
    <Content Include="views\grf\销售订单变更单2.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>
@@ -791,7 +823,6 @@
    <Content Include="layuiadmin\layui\lay\modules\mobile\zepto.js" />
    <Content Include="layuiadmin\layui\lay\modules\rate.js" />
    <Content Include="layuiadmin\layui\lay\modules\slider.js" />
    <Content Include="layuiadmin\layui\lay\modules\table.js" />
    <Content Include="layuiadmin\layui\lay\modules\tree.js" />
    <Content Include="layuiadmin\layui\lay\modules\upload.js" />
    <Content Include="layuiadmin\layui\lay\modules\util.js" />
@@ -1722,6 +1753,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBackBill.aspx.cs">
      <DependentUpon>xmlLBM_HPOInStockBackBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HPOInStockBackBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_HPOInStockBackBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOChangeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ICMOChangeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>