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

沈泽

2021-10-27 70f0e663a7f0f90d6d9c4a3b1c2acd6efa1062b7

 WebTM/WebTM.csproj

@@ -74,6 +74,7 @@
    <Content Include="layuiadmin\layui\images\erro.png" />
    <Content Include="layuiadmin\layui\layui.js" />
    <Content Include="layuiadmin\layui\zgqlayui.js" />
    <Content Include="layuiadmin\modules\transfer.js" />
    <Content Include="layuiadmin\myicon\win.svg" />
    <Content Include="layuiadmin\myicon\yidongduan.svg" />
    <Content Include="layuiadmin\myicon\修改密码.svg" />
@@ -106,15 +107,29 @@
    <Content Include="views\grf\b1.grf" />
    <Content Include="views\grf\b.grf" />
    <Content Include="views\indexMenu.html" />
    <Content Include="views\PublicPage\OrderBackInfomation.html" />
    <Content Include="views\PublicPage\OrderLevInformation.html" />
    <Content Include="views\PublicPage\Gy_MaterType.html" />
    <Content Include="views\PublicPage\CheckItemInformation.html" />
    <Content Include="views\PublicPage\Gy_Maintain.html" />
    <Content Include="views\PublicPage\Organizations.html" />
    <Content Include="views\PublicPage\PeopleInformation.html" />
    <Content Include="views\ReportHtml.html" />
    <Content Include="views\test\testRenderAutomationList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderBackInfo.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderLev.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Warehouse.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Xt_ORGANIZATIONSList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Department.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_OrderBackInfo.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_OrderLev.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Employee_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipTypeEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ClassTimePrj.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ClassTimePrj.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter_Add_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_MouldType.html" />
    <Content Include="views\基础资料\公用基础资料\grf\b.grf" />
@@ -532,6 +547,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_Currency.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_Material.aspx" />
    <Content Include="views\基础资料\公用基础资料\Gy_DepartmentList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckBill.aspx" />
@@ -554,6 +570,12 @@
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPriceList.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_Group_Add_Edit.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPrice.html" />
    <Content Include="views\基础资料\数据字典\Xt_DataDictionary_Proc.html" />
    <Content Include="views\基础资料\数据字典\Xt_DataDictionary_View.html" />
    <Content Include="views\基础资料\数据字典\Xt_DataDictionary_Table.html" />
    <Content Include="views\基础资料\数据字典\Xt_DataDictionary_ProcList.html" />
    <Content Include="views\基础资料\数据字典\Xt_DataDictionary_ViewList.html" />
    <Content Include="views\基础资料\数据字典\Xt_DataDictionary_TableList.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_Process.html" />
    <Content Include="views\基础资料\采购基础资料\Gy_Supplier_Edit.html" />
    <Content Include="views\基础资料\销售基础资料\Gy_Customer_Edit.html" />
@@ -689,6 +711,8 @@
    <Content Include="views\系统管理\模块管理\Xt_XtgnbList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserGroupList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserListEdit.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserSuplies.html" />
    <Content Include="views\系统管理\系统参数管理\Xt_SystemParameter_Edit.html" />
    <Content Include="views\系统管理\系统参数管理\Xt_SystemParameterList.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBill.html" />
@@ -742,7 +766,7 @@
    <Content Include="views\车间管理\工序进站接收单\MES_StationInBill_PDA.html" />
    <Content Include="views\车间管理\工序进站接收单\Sc_StationInBill_Mul_PDA.html" />
    <Content Include="views\车间管理\工序进站接收单\Sc_StationInBill_Mul.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillList1111.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillList.html" />
    <Content Include="views\验收入库\产品入库\Kf_ProductInBillList.html" />
    <Content Include="views\验收入库\其他入库\Kf_OtherInBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Kf_ProductInBillList.html" />
@@ -799,7 +823,6 @@
    <Content Include="views\采购管理\委外订单\WW_EntrustOrderBillList.html" />
    <Content Include="views\采购管理\收料通知单\Cg_POInStockBillList.html" />
    <Content Include="views\采购管理\退料通知单\Cg_POInStockBackBillList.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillList.html" />
    <Content Include="views\销售管理\退货通知单\Xs_SeOutStockBackBillList.html" />
    <Content Include="views\销售管理\发货通知单\Xs_SeOutStockBillList.html" />
    <Content Include="views\销售管理\销售订单\Xs_SeOrderBillList.html" />
@@ -859,6 +882,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainPlanBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipMaintainPlanBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx.cs">
      <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_Material.aspx.cs">
      <DependentUpon>xmlLBM_Gy_Material.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>