Browse Source

Merge branch 'master' of ssh://10.10.100.21/source/mes-client

caosy 5 năm trước cách đây
mục cha
commit
e975f40948
100 tập tin đã thay đổi với 1854 bổ sung572 xóa
  1. 58 0
      MES_ODLF/MES_ODLF.csproj
  2. 1119 0
      MES_ODLF/MesHelper.cs
  3. 36 0
      MES_ODLF/Properties/AssemblyInfo.cs
  4. 221 189
      UAS-出货标签管理(泽天)/UAS_出货标签管理.Designer.cs
  5. 8 2
      UAS-出货标签管理(泽天)/UAS_出货标签管理.cs
  6. 3 2
      UAS-出货标签管理(贸易版)/PublicMethod/ExcelHandler.cs
  7. 202 172
      UAS-出货标签管理(贸易版)/UAS_出货标签管理.Designer.cs
  8. 2 2
      UAS-出货标签管理(贸易版)/UAS_出货标签管理.cs
  9. 1 1
      UAS_MES_MAXMADE/App.config
  10. 18 18
      UAS_MES_MAXMADE/CustomControl/AccordionMenu/AccordionMenu.Designer.cs
  11. 3 3
      UAS_MES_MAXMADE/CustomControl/AccordionMenu/AccordionMenu.cs
  12. 1 1
      UAS_MES_MAXMADE/CustomControl/AccordionMenu/NavagationBar.Designer.cs
  13. 3 3
      UAS_MES_MAXMADE/CustomControl/AccordionMenu/NavagationBar.cs
  14. 1 1
      UAS_MES_MAXMADE/CustomControl/BaseForm/BaseForm.Designer.cs
  15. 1 1
      UAS_MES_MAXMADE/CustomControl/BaseForm/BaseForm.cs
  16. 1 1
      UAS_MES_MAXMADE/CustomControl/ButtonUtil/ArrowLeftButton.Designer.cs
  17. 2 2
      UAS_MES_MAXMADE/CustomControl/ButtonUtil/ArrowLeftButton.cs
  18. 1 1
      UAS_MES_MAXMADE/CustomControl/ButtonUtil/ArrowRightButton.Designer.cs
  19. 2 2
      UAS_MES_MAXMADE/CustomControl/ButtonUtil/ArrowRightButton.cs
  20. 1 1
      UAS_MES_MAXMADE/CustomControl/ButtonUtil/ChooseAllButton.Designer.cs
  21. 1 1
      UAS_MES_MAXMADE/CustomControl/ButtonUtil/ChooseAllButton.cs
  22. 1 1
      UAS_MES_MAXMADE/CustomControl/ButtonUtil/CloseButton.Designer.cs
  23. 2 2
      UAS_MES_MAXMADE/CustomControl/ButtonUtil/CloseButton.cs
  24. 1 1
      UAS_MES_MAXMADE/CustomControl/ButtonUtil/DeleteButton.Designer.cs
  25. 2 2
      UAS_MES_MAXMADE/CustomControl/ButtonUtil/DeleteButton.cs
  26. 1 1
      UAS_MES_MAXMADE/CustomControl/ButtonUtil/LockMakeCode.Designer.cs
  27. 4 4
      UAS_MES_MAXMADE/CustomControl/ButtonUtil/LockMakeCode.cs
  28. 1 1
      UAS_MES_MAXMADE/CustomControl/ButtonUtil/NormalButton.Designer.cs
  29. 4 4
      UAS_MES_MAXMADE/CustomControl/ButtonUtil/NormalButton.cs
  30. 1 1
      UAS_MES_MAXMADE/CustomControl/ClickPicBox/ClickPicBox.Designer.cs
  31. 1 1
      UAS_MES_MAXMADE/CustomControl/ClickPicBox/ClickPicBox.cs
  32. 1 1
      UAS_MES_MAXMADE/CustomControl/ClickPicBox/LockIcon.Designer.cs
  33. 1 1
      UAS_MES_MAXMADE/CustomControl/ClickPicBox/LockIcon.cs
  34. 1 1
      UAS_MES_MAXMADE/CustomControl/ComBoxWithFocus/ComBoxWithFocus.Designer.cs
  35. 1 1
      UAS_MES_MAXMADE/CustomControl/ComBoxWithFocus/ComBoxWithFocus.cs
  36. 1 1
      UAS_MES_MAXMADE/CustomControl/ComBoxWithFocus/ComboxWithTip.Designer.cs
  37. 1 1
      UAS_MES_MAXMADE/CustomControl/ComBoxWithFocus/ComboxWithTip.cs
  38. 1 1
      UAS_MES_MAXMADE/CustomControl/ComBoxWithFocus/PrinterCombox.Designer.cs
  39. 1 1
      UAS_MES_MAXMADE/CustomControl/ComBoxWithFocus/PrinterCombox.cs
  40. 1 1
      UAS_MES_MAXMADE/CustomControl/ComBoxWithFocus/SerialPortCombox.Designer.cs
  41. 1 1
      UAS_MES_MAXMADE/CustomControl/ComBoxWithFocus/SerialPortCombox.cs
  42. 1 1
      UAS_MES_MAXMADE/CustomControl/CustomCheckBox/AutoPrintCheckBox.Designer.cs
  43. 3 3
      UAS_MES_MAXMADE/CustomControl/CustomCheckBox/AutoPrintCheckBox.cs
  44. 1 1
      UAS_MES_MAXMADE/CustomControl/CustomCheckBox/CustomCheckBox.Designer.cs
  45. 1 1
      UAS_MES_MAXMADE/CustomControl/CustomCheckBox/CustomCheckBox.cs
  46. 1 1
      UAS_MES_MAXMADE/CustomControl/CustomCheckBox/LockCheckBox.Designer.cs
  47. 3 3
      UAS_MES_MAXMADE/CustomControl/CustomCheckBox/LockCheckBox.cs
  48. 1 1
      UAS_MES_MAXMADE/CustomControl/CustomTabControl/CustomTabControl.Designer.cs
  49. 2 2
      UAS_MES_MAXMADE/CustomControl/CustomTabControl/CustomTabControl.cs
  50. 1 1
      UAS_MES_MAXMADE/CustomControl/CustomTabControl/ThemedColors.cs
  51. 1 1
      UAS_MES_MAXMADE/CustomControl/DataGrid_View/DataGridViewExpand.Designer.cs
  52. 2 2
      UAS_MES_MAXMADE/CustomControl/DataGrid_View/DataGridViewExpand.cs
  53. 1 1
      UAS_MES_MAXMADE/CustomControl/DataGrid_View/DataGridViewWithCheckBox.Designer.cs
  54. 1 1
      UAS_MES_MAXMADE/CustomControl/DataGrid_View/DataGridViewWithCheckBox.cs
  55. 1 1
      UAS_MES_MAXMADE/CustomControl/DataGrid_View/DataGridViewWithFilter.Designer.cs
  56. 1 1
      UAS_MES_MAXMADE/CustomControl/DataGrid_View/DataGridViewWithFilter.cs
  57. 1 1
      UAS_MES_MAXMADE/CustomControl/DataGrid_View/DataGridViewWithSerialNum.Designer.cs
  58. 1 1
      UAS_MES_MAXMADE/CustomControl/DataGrid_View/DataGridViewWithSerialNum.cs
  59. 1 1
      UAS_MES_MAXMADE/CustomControl/GroupBoxWithBorder/GroupBoxWithBorder.Designer.cs
  60. 1 1
      UAS_MES_MAXMADE/CustomControl/GroupBoxWithBorder/GroupBoxWithBorder.cs
  61. 5 5
      UAS_MES_MAXMADE/CustomControl/HeadBar/HeadBar.Designer.cs
  62. 5 5
      UAS_MES_MAXMADE/CustomControl/HeadBar/HeadBar.cs
  63. 1 1
      UAS_MES_MAXMADE/CustomControl/ListViewExpand/ListViewExpand.Designer.cs
  64. 1 1
      UAS_MES_MAXMADE/CustomControl/ListViewExpand/ListViewExpand.cs
  65. 19 19
      UAS_MES_MAXMADE/CustomControl/Pagination/Pagination.Designer.cs
  66. 3 3
      UAS_MES_MAXMADE/CustomControl/Pagination/Pagination.cs
  67. 18 18
      UAS_MES_MAXMADE/CustomControl/Pagination/PaginationDbFind.Designer.cs
  68. 3 3
      UAS_MES_MAXMADE/CustomControl/Pagination/PaginationDbFind.cs
  69. 1 1
      UAS_MES_MAXMADE/CustomControl/PowerControlForm/PowerControlForm.Designer.cs
  70. 1 1
      UAS_MES_MAXMADE/CustomControl/PowerControlForm/PowerControlForm.cs
  71. 1 1
      UAS_MES_MAXMADE/CustomControl/ProcessBar/ProcessBar.Designer.cs
  72. 1 1
      UAS_MES_MAXMADE/CustomControl/ProcessBar/ProcessBar.cs
  73. 1 1
      UAS_MES_MAXMADE/CustomControl/RichText/RichTextAutoBottom.Designer.cs
  74. 2 2
      UAS_MES_MAXMADE/CustomControl/RichText/RichTextAutoBottom.cs
  75. 1 1
      UAS_MES_MAXMADE/CustomControl/SetLoading/LoadingCircle.Designer.cs
  76. 1 1
      UAS_MES_MAXMADE/CustomControl/SetLoading/LoadingCircle.cs
  77. 2 2
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/BlurSearch.Designer.cs
  78. 3 3
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/BlurSearch.cs
  79. 1 1
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/EnterTextBox.Designer.cs
  80. 1 1
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/EnterTextBox.cs
  81. 4 4
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.Designer.cs
  82. 5 5
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.cs
  83. 1 1
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/MaCodeTextBox.Designer.cs
  84. 2 2
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/MaCodeTextBox.cs
  85. 1 1
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/NumOnlyTextBox.Designer.cs
  86. 1 1
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/NumOnlyTextBox.cs
  87. 1 1
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/RoundTextBox.Designer.cs
  88. 1 1
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/RoundTextBox.cs
  89. 1 1
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/SNCodeEnterTextBox.Designer.cs
  90. 2 2
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/SNCodeEnterTextBox.cs
  91. 4 4
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/SearchTextBox.Designer.cs
  92. 4 4
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/SearchTextBox.cs
  93. 2 2
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/SnCollectionBox.Designer.cs
  94. 2 2
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/SnCollectionBox.cs
  95. 1 1
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/SourceStepCount.Designer.cs
  96. 3 3
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/SourceStepCount.cs
  97. 4 4
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/TextAreaForm.Designer.cs
  98. 1 1
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/TextAreaForm.cs
  99. 3 3
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/TextBoxGeneratePaCode.Designer.cs
  100. 2 2
      UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/TextBoxGeneratePaCode.cs

+ 58 - 0
MES_ODLF/MES_ODLF.csproj

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{A496EFD3-D51D-4CA6-850D-777800315301}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>UMES.DLLService</RootNamespace>
+    <AssemblyName>UMES.DLLService</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.121.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>bin\Debug\Oracle.ManagedDataAccess.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MesHelper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

+ 1119 - 0
MES_ODLF/MesHelper.cs

@@ -0,0 +1,1119 @@
+using Oracle.ManagedDataAccess.Client;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Text;
+
+namespace UMES.DllService
+{
+    public class MESHelper
+    {
+        //用于拼接SQL 
+        StringBuilder sql = new StringBuilder();
+        //用于存放批量执行的SQL
+        List<string> sqls = new List<string>();
+        //系统默认的的连接字符串
+        private string ConnectionStrings = "Data Source=192.168.1.23/orcl;User ID=MES;PassWord=select!#%*(;";
+        //用户选择的数据库的连接字符串
+        private OracleConnection connection;
+        //用户选择的数据库的连接字符串
+        private OracleCommand command = null;
+
+        public MESHelper()
+        {
+            connection = new OracleConnection(ConnectionStrings);
+        }
+
+        public MESHelper(string IP)
+        {
+            connection = new OracleConnection("Data Source=" + IP + "/orcl;User ID=MES;PassWord=select!#%*(;");
+        }
+
+        /// <summary>
+        /// 检测当前的岗位资源对应的工序
+        /// </summary>
+        /// <param name="iSN"></param>
+        /// <param name="iResCode"></param>
+        /// <param name="oErrMessage"></param>
+        /// <returns></returns>
+        [Description("序列号对应工序检测")]
+        public bool CheckRoutePassed(string iSN, string iResCode, out string oErrMessage)
+        {
+            if (iSN == "")
+            {
+                oErrMessage = "SN不能为空";
+                return false;
+            }
+            oErrMessage = "";
+            string[] param = new string[] { "", iResCode, iSN, "", "", "", oErrMessage };
+            string[] ParamName = new string[] { "v_i_macode", "v_i_sourcecode", "v_i_sncode", "v_i_usercode", "v_o_macode", "v_o_msid", "v_o_errmsg" };
+            CallProcedure("CS_CHECKSTEPSNANDMACODE", ParamName, ref param);
+            oErrMessage = param[6];
+            DataTable dt = (DataTable)ExecuteSql("select ms_status,ms_stepcode,ms_nextstepcode from makeserial where ms_id=(  select max(ms_id) from makeserial where ms_sncode  in ( select '" + iSN + "' from dual union select sn from makesnrelation where beforesn='" + iSN + "' and sn<>' '  union select beforesn from makesnrelation where sn='" + iSN + "' and beforesn<>' '))", "select");
+            string ms_status = "";
+            string ms_stepcode = "";
+            string ms_nextstepcode = "";
+            if (dt.Rows.Count > 0)
+            {
+                ms_status = dt.Rows[0]["ms_status"].ToString();
+                ms_stepcode = dt.Rows[0]["ms_stepcode"].ToString();
+                ms_nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
+            }
+            string stepcode = GetStepCodeBySource(iResCode);
+            if (ms_nextstepcode != "" && ms_nextstepcode != stepcode)
+            {
+                oErrMessage = "当前序列号下一工序" + ms_nextstepcode;
+                return false;
+            }
+            if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null" || (ms_status == "3" && stepcode == ms_stepcode))
+            {
+                if (ms_status == "3")
+                {
+                    oErrMessage = "";
+                }
+                DataTable dt1 = (DataTable)ExecuteSql("select 1 from makebadcount where mbc_sncode='" + iSN + "' and mbc_stepcode='" + stepcode + "' and mbc_status=0","select");
+                int BadCount = dt1.Rows.Count;
+                //测试不良3次不允许再测试,必须先维修
+                if (BadCount == 3)
+                {
+                    oErrMessage = stepcode + "连续三次测试不良,请进行维修";
+                    return false;
+                }
+                return true;
+            }
+            else
+                return false;
+        }
+
+        /// <summary>
+        /// 验证用户身份信息
+        /// </summary>
+        /// <param name="iUserCode"></param>
+        /// <param name="oErrorMessage"></param>
+        /// <returns></returns>
+        private bool CheckUserLogin(string iUserCode, string iPassWord, out string oErrorMessage)
+        {
+            oErrorMessage = "";
+            string SQL = "select em_code from employee where em_code=:UserName and em_password =:PassWord";
+            DataTable dt;
+            dt = (DataTable)ExecuteSql(SQL, "select", iUserCode, iPassWord);
+            if (dt.Rows.Count > 0)
+                return true;
+            else
+            {
+                oErrorMessage = "用户名或者密码不正确!";
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 验证用户身份信息和岗位资源
+        /// </summary>
+        /// <param name="iUserCode"></param>
+        /// <param name="iResCode"></param>
+        /// <param name="oErrMessage"></param>
+        /// <returns></returns>
+        [Description("验证身份信息")]
+        public bool CheckUserAndResourcePassed(string iUserCode, string iResCode, string iPassWord, out string oErrMessage)
+        {
+            oErrMessage = "";
+            if (iUserCode == "" || iPassWord == "" || iResCode == "")
+            {
+                oErrMessage = "用户名,密码,岗位资源必须填写";
+                return false;
+            }
+            if (CheckUserLogin(iUserCode, iPassWord, out oErrMessage))
+            {
+                string SQL = "select em_code,em_type,em_name from employee where em_code=:UserName ";
+                DataTable dt;
+                dt = (DataTable)ExecuteSql(SQL, "select", iUserCode);
+                if (dt.Rows.Count > 0)
+                {
+                    string em_name = dt.Rows[0]["em_name"].ToString();
+                    string em_type = dt.Rows[0]["em_type"].ToString();
+                    if (iResCode == "")
+                    {
+                        oErrMessage = "岗位资源不允许为空";
+                        return false;
+                    }
+                    if (em_type == "admin")
+                    {
+                        if (CheckExist("Source", "sc_code='" + iResCode + "' and sc_statuscode='AUDITED'"))
+                        {
+                            return true;
+                        }
+                        else
+                        {
+                            oErrMessage = "岗位资源编号错误或者未审核!";
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        dt = getFieldsDatasByCondition("cs$empgroup left join cs$userresource on ur_groupcode=eg_groupcode left join source on ur_resourcecode=sc_code", new string[] { "ur_resourcecode" }, "eg_emcode = '" + iUserCode + "' and sc_statuscode='AUDITED'");
+                        //如果存在该编号
+                        if (dt.Rows.Count > 0)
+                        {
+                            //判断如果多个岗位资源存在,用户输入的只要在其中就行
+                            for (int i = 0; i < dt.Rows.Count; i++)
+                            {
+                                if (dt.Rows[i]["ur_resourcecode"].ToString() == iResCode)
+                                    return true;
+                            }
+                            oErrMessage = "用户不处于当前资源所属分组!";
+                        }
+                        else
+                            oErrMessage = "岗位资源编号错误或者未审核!";
+                    }
+                }
+                else
+                    oErrMessage = "用户不存在!";
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 分配Mac地址和BT地址
+        /// </summary>
+        /// <param name="iSN"></param>
+        /// <param name="oWIFI"></param>
+        /// <param name="oBT"></param>
+        /// <param name="oCode1"></param>
+        /// <param name="oCode2"></param>
+        /// <param name="oCdoe3"></param>
+        /// <param name="oErrMessage"></param>
+        /// <returns></returns>
+        [Description("分配MAC和BT信息")]
+        public bool GetAddressRangeByMO(string iSN, out Dictionary<string, string> oInfo, out string oErrMessage)
+        {
+            oInfo = new Dictionary<string, string>();
+            string oWIFI = "";
+            string oBT = "";
+            string oCode1 = "";
+            string oCode2 = "";
+            string oCdoe3 = "";
+            if (iSN == "")
+            {
+                oErrMessage = "SN不能为空";
+                return false;
+            }
+            oErrMessage = "";
+            string omakeCode = "";
+            GetRcardMOInfo(iSN, out omakeCode, out oErrMessage);
+            string[] param = new string[] { iSN, omakeCode, oWIFI, oBT, oCode1, oCode2, oCdoe3, oErrMessage };
+            string[] ParamName = new string[] { "v_i_sncode", "v_i_macode", "v_o_mac", "v_o_bt", "v_o_code1", "v_o_code2", "v_o_code3", "v_o_errmsg" };
+            CallProcedure("CS_GETADDRESSBYMAKECODE", ParamName, ref param);
+            oInfo.Add("MAC", param[2]);
+            oInfo.Add("BT", param[3]);
+            oInfo.Add("Code1", param[4]);
+            oInfo.Add("Code2", param[5]);
+            oInfo.Add("Code3", param[6]);
+            oErrMessage = param[7];
+            if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
+                return true;
+            else
+                return false;
+        }
+
+        /// <summary>
+        /// 输入的 SN 号查找在制品是否有 IMEI 信息存在,如果存在则将 IMEI 信息传出,如果没有则在该工单下未使用的 IMEI 中随机分配一组
+        /// 如果iIMEI1、iNetCode不为空,则分别作为获取的附件加条件。
+        /// </summary>
+        /// <param name="iSN"></param>
+        /// <param name="iIMEI1"></param>
+        /// <param name="iNetCode"></param>
+        /// <param name="oIMEI1"></param>
+        /// <param name="oIMEI2"></param>
+        /// <param name="oIMEI3"></param>
+        /// <param name="oMEID"></param>
+        /// <param name="oNetCode"></param>
+        /// <param name="oPSN"></param>
+        /// <param name="oID1"></param>
+        /// <param name="oID2"></param>
+        /// <param name="oID3"></param>
+        /// <param name="oErrMessage"></param>
+        /// <returns></returns>
+        [Description("分配IMEI和NetCode信息")]
+        public bool GetMEIOrNetCodeRange(string iSN, string iIMEI1, string iNetCode, out Dictionary<string, string> oInfo, out string oErrMessage)
+        {
+            oInfo = new Dictionary<string, string>();
+            string oIMEI1 = "";
+            string oIMEI2 = "";
+            string oMEID = "";
+            string oNetCode = "";
+            string oPSN = "";
+            string oID1 = "";
+            string oID2 = "";
+            string oID3 = "";
+
+            if (iSN == "")
+            {
+                oErrMessage = "SN不能为空";
+                return false;
+            }
+            oErrMessage = "";
+            string[] param = new string[] { iSN, "", iIMEI1, iNetCode, oIMEI1, oIMEI2, "", oMEID, oNetCode, oPSN, oID1, oID2, oID3, oErrMessage };
+            string[] ParamName = new string[] { "v_i_sncode", "v_i_macode", "v_i_imei", "v_i_netcode", "v_o_imei1", "v_o_imei2", "v_o_imei3", "v_o_meid", "v_o_netcode", "v_o_psn", "v_o_id1", "v_o_id2", "v_o_id3", "v_o_errmsg" };
+            CallProcedure("CS_GETIMEIORNETCODERANGE", ParamName, ref param);
+            oInfo.Add("IMEI1", param[4]);
+            oInfo.Add("IMEI2", param[5]);
+            oInfo.Add("MEID", param[7]);
+            oInfo.Add("NETCODE", param[8]);
+            oInfo.Add("PSN", param[9]);
+            oInfo.Add("ID1", param[10]);
+            oInfo.Add("ID2", param[11]);
+            oInfo.Add("ID3", param[12]);
+            oErrMessage = param[13];
+            if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
+                return true;
+            else
+                return false;
+        }
+
+        /// <summary>
+        /// 获取工单的最近一条执行记录
+        /// </summary>
+        /// <param name="iSN"></param>
+        /// <param name="oMoCode"></param>
+        /// <param name="oErrMessage"></param>
+        /// <returns></returns>
+        [Description("获取序列号对应工单信息")]
+        public bool GetRcardMOInfo(string iSN, out string oMoCode, out string oErrMessage)
+        {
+            //取MakeProcess表中的执行记录ID最大的一个工单的号码
+            oMoCode = "";
+            if (iSN == "")
+            {
+                oErrMessage = "SN不能为空";
+                return false;
+            }
+            oErrMessage = "";
+            sql.Length = 0;
+            sql.Append("select max(ms_id) from makeserial where ms_sncode in (select '" + iSN + "' from dual union select sn from ");
+            sql.Append("makesnrelation where beforesn='" + iSN + "' and sn<>' '  union select beforesn from makesnrelation where sn='" + iSN + "' and beforesn<>' ')");
+            DataTable dt = (DataTable)ExecuteSql(sql.ToString(), "select");
+            string ms_id = dt.Rows[0][0].ToString();
+            oMoCode = getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id='" + ms_id + "'").ToString();
+            if (oMoCode != "")
+                return true;
+            else
+            {
+                oErrMessage = "序列号:" + iSN + " 未归属工单";
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 获取序列号的所有串号信息
+        /// </summary>
+        /// <param name="iSN"></param>
+        /// <param name="oWIFI"></param>
+        /// <param name="oBT"></param>
+        /// <param name="oCode1"></param>
+        /// <param name="oCode2"></param>
+        /// <param name="oCode3"></param>
+        /// <param name="oIMEI1"></param>
+        /// <param name="oIMEI2"></param>
+        /// <param name="oIMEI3"></param>
+        /// <param name="oMEID"></param>
+        /// <param name="oNetCode"></param>
+        /// <param name="oPSN"></param>
+        /// <param name="oID1"></param>
+        /// <param name="oID2"></param>
+        /// <param name="oID3"></param>
+        /// <param name="oID4"></param>
+        /// <param name="oID5"></param>
+        /// <param name="oErrMessage"></param>
+        /// <returns></returns>
+        [Description("查询已分配的信息")]
+        public bool GetMobileAllInfo(string iSN, out Dictionary<string, string> oInfo, out string oErrMessage)
+        {
+            oInfo = new Dictionary<string, string>();
+            oErrMessage = "";
+            if (iSN == "")
+            {
+                oErrMessage = "SN不能为空";
+                return false;
+            }
+            //通过序列号获取最近操作的工单号
+            string ms_id = getFieldDataByCondition("makeserial", "max(ms_id)", "ms_sncode='" + iSN + "'").ToString();
+            if (ms_id != "")
+            {
+                DataTable dt = getFieldsDataByCondition("MakeSerial", new string[] { "ms_id", "ms_mac", "ms_bt", "ms_meid", "ms_netcode", "ms_psn", "ms_imei1", "ms_imei2", "ms_imei3", "ms_othcode1", "ms_othcode2", "ms_othcode3", "ms_othid1", "ms_othid2", "ms_othid3" }, "ms_id='" + ms_id + "'");
+                if (dt.Rows.Count > 0)
+                {
+                    string Code1 = "";
+                    string Code2 = "";
+                    string Code3 = "";
+                    string Code4 = "";
+                    string Code5 = "";
+                    string Code6 = "";
+                    string Code7 = "";
+                    string Code8 = "";
+                    string Code9 = "";
+                    string Code10 = "";
+                    string Code11 = "";
+                    string Code12 = "";
+                    string Code13 = "";
+                    string Code14 = "";
+                    string Code15 = "";
+                    string[] param = new string[] { ms_id, Code1, Code2, Code3, Code4, Code5, Code6, Code7, Code8, Code9, Code10, Code11, Code12, Code13, Code14, Code15 };
+                    string[] ParamName = new string[] { "v_ms_id", "v_i_code1", "v_i_code2", "v_i_code3", "v_i_code4", "v_i_code5", "v_i_code6", "v_i_code7", "v_i_code8", "v_i_code9", "v_i_code10", "v_i_code11", "v_i_code12", "v_i_code13", "v_i_code14", "v_i_code15" };
+                    CallProcedure("GetMobileAllInfo", ParamName, ref param);
+                    for (int i = 1; i < param.Length; i++)
+                    {
+                        //获取出来的参数使用^分割
+                        if (param[i] != "" && param[i] != "null" && param[i] != null)
+                        {
+                            oInfo.Add(param[i].Split('^')[0], param[i].Split('^')[1]);
+                        }
+                    }
+                    oErrMessage = "";
+                    return true;
+                }
+                else
+                {
+                    oErrMessage = "序列号" + iSN + "不存在";
+                    return false;
+                }
+            }
+            else
+            {
+                oErrMessage = "序列号" + iSN + "不存在";
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 记录操作日志
+        /// </summary>
+        /// <param name="iSnCode"></param>
+        /// <param name="iMakeCode"></param>
+        /// <param name="iMPKind"></param>
+        /// <param name="result"></param>
+        /// <param name="iUserCode"></param>
+        private void InsertMakeProcess(string iSnCode, string iMakeCode, string iSourceCode, string iMPKind, string result, string iUserCode)
+        {
+            string CurrentStep = "";
+            string LineCode = "";
+            string CurrentStepName = "";
+            GetStepCodeAndNameAndLineBySource(iSourceCode, ref CurrentStep, ref CurrentStepName, ref LineCode);
+            sql.Length = 0;
+            sql.Append("insert into MakeProcess(mp_id,mp_makecode,mp_maid, mp_mscode,mp_sncode,mp_stepcode,mp_stepname,");
+            sql.Append("mp_craftcode,mp_craftname,mp_kind,mp_result,mp_indate,mp_inman,mp_wccode,mp_linecode,mp_sourcecode,mp_snstatus,mp_sncheckno,mp_snoutboxcode)");
+            sql.Append("select MakeProcess_seq.nextval, ma_code,ma_id,ms_code,ms_sncode,'" + CurrentStep + "','" + CurrentStepName + "',");
+            sql.Append("ma_craftcode,ma_craftname,'" + iMPKind + "','" + result + "',sysdate,'" + iUserCode + "',ma_wccode,'" + LineCode + "','" + iSourceCode + "',");
+            sql.Append("ms_status,ms_checkno,ms_outboxcode from make left join makeserial on ms_makecode=ma_code left join step on st_code=ms_stepcode ");
+            sql.Append("where ms_sncode='" + iSnCode + "' and ma_code='" + iMakeCode + "' and st_code='" + CurrentStep + "'");
+            ExecuteSql(sql.ToString(), "insert");
+        }
+
+        /// <summary>
+        /// 保存Mac地址和BT地址
+        /// </summary>
+        /// <param name="iSN"></param>
+        /// <param name="iMac"></param>
+        /// <param name="iBT"></param>
+        /// <param name="iCode1"></param>
+        /// <param name="iCode2"></param>
+        /// <param name="iCode3"></param>
+        /// <param name="oErrMessage"></param>
+        /// <returns></returns>
+        [Description("写入SN的Wifi,BT信息")]
+        public bool SetAddressInfo(string iSN, string iMac, string iBT, string iCode1, string iCode2, string iCode3, out string oErrMessage)
+        {
+            if (iSN == "")
+            {
+                oErrMessage = "SN不能为空";
+                return false;
+            }
+            oErrMessage = "";
+            string[] param = new string[] { iSN, iMac, iBT, iCode1, iCode2, iCode3, oErrMessage };
+            string[] ParamName = new string[] { "v_i_sncode", "v_i_mac", "v_i_bt", "v_i_code1", "v_i_code2", "v_i_code3", "v_o_errmsg" };
+            CallProcedure("CS_SETADDRESSINFO", ParamName, ref param);
+            oErrMessage = param[6];
+            if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
+                return true;
+            else
+                return false;
+        }
+
+        [Description("序列号跳到下一 步")]
+        public bool SetStepFinish(string iMakeCode, string iSourceCode, string iSN, string iMPKind, string iResult, string iUserCode, string iErrCode, out string oErrMessage)
+        {
+            if (iSN == "")
+            {
+                oErrMessage = "SN不能为空";
+                return false;
+            }
+            oErrMessage = "";
+            string StepCode = getFieldDataByCondition("Makeserial", "ms_stepcode", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'").ToString();
+            string CurrentStep = GetStepCodeBySource(iSourceCode);
+            string BgCode = getFieldDataByCondition("step", "st_badgroupcode", "st_code='" + CurrentStep + "'").ToString();
+            switch (iResult)
+            {
+                case "OK":
+                    break;
+                case "NG":
+                    if (iErrCode == "")
+                    {
+                        oErrMessage = "测试结果为NG时必须传递不良代码";
+                        return false;
+                    }
+                    else
+                    {
+                        UpdateByCondition("makebad", "mb_status=-1", "mb_sncode='" + iSN + "' and mb_makecode='" + iMakeCode + "' and mb_stepcode='" + CurrentStep + "' and mb_status=0");
+                        string[] BadCode = iErrCode.Split(',');
+                        sql.Length = 0;
+                        sql.Append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode");
+                        sql.Append(",mb_sourcecode,mb_badcode,mb_badtable,mb_bgcode,mb_soncode,mb_status) select makebad_seq.nextval");
+                        sql.Append(",ma_code,ms_code,ms_sncode,'" + iUserCode + "',sysdate,'" + CurrentStep + "','" + iSourceCode + "',:bc_code,'',");
+                        sql.Append("'" + BgCode + "',sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
+                        sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
+                        List<string> InsertSQL = new List<string>();
+                        for (int i = 0; i < BadCode.Length; i++)
+                        {
+                            InsertSQL.Add(sql.ToString().Replace(":bc_code", "'" + BadCode[i] + "'"));
+                        }
+                        ExecuteSQLTran(InsertSQL.ToArray());
+                        //将不良的序列号的状态码设为3
+                        ExecuteSql("update makeserial set ms_status='3' where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'", "update");
+                    }
+                    break;
+                default:
+                    oErrMessage = "测试结果必须为NG或者OK";
+                    return false;
+            }
+            //不良采集为良品是更新
+            if (StepCode == CurrentStep && iResult == "OK")
+            {
+                DataTable dt = getFieldsDataByCondition("makeserial", new string[] { "ms_status", "ms_craftcode", "ms_prodcode" }, "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
+                if (dt.Rows.Count > 0)
+                {
+                    string ms_status = dt.Rows[0]["ms_status"].ToString();
+                    string ms_craftcode = dt.Rows[0]["ms_craftcode"].ToString();
+                    string ms_prodcode = dt.Rows[0]["ms_prodcode"].ToString();
+                    if (ms_status == "3")
+                    {
+                        string nextstepcode = getFieldDataByCondition("craft left join craftdetail on cr_id=cd_crid ", "cd_nextstepcode", "cr_code='" + ms_craftcode + "' and cr_prodcode='" + ms_prodcode + "' and cd_stepcode='" + CurrentStep + "'").ToString();
+                        UpdateByCondition("makeserial", "ms_status=1,ms_nextstepcode='" + nextstepcode + "'", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
+                        UpdateByCondition("makebad", "mb_status=-1", "mb_sncode='" + iSN + "' and mb_makecode='" + iMakeCode + "'");
+                    }
+                }
+            }
+            return CS_SetFinish(iMakeCode, iSourceCode, iSN, iUserCode, iResult, out oErrMessage);
+        }
+
+        /// <summary>
+        /// 设置测试结果
+        /// </summary>
+        /// <param name="iMakeCode"></param>
+        /// <param name="iSourceCode"></param>
+        /// <param name="iSN"></param>
+        /// <param name="iOperater"></param>
+        /// <param name="iResult"></param>
+        /// <param name="iUserCode"></param>
+        /// <param name="oErrorMessage"></param>
+        /// <returns></returns>
+        [Description("设置测试结果,结果必须为NG或者OK")]
+        public bool SetMobileData(string iTSN, string iSN, string iSourceCode, string iOperater, string iResult, string iErrCode, string flag, out string oErrorMessage)
+        {
+            oErrorMessage = "";
+            if (iTSN == "") { oErrorMessage = "TSN不能为空"; return false; }
+            if (iSN == "") { oErrorMessage = "SN不能为空"; return false; }
+            string[] param = new string[] { iTSN, iSN, iSourceCode, iOperater, iResult, iErrCode, oErrorMessage };
+            string[] ParamName = new string[] { "v_i_tsn", "v_i_sncode", "v_i_sourcecode", "v_i_usercode", "v_i_result", "v_i_errcode", "v_o_errmsg" };
+            CallProcedure("CS_DLLSNCHANGE", ParamName, ref param);
+            oErrorMessage = param[6];
+            if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
+                return true;
+            else
+                return false;
+        }
+
+        private bool CS_SetFinish(string iMakeCode, string iSourceCode, string iSN, string iUserCode, string iResult, out string oErrMessage)
+        {
+            if (iSN == "")
+            {
+                oErrMessage = "SN不能为空";
+                return false;
+            }
+            oErrMessage = "";
+            string[] param = new string[] { iMakeCode, iSourceCode, iSN, iUserCode, iResult, oErrMessage };
+            string[] ParamName = new string[] { "v_i_macode", "v_i_sourcecode", "v_i_sncode", "v_i_usercode", "v_i_result", "v_o_errmsg" };
+            CallProcedure("CS_SETSTEPRESULT", ParamName, ref param);
+            oErrMessage = param[5];
+            if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
+                return true;
+            else
+                return false;
+        }
+
+        /// <summary>
+        /// 方法说明:测试详细信息录入系统,针对一个SN多个测试项目结果可循环调用
+        /// </summary>
+        /// <param name="iSN">序列号</param>
+        /// <param name="iClass"></param>
+        /// <param name="iSubClass1"></param>
+        /// <param name="iSubClass2"></param>
+        /// <param name="iSubClass3"></param>
+        /// <param name="iMaxValue"></param>
+        /// <param name="iMinValue"></param>
+        /// <param name="iActualValue"></param>
+        /// <param name="iValue1"></param>
+        /// <param name="iValue2"></param>
+        /// <param name="iValue3"></param>
+        /// <param name="iTestResult"></param>
+        /// <param name="oErrMessage"></param>                                                      
+        /// <returns></returns>
+        [Description("设置测试结果")]
+        public bool SetTestDetail(string iSN, string iClass, string iResCode, string[,] iTestDetail, out string oErrMessage)
+        {
+            if (iSN == "" || iSN == null)
+            {
+                oErrMessage = "SN不能为空";
+                return false;
+            }
+            oErrMessage = "";
+            string omakeCode = "";
+            GetRcardMOInfo(iSN, out omakeCode, out oErrMessage);
+            sql.Length = 0;
+            sql.Append("begin ");
+            bool needBreak = false;
+            for (int i = 0; i < iTestDetail.Length / 200; i++)
+            {
+                string DataField = "Insert into MES_TEST(STD_ID,STD_SN,STD_MAKECODE,STD_CLASS,STD_TESTDATE,";
+                string ValueField = ")values(MES_TEST_SEQ.nextval,'" + iSN + "','" + omakeCode + "','" + iClass + "',sysdate,";
+                for (int j = 0; j < 200; j++)
+                {
+                    if (j == 0)
+                    {
+                        DataField += "STD_ITEMNAME,";
+                        //如果传递的参数没有测试名称则中断插入
+                        if (iTestDetail[i, j] == "" || iTestDetail[i, j] == null)
+                        {
+                            //外层循环也需要中断
+                            needBreak = true;
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        DataField += "STD_ITEM" + j + " ,";
+                    }
+                    ValueField += "'" + iTestDetail[i, j] + "',";
+                }
+                if (needBreak)
+                    break;
+                sql.Append(DataField.Substring(0, DataField.Length - 1) + ValueField.Substring(0, ValueField.Length - 1) + ");");
+            }
+            sql.Append("end;");
+            ExecuteSql(sql.ToString(), "insert");
+            return true;
+        }
+
+        /// <summary>
+        /// 作业调用该方法将确认接收SN对应的IMEI及附属信息。
+        /// </summary>
+        /// <param name="iSN"></param>
+        /// <param name="iMO"></param>
+        /// <param name="iIMEI1"></param>
+        /// <param name="iIMEI2"></param>
+        /// <param name="iIMEI3"></param>
+        /// <param name="iMEID"></param>
+        /// <param name="iNetCode"></param>
+        /// <param name="iPSN"></param>
+        /// <param name="iID1"></param>
+        /// <param name="iBT"></param>
+        /// <param name="iID1"></param>
+        /// <param name="iID2"></param>
+        /// <param name="iID3"></param>
+        /// <param name="oErrorMessage"></param>
+        /// <returns></returns>
+        [Description("设置IMEI信息")]
+        public bool SetIMEIInfo(string iSN, string iIMEI1, out string oErrMessage)
+        {
+            if (iSN == "")
+            {
+                oErrMessage = "SN不能为空";
+                return false;
+            }
+            oErrMessage = "";
+            string[] param = new string[] { iSN, iIMEI1, "", "", "", "", "", "", "", "", oErrMessage };
+            string[] ParamName = new string[] { "v_i_sncode", "v_i_imei1", "v_i_imei2", "v_i_imei3", "v_i_meid", "v_i_netcode", "v_i_psn", "v_i_id1", "v_i_id2", "v_i_id3", "v_o_errmsg" };
+            CallProcedure("CS_SETIMEIINFO", ParamName, ref param);
+            oErrMessage = param[10];
+            if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
+                return true;
+            else
+                return false;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="iSN"></param>
+        /// <param name="iResCode"></param>
+        /// <param name="iOperator"></param>
+        /// <param name="iResult"></param>
+        /// <param name="iErrCode"></param>
+        /// <param name="oErrMessage"></param>
+        /// <returns></returns>
+        [Description("设置测试结果")]
+        public bool SetPcbaData(string iSN, string iResCode, string iOperator, string iResult, string iErrCode, out string oErrMessage)
+        {
+            if (iSN == "")
+            {
+                oErrMessage = "SN不能为空";
+                return false;
+            }
+            oErrMessage = "";
+            string oMakeCode = "";
+            GetRcardMOInfo(iSN, out oMakeCode, out oErrMessage);
+            if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
+                return SetStepFinish(oMakeCode, iResCode, iSN, "", iResult, iOperator, iErrCode, out oErrMessage);
+            else
+                return false;
+        }
+
+        /// <summary>
+        /// 序列号归属工单
+        /// </summary>
+        /// <param name="iMO"></param>
+        /// <param name="iSN"></param>
+        /// <param name="iResCode"></param>
+        /// <param name="oErrMessage"></param>
+        /// <returns></returns>
+        [Description("序列号归属工单")]
+        public bool GoMo(string iMO, string iSN, string iResCode, out string oErrMessage)
+        {
+            if (iSN == "")
+            {
+                oErrMessage = "SN不能为空";
+                return false;
+            }
+            oErrMessage = "";
+            string[] param = new string[] { iMO, iResCode, iSN, "", "", "", oErrMessage };
+            string[] ParamName = new string[] { "v_i_macode", "v_i_sourcecode", "v_i_sncode", "v_i_usercode", "v_o_macode", "v_o_msid", "v_o_errmsg" };
+            CallProcedure("CS_CHECKSTEPSNANDMACODE", ParamName, ref param);
+            oErrMessage = param[6];
+            DataTable dt = (DataTable)ExecuteSql("select ms_status,ms_stepcode,ms_nextstepcode from makeserial where ms_id=(select max(ms_id) from makeserial where ms_sncode='" + iSN + "')", "select");
+            string ms_status = "";
+            string ms_stepcode = "";
+            string ms_nextstepcode = "";
+            if (dt.Rows.Count > 0)
+            {
+                ms_status = dt.Rows[0]["ms_status"].ToString();
+                ms_stepcode = dt.Rows[0]["ms_stepcode"].ToString();
+                ms_nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
+            }
+            string stepcode = GetStepCodeBySource(iResCode);
+            if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null" || (ms_status == "3" && ms_stepcode == stepcode))
+            {
+                if (ms_status == "3")
+                {
+                    oErrMessage = "";
+                }
+                return true;
+            }
+            else
+                return false;
+        }
+
+        /// <summary>
+        /// 获取执行步骤代码,名称和线别
+        /// </summary>
+        /// <param name="Source"></param>
+        /// <param name="StepCode"></param>
+        /// <param name="StepName"></param>
+        /// <param name="LineCode"></param>
+        private void GetStepCodeAndNameAndLineBySource(string Source, ref string StepCode, ref string StepName, ref string LineCode)
+        {
+            DataTable dt = getFieldsDataByCondition("source", new string[] { "sc_stepcode", "sc_stepname", "sc_linecode" }, "sc_code='" + Source + "'");
+            if (dt.Rows.Count > 0)
+            {
+                StepCode = dt.Rows[0]["sc_stepcode"].ToString();
+                StepName = dt.Rows[0]["sc_stepname"].ToString();
+                LineCode = dt.Rows[0]["sc_linecode"].ToString();
+            }
+        }
+
+        /// <summary>
+        /// 获取步骤代码和名称
+        /// </summary>
+        /// <param name="Source"></param>
+        /// <param name="StepCode"></param>
+        /// <param name="StepName"></param>
+        private void GetStepCodeAndNameBySource(string Source, ref string StepCode, ref string StepName)
+        {
+            DataTable dt = getFieldsDataByCondition("source", new string[] { "sc_stepcode", "sc_stepname", "sc_linecode" }, "sc_code='" + Source + "'");
+            if (dt.Rows.Count > 0)
+            {
+                StepCode = dt.Rows[0]["sc_stepcode"].ToString();
+                StepName = dt.Rows[0]["sc_stepname"].ToString();
+            }
+        }
+
+        /// <summary>
+        /// 获取步骤代码
+        /// </summary>
+        /// <param name="Source"></param>
+        /// <returns></returns>
+        private string GetStepCodeBySource(string Source)
+        {
+            return getFieldDataByCondition("source", "sc_stepcode", "sc_code='" + Source + "'").ToString();
+        }
+
+        /// <summary>
+        /// 获取第一行第一列的信息
+        /// </summary>
+        private object getFieldDataByCondition(string TableName, string Field, string Condition)
+        {
+            DataTable dt = new DataTable();
+            string sql = "select " + Field + " from " + TableName + " where " + Condition;
+            command = new OracleCommand(sql, connection);
+            Reconnect(command);
+            OracleDataAdapter ad = new OracleDataAdapter();
+            ad.SelectCommand = command;
+            try
+            {
+                ad.Fill(dt);
+            }
+            catch (Exception)
+            {
+                connection = new OracleConnection(ConnectionStrings);
+                connection.Open();
+                command = new OracleCommand(sql, connection);
+                ad = new OracleDataAdapter();
+                ad.SelectCommand = command;
+                ad.Fill(dt);
+            }
+            ad.Dispose();
+            command.Dispose();
+            if (dt.Rows.Count > 0)
+            {
+                return dt.Rows[0][0];
+            }
+            else
+            {
+                return "";
+            }
+        }
+
+        /// <summary>
+        /// 通过表名和获取单行的记录
+        /// </summary>
+        private DataTable getFieldsDataByCondition(string TableName, string[] Fields, string Condition)
+        {
+            DataTable dt = new DataTable();
+            string sql = "select ";
+            sql += AddField(Fields);
+            sql += " from " + TableName + " where " + Condition + " and rownum=1";
+            command = new OracleCommand(sql, connection);
+            Reconnect(command);
+            OracleDataAdapter ad = new OracleDataAdapter(command);
+            try
+            {
+                ad.Fill(dt);
+            }
+            catch (Exception)
+            {
+                connection = new OracleConnection(ConnectionStrings);
+                connection.Open();
+                command = new OracleCommand(sql, connection);
+                ad = new OracleDataAdapter();
+                ad.SelectCommand = command;
+                ad.Fill(dt);
+            }
+            ad.Dispose();
+            command.Dispose();
+            return dt;
+        }
+
+        /// <summary>
+        /// 通过表名,字段和条件获取DataTable类型的数据
+        /// </summary>
+        private DataTable getFieldsDatasByCondition(string TableName, string[] Fields, string Condition)
+        {
+            DataTable dt = new DataTable();
+            string sql = "select ";
+            sql += AddField(Fields);
+            sql += " from " + TableName + " where " + Condition;
+            command = new OracleCommand(sql, connection);
+            Reconnect(command);
+            OracleDataAdapter ad = new OracleDataAdapter(command);
+            try
+            {
+                ad.Fill(dt);
+            }
+            catch (Exception)
+            {
+                connection = new OracleConnection(ConnectionStrings);
+                connection.Open();
+                command = new OracleCommand(sql, connection);
+                ad = new OracleDataAdapter();
+                ad.SelectCommand = command;
+                ad.Fill(dt);
+            }
+            ad.Dispose();
+            command.Dispose();
+            return dt;
+        }
+
+        /// <summary>
+        /// 通过表名,字段获取DataTable类型的数据
+        /// </summary>
+        private DataTable getFieldsDatas(string TableName, string Fields)
+        {
+            DataTable dt = new DataTable();
+            string sql = "select ";
+            sql += Fields;
+            sql += " from " + TableName;
+            command = new OracleCommand(sql, connection);
+            Reconnect(command);
+            OracleDataAdapter ad = new OracleDataAdapter(command);
+            ad.SelectCommand = command;
+            try
+            {
+                ad.Fill(dt);
+            }
+            catch (Exception)
+            {
+                connection = new OracleConnection(ConnectionStrings);
+                connection.Open();
+                command = new OracleCommand(sql, connection);
+                ad = new OracleDataAdapter();
+                ad.SelectCommand = command;
+                ad.Fill(dt);
+            }
+            ad.Dispose();
+            command.Dispose();
+            return dt;
+        }
+
+        /// <summary>
+        /// 检测内容是否存在
+        /// </summary>
+        /// <param name="TableName"></param>
+        /// <param name="Condition"></param>
+        /// <returns></returns>
+        private bool CheckExist(string TableName, string Condition)
+        {
+            string sql = "select count(1) from " + TableName + " where " + Condition;
+            command = new OracleCommand(sql, connection);
+            Reconnect(command);
+            OracleDataAdapter ad = new OracleDataAdapter(command);
+            DataTable dt = new DataTable();
+            ad.Fill(dt);
+            ad.Dispose();
+            command.Dispose();
+            return int.Parse(dt.Rows[0][0].ToString()) > 0;
+        }
+
+        /// <summary>
+        /// 直接执行SQL,同时传入SQL的类型
+        /// </summary>
+        /// <param name="SQL"></param>
+        /// <param name="Type"></param>
+        /// <returns></returns>
+        private object ExecuteSql(string SQL, string Type, params object[] names)
+        {
+            object result = null;
+            command = new OracleCommand(SQL, connection);
+            Reconnect(command);
+            //用来拼接参数的
+            if (names.Length > 0)
+            {
+                string[] par = SQL.Split(':');
+                //用来存参数的数组
+                StringBuilder[] addpar = new StringBuilder[par.Length - 1];
+                for (int i = 0; i < par.Length - 1; i++)
+                {
+                    //新建一个char类型的数组用来存储每个字节的变量
+                    char[] c = par[i + 1].ToCharArray();
+                    addpar[i] = new StringBuilder();
+                    for (int j = 0; j < c.Length; j++)
+                    {
+                        if (c[j] != ' ' && c[j] != ',' && c[j] != ')')
+                        {
+                            addpar[i].Append(c[j]);
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                }
+                for (int i = 0; i < addpar.Length; i++)
+                {
+                    command.Parameters.Add(new OracleParameter(addpar[i].ToString(), names[i]));
+                }
+            }
+            switch (Type.ToUpper())
+            {
+                case "SELECT":
+                    OracleDataAdapter ad = new OracleDataAdapter(command);
+                    result = new DataTable();
+                    try
+                    {
+                        ad.Fill((DataTable)result);
+                    }
+                    catch (Exception)
+                    {
+                        connection = new OracleConnection(ConnectionStrings);
+                        connection.Open();
+                        command = new OracleCommand(SQL, connection);
+                        ad = new OracleDataAdapter();
+                        ad.SelectCommand = command;
+                        ad.Fill((DataTable)result);
+                    }
+                    break;
+                case "DELETE":
+                    try
+                    {
+                        result = command.ExecuteNonQuery();
+                    }
+                    catch (Exception)
+                    {
+                        command.Connection = new OracleConnection(ConnectionStrings);
+                        command.Connection.Open();
+                        result = command.ExecuteNonQuery();
+                    }
+                    break;
+                case "UPDATE":
+                    try
+                    {
+                        result = command.ExecuteNonQuery();
+                    }
+                    catch (Exception)
+                    {
+                        command.Connection = new OracleConnection(ConnectionStrings);
+                        command.Connection.Open();
+                        result = command.ExecuteNonQuery();
+                    }
+                    break;
+                case "INSERT":
+                    try
+                    {
+                        result = command.ExecuteNonQuery();
+                    }
+                    catch (Exception)
+                    {
+                        command.Connection = new OracleConnection(ConnectionStrings);
+                        command.Connection.Open();
+                        result = command.ExecuteNonQuery();
+                    }
+                    break;
+            }
+            command.Dispose();
+            return result;
+        }
+
+        /// <summary>
+        /// 出现异常进行回滚的执行方法
+        /// </summary>
+        /// <param name="SQL"></param>
+        private void ExecuteSQLTran(params string[] SQL)
+        {
+            command = new OracleCommand();
+            command.Connection = new OracleConnection(ConnectionStrings);
+            command.Connection.Open();
+            Reconnect(command);
+            OracleTransaction tx = command.Connection.BeginTransaction(IsolationLevel.ReadCommitted);
+            command.Transaction = tx;
+            try
+            {
+                foreach (string sql in SQL)
+                {
+                    if (!string.IsNullOrEmpty(sql))
+                    {
+                        command.CommandText = sql;
+                        command.ExecuteNonQuery();
+                    }
+                }
+                tx.Commit();
+            }
+            catch (OracleException E)
+            {
+                tx.Rollback();
+                throw new Exception(E.Message);
+            }
+            command.Dispose();
+        }
+
+        private string UpdateByCondition(string TableName, string update, string condition)
+        {
+            string sql = "update " + TableName + " set " + update + " where " + condition;
+            command = new OracleCommand(sql, connection);
+            Reconnect(command);
+            try
+            {
+                command.ExecuteNonQuery();
+            }
+            catch (Exception)
+            {
+                command.Connection = new OracleConnection(ConnectionStrings);
+                command.Connection.Open();
+                command.ExecuteNonQuery();
+            }
+            command.Dispose();
+            return sql;
+        }
+
+        private void CallProcedure(string ProcedureName, string[] ParamName, ref string[] param)
+        {
+            command = new OracleCommand(ProcedureName);
+            command.Connection = connection;
+            Reconnect(command);
+            command.CommandText = ProcedureName;
+            command.CommandType = CommandType.StoredProcedure;
+            for (int i = 0; i < param.Length; i++)
+            {
+                command.Parameters.Add(new OracleParameter(ParamName[i], OracleDbType.Varchar2, 200, param[i], ParameterDirection.InputOutput));
+                //command.Parameters.Add(new OracleParameter(ParamName[i], OracleType.VarChar, 200, ParameterDirection.InputOutput, "", DataRowVersion.Default, true, param[i]));
+            }
+            try
+            {
+                command.ExecuteNonQuery();
+            }
+            catch (Exception)
+            {
+                command.Connection = new OracleConnection(ConnectionStrings);
+                command.Connection.Open();
+                command.ExecuteNonQuery();
+            }
+            for (int i = 0; i < command.Parameters.Count; i++)
+                param[i] = command.Parameters[i].Value.ToString();
+            command.Dispose();
+        }
+
+        private string AddField(string[] Fields)
+        {
+            string sql = " ";
+            foreach (string field in Fields)
+            {
+                sql += field + ",";
+            }
+            return sql.Substring(0, sql.Length - 1);
+        }
+
+        private string[] GetField(string field)
+        {
+            string[] fields = field.Split(',');
+            for (int i = 0; i < fields.Length; i++)
+            {
+                fields[i] = fields[i].Substring(fields[i].LastIndexOf("as") + 2, fields[i].Length - fields[i].LastIndexOf("as") - 2).Trim();
+            }
+            return fields;
+        }
+
+        private void Reconnect(OracleCommand cmd)
+        {
+            if (cmd.Connection.State == ConnectionState.Closed)
+            {
+                cmd.Connection.Open();
+            }
+        }
+    }
+}

+ 36 - 0
MES_ODLF/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("MES_ODLF")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("MES_ODLF")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+//将 ComVisible 设置为 false 将使此程序集中的类型
+//对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型,
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
+[assembly: Guid("a496efd3-d51d-4ca6-850d-777800315301")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
+// 方法是按如下所示使用“*”: :
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 221 - 189
UAS-出货标签管理(泽天)/UAS_出货标签管理.Designer.cs


+ 8 - 2
UAS-出货标签管理(泽天)/UAS_出货标签管理.cs

@@ -361,6 +361,8 @@ namespace UAS_LabelMachine
             //计算当前采集数量
             string collectqty = dh.getFieldDataByCondition("prodiobarcode", "sum(pib_qty)", "pib_inoutno='" + pi_inoutno.Text + "' and pib_prodcode='" + CurrentPrCode + "' and pib_pdno='" + CurrentPDNO + "'").ToString();
             double CollectQty = (collectqty == "" ? 0 : double.Parse(collectqty));
+            Console.WriteLine(CollectQty + CollectNum);
+            Console.WriteLine(CurrentPrCount);
             if (Convert.ToDouble((CollectQty + CollectNum).ToString("0.000")) > Convert.ToDouble(double.Parse(CurrentPrCount).ToString("0.000")))
             {
                 MessageBox.Show("物料" + Data["PRCODE"] + "采集后数量为" + (CollectQty + CollectNum) + ",【超出】本行出货数量" + CurrentPrCount, "提示");
@@ -403,8 +405,9 @@ namespace UAS_LabelMachine
             {
                 rowsnum = dh.BatchInsert(sql.ToString(), new string[] { "PIB_ID", "PIB_CUSTBARCODE" }, PIBID, CustBarCode.ToArray());
             }
-            catch (Exception)
+            catch (Exception e)
             {
+                Console.WriteLine(e.Message + e.StackTrace);
                 if (ReSetType != " ")
                 {
                     dh.UpdateByCondition("RULEMAXNUM", "rmn_maxnumber='" + (MaxNum + 1) + "'", "rmn_nrcode='" + (NrCode == "" ? "Default" : NrCode) + "' and nvl(rmn_type,' ')='" + ReSetType + "'");
@@ -657,6 +660,7 @@ namespace UAS_LabelMachine
                                 GridPrcode.FirstDisplayedScrollingRowIndex = i;
                         }
                     }
+                    pib_indate.Text = dh.getFieldDataByCondition("prodiobarcode", "min(to_char(pib_indate,'yyyy-mm-dd'))", "pib_inoutno='" + pi_inoutno.Text + "'").ToString();
                     bi_inman.Text = dh.getFieldDataByCondition("barcodeio left join employee on bi_inman=em_code", "wm_concat(distinct em_name)", "bi_piid=" + PI_ID).ToString();
                     pib_inman.Text = dh.getFieldDataByCondition("prodiobarcode left join employee on pib_inman=em_code", "wm_concat(distinct em_name)", "pib_piid=" + PI_ID).ToString();
                     Attach = (DataTable)dh.ExecuteSql("select lap_param lp_name,lap_value lp_sql from LABELATTACHPARAMETER where lap_custcode='" + pi_cardcode.Text + "' and lap_inman='" + User.UserCode + "'", "select");
@@ -1952,13 +1956,15 @@ namespace UAS_LabelMachine
                             string FDC = LabelInf.Rows[i].Cells["pib_datecode"].Value.ToString();
                             string FLOTNO = LabelInf.Rows[i].Cells["pib_lotno"].Value.ToString();
                             string FPDCustProdCode = LabelInf.Rows[i].Cells["pd_custprodcode"].Value.ToString();
+                            string FPDNO = LabelInf.Rows[i].Cells["pib_pdno"].Value.ToString();
                             string BPrcode = LabelInf.Rows[i + 1].Cells["pib_prodcode"].Value.ToString();
                             string BPocode = LabelInf.Rows[i + 1].Cells["pd_pocode"].Value.ToString();
                             string BWhcode = LabelInf.Rows[i + 1].Cells["pib_brand"].Value.ToString();
                             string BDC = LabelInf.Rows[i + 1].Cells["pib_datecode"].Value.ToString();
                             string BLOTNO = LabelInf.Rows[i + 1].Cells["pib_lotno"].Value.ToString();
                             string BPDCustProdCode = LabelInf.Rows[i + 1].Cells["pd_custprodcode"].Value.ToString();
-                            if ((DiffCPN.Checked && FPDCustProdCode != BPDCustProdCode) || FPrcode != BPrcode || FPocode != BPocode || FWhcode != BWhcode || (DiffDC.Checked && FDC != BDC) || (DiffLotNo.Checked && FLOTNO != BLOTNO))
+                            string BPDNO = LabelInf.Rows[i + 1].Cells["pib_pdno"].Value.ToString();
+                            if ((DiffDetno.Checked && BPDNO != FPDNO) || (DiffCPN.Checked && FPDCustProdCode != BPDCustProdCode) || FPrcode != BPrcode || FPocode != BPocode || FWhcode != BWhcode || (DiffDC.Checked && FDC != BDC) || (DiffLotNo.Checked && FLOTNO != BLOTNO))
                             {
                                 MaxNum = MaxNum + 1;
                             }

+ 3 - 2
UAS-出货标签管理(贸易版)/PublicMethod/ExcelHandler.cs

@@ -1130,6 +1130,7 @@ namespace UAS_LabelMachine
                                 {
                                     if (ShowCountIndex == SplitBatchIndex)
                                     {
+                                        row1.CreateCell(j+1);
                                         row1.Cells[j + 1].SetCellValue(sumCount);
                                         row1.Cells[j + 1].CellStyle = styleborder;
                                     }
@@ -3580,7 +3581,7 @@ namespace UAS_LabelMachine
                                 }
                                 else if (j == ShowPieceIndex)
                                 {
-                                    row1.Cells[ShowPieceIndex].SetCellValue(PageNum - 1);
+                                    row1.Cells[ShowPieceIndex].SetCellValue(PageNum);
                                     row1.Cells[j].CellStyle = styleborder;
                                 }
                                 else if (j == ShowCountIndex)
@@ -3610,7 +3611,7 @@ namespace UAS_LabelMachine
                                 }
                                 else if (j == ShowPieceIndex)
                                 {
-                                    row1.Cells[ShowPieceIndex].SetCellValue(PageNum - 1);
+                                    row1.Cells[ShowPieceIndex].SetCellValue(PageNum);
                                     row1.Cells[j].CellStyle = styleborder;
                                 }
                                 else if (j == ShowCountIndex)

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 202 - 172
UAS-出货标签管理(贸易版)/UAS_出货标签管理.Designer.cs


+ 2 - 2
UAS-出货标签管理(贸易版)/UAS_出货标签管理.cs

@@ -1019,7 +1019,7 @@ namespace UAS_LabelMachine
             sql.Clear();
             sql.Append("select to_char(nvl(cl_date,sysdate),'YYYY-MM-DD HH24:Mi:SS') cl_date,cl_labelname,cl_isdefault,la_id||'#'||cl_labelurl||'#'||to_char(cl_date,'YYYY-MM-DD HH24:Mi:SS') ");
             sql.Append(" la_id,cl_custcode from customerlabel left join customer on cu_code=cl_custcode left join label on la_code=CL_LABELCODE where (cl_custcode='" + cu_code.Text + "' ");
-            sql.Append(" or cl_custcode is null) and cl_labeltype='单盘' order by cl_labelname");
+            sql.Append(" or cl_custcode is null) and cl_labeltype='单盘' order by cl_custcode");
             dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             SingleLabelCombox.DisplayMember = "cl_labelname";
             SingleLabelCombox.ValueMember = "la_id";
@@ -1097,7 +1097,7 @@ namespace UAS_LabelMachine
             sql.Clear();
             sql.Append("select to_char(nvl(cl_date,sysdate),'YYYY-MM-DD HH24:Mi:SS') cl_date,cl_labelname,cl_isdefault,la_id||'#'||cl_labelurl||'#'||to_char(cl_date,'YYYY-MM-DD HH24:Mi:SS') ");
             sql.Append(" la_id,cl_custcode from customerlabel left join customer on cu_code=cl_custcode left join label on la_code=CL_LABELCODE where (cl_custcode='" + cu_code.Text + "' ");
-            sql.Append(" or cl_custcode is null) and cl_labeltype='外箱' order by cl_labelname");
+            sql.Append(" or cl_custcode is null) and cl_labeltype='外箱' order by cl_custcode");
             dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             OutBoxCombox.DisplayMember = "cl_labelname";
             OutBoxCombox.ValueMember = "la_id";

+ 1 - 1
UAS_MES_MAXMADE/App.config

@@ -72,7 +72,7 @@
   <applicationSettings>
     <UAS_MES_MAXMADE.Properties.Settings>
       <setting name="MES" serializeAs="String">
-        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=MES_ZZ;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
+        <value>Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=UAS_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.2)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
       </setting>
     </UAS_MES_MAXMADE.Properties.Settings>
     <UAS_MES.Properties.Settings>

+ 18 - 18
UAS_MES_MAXMADE/CustomControl/AccordionMenu/AccordionMenu.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.AccordionMenu
+namespace UAS_MES_NEW.CustomControl.AccordionMenu
 {
     partial class AccordionMenu
     {
@@ -40,17 +40,17 @@
             this.系统设置_lsv = new System.Windows.Forms.ListView();
             this.OQC作业_lsv = new System.Windows.Forms.ListView();
             this.人员管理_lsv = new System.Windows.Forms.ListView();
-            this.库存管理 = new UAS_MES_MAXMADE.CustomControl.ButtonUtil.NormalButton();
-            this.SMT作业 = new UAS_MES_MAXMADE.CustomControl.ButtonUtil.NormalButton();
-            this.人员管理 = new UAS_MES_MAXMADE.CustomControl.ButtonUtil.NormalButton();
-            this.OQC作业 = new UAS_MES_MAXMADE.CustomControl.ButtonUtil.NormalButton();
-            this.系统设置 = new UAS_MES_MAXMADE.CustomControl.ButtonUtil.NormalButton();
-            this.查询分析 = new UAS_MES_MAXMADE.CustomControl.ButtonUtil.NormalButton();
-            this.仓库作业 = new UAS_MES_MAXMADE.CustomControl.ButtonUtil.NormalButton();
-            this.特殊作业 = new UAS_MES_MAXMADE.CustomControl.ButtonUtil.NormalButton();
-            this.产线作业 = new UAS_MES_MAXMADE.CustomControl.ButtonUtil.NormalButton();
+            this.库存管理 = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.SMT作业 = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.人员管理 = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.OQC作业 = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.系统设置 = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.查询分析 = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.仓库作业 = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.特殊作业 = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.产线作业 = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.包装作业_lsv = new System.Windows.Forms.ListView();
-            this.包装作业 = new UAS_MES_MAXMADE.CustomControl.ButtonUtil.NormalButton();
+            this.包装作业 = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.SuspendLayout();
             // 
             // SMT作业_lsv
@@ -212,7 +212,7 @@
             this.人员管理.DownImage = ((System.Drawing.Image)(resources.GetObject("人员管理.DownImage")));
             this.人员管理.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.人员管理.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.人员管理.Image = global::UAS_MES_MAXMADE.Properties.Resources._2_0btn_36;
+            this.人员管理.Image = global::UAS_MES_NEW.Properties.Resources._2_0btn_36;
             this.人员管理.IsShowBorder = true;
             this.人员管理.Location = new System.Drawing.Point(1387, 30);
             this.人员管理.Margin = new System.Windows.Forms.Padding(4);
@@ -233,7 +233,7 @@
             this.OQC作业.DownImage = ((System.Drawing.Image)(resources.GetObject("OQC作业.DownImage")));
             this.OQC作业.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OQC作业.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.OQC作业.Image = global::UAS_MES_MAXMADE.Properties.Resources._2_0btn_36;
+            this.OQC作业.Image = global::UAS_MES_NEW.Properties.Resources._2_0btn_36;
             this.OQC作业.IsShowBorder = true;
             this.OQC作业.Location = new System.Drawing.Point(1217, 30);
             this.OQC作业.Margin = new System.Windows.Forms.Padding(4);
@@ -275,7 +275,7 @@
             this.查询分析.DownImage = ((System.Drawing.Image)(resources.GetObject("查询分析.DownImage")));
             this.查询分析.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.查询分析.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.查询分析.Image = global::UAS_MES_MAXMADE.Properties.Resources._2_0btn_36;
+            this.查询分析.Image = global::UAS_MES_NEW.Properties.Resources._2_0btn_36;
             this.查询分析.IsShowBorder = true;
             this.查询分析.Location = new System.Drawing.Point(1047, 30);
             this.查询分析.Margin = new System.Windows.Forms.Padding(4);
@@ -296,7 +296,7 @@
             this.仓库作业.DownImage = ((System.Drawing.Image)(resources.GetObject("仓库作业.DownImage")));
             this.仓库作业.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.仓库作业.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.仓库作业.Image = global::UAS_MES_MAXMADE.Properties.Resources._2_0btn_36;
+            this.仓库作业.Image = global::UAS_MES_NEW.Properties.Resources._2_0btn_36;
             this.仓库作业.IsShowBorder = true;
             this.仓库作业.Location = new System.Drawing.Point(876, 30);
             this.仓库作业.Margin = new System.Windows.Forms.Padding(0);
@@ -317,7 +317,7 @@
             this.特殊作业.DownImage = ((System.Drawing.Image)(resources.GetObject("特殊作业.DownImage")));
             this.特殊作业.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.特殊作业.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.特殊作业.Image = global::UAS_MES_MAXMADE.Properties.Resources._2_0btn_36;
+            this.特殊作业.Image = global::UAS_MES_NEW.Properties.Resources._2_0btn_36;
             this.特殊作业.IsShowBorder = true;
             this.特殊作业.Location = new System.Drawing.Point(700, 30);
             this.特殊作业.Margin = new System.Windows.Forms.Padding(4);
@@ -338,7 +338,7 @@
             this.产线作业.DownImage = ((System.Drawing.Image)(resources.GetObject("产线作业.DownImage")));
             this.产线作业.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.产线作业.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.产线作业.Image = global::UAS_MES_MAXMADE.Properties.Resources._2_0btn_36;
+            this.产线作业.Image = global::UAS_MES_NEW.Properties.Resources._2_0btn_36;
             this.产线作业.IsShowBorder = true;
             this.产线作业.Location = new System.Drawing.Point(523, 30);
             this.产线作业.Margin = new System.Windows.Forms.Padding(4);
@@ -372,7 +372,7 @@
             this.包装作业.DownImage = ((System.Drawing.Image)(resources.GetObject("包装作业.DownImage")));
             this.包装作业.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.包装作业.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.包装作业.Image = global::UAS_MES_MAXMADE.Properties.Resources._2_0btn_36;
+            this.包装作业.Image = global::UAS_MES_NEW.Properties.Resources._2_0btn_36;
             this.包装作业.IsShowBorder = true;
             this.包装作业.Location = new System.Drawing.Point(1555, 30);
             this.包装作业.Margin = new System.Windows.Forms.Padding(4);

+ 3 - 3
UAS_MES_MAXMADE/CustomControl/AccordionMenu/AccordionMenu.cs

@@ -5,11 +5,11 @@ using System.Collections;
 using System.Reflection;
 using System.Data;
 using System.Text;
-using UAS_MES_MAXMADE.DataOperate;
-using UAS_MES_MAXMADE.Entity;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
 using System.Collections.Generic;
 
-namespace UAS_MES_MAXMADE.CustomControl.AccordionMenu
+namespace UAS_MES_NEW.CustomControl.AccordionMenu
 {
     public partial class AccordionMenu : UserControl
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/AccordionMenu/NavagationBar.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.AccordionMenu
+namespace UAS_MES_NEW.CustomControl.AccordionMenu
 {
     partial class NavagationBar
     {

+ 3 - 3
UAS_MES_MAXMADE/CustomControl/AccordionMenu/NavagationBar.cs

@@ -4,13 +4,13 @@ using System.Drawing;
 using System.Data;
 using System.Text;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.DataOperate;
-using UAS_MES_MAXMADE.Entity;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
 using DevExpress.XtraNavBar;
 using System.Collections;
 using System.Reflection;
 
-namespace UAS_MES_MAXMADE.CustomControl.AccordionMenu
+namespace UAS_MES_NEW.CustomControl.AccordionMenu
 {
     public partial class NavagationBar : NavBarControl
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/BaseForm/BaseForm.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.BaseForm
+namespace UAS_MES_NEW.CustomControl.BaseForm
 {
     partial class BaseForm
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/BaseForm/BaseForm.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl.BaseForm
+namespace UAS_MES_NEW.CustomControl.BaseForm
 {
     public partial class BaseForm : Form
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ButtonUtil/ArrowLeftButton.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.ButtonUtil
+namespace UAS_MES_NEW.CustomControl.ButtonUtil
 {
     partial class ArrowLeftButton
     {

+ 2 - 2
UAS_MES_MAXMADE/CustomControl/ButtonUtil/ArrowLeftButton.cs

@@ -1,7 +1,7 @@
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.Properties;
+using UAS_MES_NEW.Properties;
 
-namespace UAS_MES_MAXMADE.CustomControl.ButtonUtil
+namespace UAS_MES_NEW.CustomControl.ButtonUtil
 {
     public partial class ArrowLeftButton : Button
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ButtonUtil/ArrowRightButton.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.ButtonUtil
+namespace UAS_MES_NEW.CustomControl.ButtonUtil
 {
     partial class ArrowRightButton
     {

+ 2 - 2
UAS_MES_MAXMADE/CustomControl/ButtonUtil/ArrowRightButton.cs

@@ -1,7 +1,7 @@
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.Properties;
+using UAS_MES_NEW.Properties;
 
-namespace UAS_MES_MAXMADE.CustomControl.ButtonUtil
+namespace UAS_MES_NEW.CustomControl.ButtonUtil
 {
     public partial class ArrowRightButton : Button
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ButtonUtil/ChooseAllButton.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.ButtonUtil
+namespace UAS_MES_NEW.CustomControl.ButtonUtil
 {
     partial class ChooseAllButton
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ButtonUtil/ChooseAllButton.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl.ButtonUtil
+namespace UAS_MES_NEW.CustomControl.ButtonUtil
 {
     public partial class ChooseAllButton : Button
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ButtonUtil/CloseButton.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.ButtonUtil
+namespace UAS_MES_NEW.CustomControl.ButtonUtil
 {
     partial class CloseButton
     {

+ 2 - 2
UAS_MES_MAXMADE/CustomControl/ButtonUtil/CloseButton.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.Properties;
+using UAS_MES_NEW.Properties;
 
-namespace UAS_MES_MAXMADE.CustomControl.ButtonUtil
+namespace UAS_MES_NEW.CustomControl.ButtonUtil
 {
     public partial class CloseButton : Button
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ButtonUtil/DeleteButton.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.ButtonUtil
+namespace UAS_MES_NEW.CustomControl.ButtonUtil
 {
     partial class DeleteButton
     {

+ 2 - 2
UAS_MES_MAXMADE/CustomControl/ButtonUtil/DeleteButton.cs

@@ -6,9 +6,9 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.Properties;
+using UAS_MES_NEW.Properties;
 
-namespace UAS_MES_MAXMADE.CustomControl.ButtonUtil
+namespace UAS_MES_NEW.CustomControl.ButtonUtil
 {
     public partial class DeleteButton : Button
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ButtonUtil/LockMakeCode.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.ButtonUtil
+namespace UAS_MES_NEW.CustomControl.ButtonUtil
 {
     partial class LockMakeCode
     {

+ 4 - 4
UAS_MES_MAXMADE/CustomControl/ButtonUtil/LockMakeCode.cs

@@ -4,11 +4,11 @@ using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Text;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.Enum;
-using UAS_MES_MAXMADE.Properties;
-using UAS_MES_MAXMADE.PublicMethod;
+using UAS_MES_NEW.Enum;
+using UAS_MES_NEW.Properties;
+using UAS_MES_NEW.PublicMethod;
 
-namespace UAS_MES_MAXMADE.CustomControl.ButtonUtil
+namespace UAS_MES_NEW.CustomControl.ButtonUtil
 {
     public partial class LockMakeCode : Button
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ButtonUtil/NormalButton.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.ButtonUtil
+namespace UAS_MES_NEW.CustomControl.ButtonUtil
 {
     partial class NormalButton
     {

+ 4 - 4
UAS_MES_MAXMADE/CustomControl/ButtonUtil/NormalButton.cs

@@ -4,11 +4,11 @@ using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Text;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.Enum;
-using UAS_MES_MAXMADE.Properties;
-using UAS_MES_MAXMADE.PublicMethod;
+using UAS_MES_NEW.Enum;
+using UAS_MES_NEW.Properties;
+using UAS_MES_NEW.PublicMethod;
 
-namespace UAS_MES_MAXMADE.CustomControl.ButtonUtil
+namespace UAS_MES_NEW.CustomControl.ButtonUtil
 {
     public partial class NormalButton : Button
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ClickPicBox/ClickPicBox.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.ClickPicBox
+namespace UAS_MES_NEW.CustomControl.ClickPicBox
 {
     partial class ClickPicBox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ClickPicBox/ClickPicBox.cs

@@ -1,6 +1,6 @@
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl.ClickPicBox
+namespace UAS_MES_NEW.CustomControl.ClickPicBox
 {
     public partial class ClickPicBox : PictureBox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ClickPicBox/LockIcon.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.ClickPicBox
+namespace UAS_MES_NEW.CustomControl.ClickPicBox
 {
     partial class LockIcon
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ClickPicBox/LockIcon.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl.ClickPicBox
+namespace UAS_MES_NEW.CustomControl.ClickPicBox
 {
     public partial class LockIcon : PictureBox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ComBoxWithFocus/ComBoxWithFocus.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.ComBoxWithFocus
+namespace UAS_MES_NEW.CustomControl.ComBoxWithFocus
 {
     partial class ComBoxWithFocus
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ComBoxWithFocus/ComBoxWithFocus.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl.ComBoxWithFocus
+namespace UAS_MES_NEW.CustomControl.ComBoxWithFocus
 {
     public partial class ComBoxWithFocus : ComboBox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ComBoxWithFocus/ComboxWithTip.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.ComBoxWithFocus
+namespace UAS_MES_NEW.CustomControl.ComBoxWithFocus
 {
     partial class ComboxWithTip
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ComBoxWithFocus/ComboxWithTip.cs

@@ -5,7 +5,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Text;
 
-namespace UAS_MES_MAXMADE.CustomControl.ComBoxWithFocus
+namespace UAS_MES_NEW.CustomControl.ComBoxWithFocus
 {
     public partial class ComboxWithTip : System.Windows.Forms.ComboBox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ComBoxWithFocus/PrinterCombox.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.ComBoxWithFocus
+namespace UAS_MES_NEW.CustomControl.ComBoxWithFocus
 {
     partial class PrinterCombox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ComBoxWithFocus/PrinterCombox.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Windows.Forms;
 using System.Drawing.Printing;
 
-namespace UAS_MES_MAXMADE.CustomControl.ComBoxWithFocus
+namespace UAS_MES_NEW.CustomControl.ComBoxWithFocus
 {
     public partial class PrinterCombox : UserControl
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ComBoxWithFocus/SerialPortCombox.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.ComBoxWithFocus
+namespace UAS_MES_NEW.CustomControl.ComBoxWithFocus
 {
     partial class SerialPortCombox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ComBoxWithFocus/SerialPortCombox.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Windows.Forms;
 using System.IO.Ports;
 
-namespace UAS_MES_MAXMADE.CustomControl.ComBoxWithFocus
+namespace UAS_MES_NEW.CustomControl.ComBoxWithFocus
 {
     public partial class SerialPortCombox : UserControl
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/CustomCheckBox/AutoPrintCheckBox.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.CustomCheckBox
+namespace UAS_MES_NEW.CustomControl.CustomCheckBox
 {
     partial class AutoPrintCheckBox
     {

+ 3 - 3
UAS_MES_MAXMADE/CustomControl/CustomCheckBox/AutoPrintCheckBox.cs

@@ -6,10 +6,10 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.Entity;
-using UAS_MES_MAXMADE.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.DataOperate;
 
-namespace UAS_MES_MAXMADE.CustomControl.CustomCheckBox
+namespace UAS_MES_NEW.CustomControl.CustomCheckBox
 {
     public partial class AutoPrintCheckBox : UserControl
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/CustomCheckBox/CustomCheckBox.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.CustomCheckBox
+namespace UAS_MES_NEW.CustomControl.CustomCheckBox
 {
     partial class CustomCheckBox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/CustomCheckBox/CustomCheckBox.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl.CustomCheckBox
+namespace UAS_MES_NEW.CustomControl.CustomCheckBox
 {
     public partial class CustomCheckBox : CheckBox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/CustomCheckBox/LockCheckBox.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.CustomCheckBox
+namespace UAS_MES_NEW.CustomControl.CustomCheckBox
 {
     partial class LockCheckBox
     {

+ 3 - 3
UAS_MES_MAXMADE/CustomControl/CustomCheckBox/LockCheckBox.cs

@@ -6,10 +6,10 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.PublicMethod;
-using UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon;
+using UAS_MES_NEW.PublicMethod;
+using UAS_MES_NEW.CustomControl.TextBoxWithIcon;
 
-namespace UAS_MES_MAXMADE.CustomControl.CustomCheckBox
+namespace UAS_MES_NEW.CustomControl.CustomCheckBox
 {
     public partial class LockCheckBox : CheckBox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/CustomTabControl/CustomTabControl.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl
+namespace UAS_MES_NEW.CustomControl
 {
     partial class CustomTabControl
     {

+ 2 - 2
UAS_MES_MAXMADE/CustomControl/CustomTabControl/CustomTabControl.cs

@@ -2,10 +2,10 @@
 using System.Drawing;
 using System.Windows.Forms;
 using System.Drawing.Drawing2D;
-using UAS_MES_MAXMADE;
+using UAS_MES_NEW;
 using System.Runtime.InteropServices;
 
-namespace UAS_MES_MAXMADE.CustomControl
+namespace UAS_MES_NEW.CustomControl
 {
     [ToolboxBitmap(typeof(TabControl))]
     public partial class CustomTabControl : TabControl

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/CustomTabControl/ThemedColors.cs

@@ -3,7 +3,7 @@ using System.Windows.Forms.VisualStyles;
 using System.Drawing;
 
 
-namespace UAS_MES_MAXMADE
+namespace UAS_MES_NEW
 {
     class ThemedColors
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/DataGrid_View/DataGridViewExpand.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.DataGrid_View
+namespace UAS_MES_NEW.CustomControl.DataGrid_View
 {
     partial class DataGridViewExpand
     {

+ 2 - 2
UAS_MES_MAXMADE/CustomControl/DataGrid_View/DataGridViewExpand.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.Properties;
+using UAS_MES_NEW.Properties;
 
-namespace UAS_MES_MAXMADE.CustomControl.DataGrid_View
+namespace UAS_MES_NEW.CustomControl.DataGrid_View
 {
     public partial class DataGridViewExpand : DataGridView
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/DataGrid_View/DataGridViewWithCheckBox.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.DataGrid_View
+namespace UAS_MES_NEW.CustomControl.DataGrid_View
 {
     partial class DataGridViewWithCheckBox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/DataGrid_View/DataGridViewWithCheckBox.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl.DataGrid_View
+namespace UAS_MES_NEW.CustomControl.DataGrid_View
 {
     public partial class DataGridViewWithCheckBox : DataGridView
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/DataGrid_View/DataGridViewWithFilter.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.DataGrid_View
+namespace UAS_MES_NEW.CustomControl.DataGrid_View
 {
     partial class DataGridViewWithFilter
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/DataGrid_View/DataGridViewWithFilter.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl.DataGrid_View
+namespace UAS_MES_NEW.CustomControl.DataGrid_View
 {
     public partial class DataGridViewWithFilter : DataGridView
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/DataGrid_View/DataGridViewWithSerialNum.Designer.cs

@@ -1,6 +1,6 @@
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl.DataGrid_View
+namespace UAS_MES_NEW.CustomControl.DataGrid_View
 {
     partial class DataGridViewWithSerialNum
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/DataGrid_View/DataGridViewWithSerialNum.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl.DataGrid_View
+namespace UAS_MES_NEW.CustomControl.DataGrid_View
 {
     public partial class DataGridViewWithSerialNum : DataGridView
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/GroupBoxWithBorder/GroupBoxWithBorder.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.GroupBoxWithBorder
+namespace UAS_MES_NEW.CustomControl.GroupBoxWithBorder
 {
     partial class GroupBoxWithBorder
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/GroupBoxWithBorder/GroupBoxWithBorder.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl.GroupBoxWithBorder
+namespace UAS_MES_NEW.CustomControl.GroupBoxWithBorder
 {
     public partial class GroupBoxWithBorder : GroupBox
     {

+ 5 - 5
UAS_MES_MAXMADE/CustomControl/HeadBar/HeadBar.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl
+namespace UAS_MES_NEW.CustomControl
 {
     partial class HeadBar
     { /// <summary> 
@@ -59,7 +59,7 @@
             // MinWindow
             // 
             resources.ApplyResources(this.MinWindow, "MinWindow");
-            this.MinWindow.Image = global::UAS_MES_MAXMADE.Properties.Resources.Close_up_32px_1181430_easyicon_net;
+            this.MinWindow.Image = global::UAS_MES_NEW.Properties.Resources.Close_up_32px_1181430_easyicon_net;
             this.MinWindow.Name = "MinWindow";
             this.MinWindow.TabStop = false;
             this.MinWindow.Click += new System.EventHandler(this.MinWindow_Click);
@@ -74,7 +74,7 @@
             // CloseWindow
             // 
             resources.ApplyResources(this.CloseWindow, "CloseWindow");
-            this.CloseWindow.Image = global::UAS_MES_MAXMADE.Properties.Resources.close_32px_1181428_easyicon_net;
+            this.CloseWindow.Image = global::UAS_MES_NEW.Properties.Resources.close_32px_1181428_easyicon_net;
             this.CloseWindow.Name = "CloseWindow";
             this.CloseWindow.TabStop = false;
             this.CloseWindow.Click += new System.EventHandler(this.CloseWindow_Click);
@@ -85,7 +85,7 @@
             this.LoginOut.Appearance.Options.UseFont = true;
             this.LoginOut.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
             resources.ApplyResources(this.LoginOut, "LoginOut");
-            this.LoginOut.Image = global::UAS_MES_MAXMADE.Properties.Resources.Logout_32px_581264_easyicon_net;
+            this.LoginOut.Image = global::UAS_MES_NEW.Properties.Resources.Logout_32px_581264_easyicon_net;
             this.LoginOut.ImageLocation = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
             this.LoginOut.Name = "LoginOut";
             this.LoginOut.Click += new System.EventHandler(this.LoginOut_Click);
@@ -96,7 +96,7 @@
             this.Change_psw.Appearance.Options.UseFont = true;
             this.Change_psw.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
             resources.ApplyResources(this.Change_psw, "Change_psw");
-            this.Change_psw.Image = global::UAS_MES_MAXMADE.Properties.Resources.pwd;
+            this.Change_psw.Image = global::UAS_MES_NEW.Properties.Resources.pwd;
             this.Change_psw.ImageLocation = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
             this.Change_psw.Name = "Change_psw";
             this.Change_psw.Click += new System.EventHandler(this.Change_psw_Click);

+ 5 - 5
UAS_MES_MAXMADE/CustomControl/HeadBar/HeadBar.cs

@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.DataOperate;
-using UAS_MES_MAXMADE.Entity;
-using UAS_MES_MAXMADE.PublicMethod;
-using UAS_MES_MAXMADE.PublicForm;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
+using UAS_MES_NEW.PublicForm;
 
-namespace UAS_MES_MAXMADE.CustomControl
+namespace UAS_MES_NEW.CustomControl
 {
     public partial class HeadBar : UserControl
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ListViewExpand/ListViewExpand.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.ListViewExpand
+namespace UAS_MES_NEW.CustomControl.ListViewExpand
 {
     partial class ListViewExpand
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ListViewExpand/ListViewExpand.cs

@@ -9,7 +9,7 @@ using System.Windows.Forms;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-namespace UAS_MES_MAXMADE.CustomControl.ListViewExpand
+namespace UAS_MES_NEW.CustomControl.ListViewExpand
 {
     public partial class ListViewExpand : ListView
     {

+ 19 - 19
UAS_MES_MAXMADE/CustomControl/Pagination/Pagination.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.Pagination
+namespace UAS_MES_NEW.CustomControl.Pagination
 {
     partial class Pagination
     {
@@ -31,18 +31,18 @@
             this.components = new System.ComponentModel.Container();
             this.panel1 = new System.Windows.Forms.Panel();
             this.ShowItemsNum = new System.Windows.Forms.ComboBox();
-            this.UpLoadData = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
-            this.DownLoadTemplet = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
-            this.Add = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
-            this.Delete = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
-            this.ExportExcel = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
+            this.UpLoadData = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
+            this.DownLoadTemplet = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
+            this.Add = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
+            this.Delete = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
+            this.ExportExcel = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
             this.label2 = new System.Windows.Forms.Label();
             this.TotalPage = new System.Windows.Forms.Label();
             this.CurrentPage = new System.Windows.Forms.TextBox();
-            this.PreviousPage = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
-            this.LastPage = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
-            this.NextPage = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
-            this.FirstPage = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
+            this.PreviousPage = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
+            this.LastPage = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
+            this.NextPage = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
+            this.FirstPage = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
             this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
@@ -106,7 +106,7 @@
             // 
             this.UpLoadData.AllPower = null;
             this.UpLoadData.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.UpLoadData.Image = global::UAS_MES_MAXMADE.Properties.Resources.upload_icon1;
+            this.UpLoadData.Image = global::UAS_MES_NEW.Properties.Resources.upload_icon1;
             this.UpLoadData.Location = new System.Drawing.Point(628, 10);
             this.UpLoadData.Margin = new System.Windows.Forms.Padding(4);
             this.UpLoadData.Name = "UpLoadData";
@@ -120,7 +120,7 @@
             // 
             this.DownLoadTemplet.AllPower = null;
             this.DownLoadTemplet.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.DownLoadTemplet.Image = global::UAS_MES_MAXMADE.Properties.Resources.down_load1;
+            this.DownLoadTemplet.Image = global::UAS_MES_NEW.Properties.Resources.down_load1;
             this.DownLoadTemplet.Location = new System.Drawing.Point(580, 10);
             this.DownLoadTemplet.Margin = new System.Windows.Forms.Padding(4);
             this.DownLoadTemplet.Name = "DownLoadTemplet";
@@ -134,7 +134,7 @@
             // 
             this.Add.AllPower = null;
             this.Add.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.Add.Image = global::UAS_MES_MAXMADE.Properties.Resources.bindingNavigatorAddNewItem_Image;
+            this.Add.Image = global::UAS_MES_NEW.Properties.Resources.bindingNavigatorAddNewItem_Image;
             this.Add.Location = new System.Drawing.Point(484, 10);
             this.Add.Margin = new System.Windows.Forms.Padding(4);
             this.Add.Name = "Add";
@@ -148,7 +148,7 @@
             // 
             this.Delete.AllPower = null;
             this.Delete.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.Delete.Image = global::UAS_MES_MAXMADE.Properties.Resources.bindingNavigatorDeleteItem_Image;
+            this.Delete.Image = global::UAS_MES_NEW.Properties.Resources.bindingNavigatorDeleteItem_Image;
             this.Delete.Location = new System.Drawing.Point(437, 10);
             this.Delete.Margin = new System.Windows.Forms.Padding(4);
             this.Delete.Name = "Delete";
@@ -163,7 +163,7 @@
             // 
             this.ExportExcel.AllPower = null;
             this.ExportExcel.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.ExportExcel.Image = global::UAS_MES_MAXMADE.Properties.Resources.Excel_2010_16px_1180011_easyicon_net;
+            this.ExportExcel.Image = global::UAS_MES_NEW.Properties.Resources.Excel_2010_16px_1180011_easyicon_net;
             this.ExportExcel.Location = new System.Drawing.Point(532, 10);
             this.ExportExcel.Margin = new System.Windows.Forms.Padding(4);
             this.ExportExcel.Name = "ExportExcel";
@@ -214,7 +214,7 @@
             this.PreviousPage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.PreviousPage.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.PreviousPage.Image = global::UAS_MES_MAXMADE.Properties.Resources.bindingNavigatorMovePreviousItem_Image;
+            this.PreviousPage.Image = global::UAS_MES_NEW.Properties.Resources.bindingNavigatorMovePreviousItem_Image;
             this.PreviousPage.Location = new System.Drawing.Point(48, 10);
             this.PreviousPage.Margin = new System.Windows.Forms.Padding(4);
             this.PreviousPage.Name = "PreviousPage";
@@ -230,7 +230,7 @@
             this.LastPage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.LastPage.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.LastPage.Image = global::UAS_MES_MAXMADE.Properties.Resources.bindingNavigatorMoveLastItem_Image;
+            this.LastPage.Image = global::UAS_MES_NEW.Properties.Resources.bindingNavigatorMoveLastItem_Image;
             this.LastPage.Location = new System.Drawing.Point(241, 10);
             this.LastPage.Margin = new System.Windows.Forms.Padding(4);
             this.LastPage.Name = "LastPage";
@@ -244,7 +244,7 @@
             // 
             this.NextPage.AllPower = null;
             this.NextPage.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.NextPage.Image = global::UAS_MES_MAXMADE.Properties.Resources.bindingNavigatorMoveNextItem_Image;
+            this.NextPage.Image = global::UAS_MES_NEW.Properties.Resources.bindingNavigatorMoveNextItem_Image;
             this.NextPage.Location = new System.Drawing.Point(209, 10);
             this.NextPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 25);
             this.NextPage.Name = "NextPage";
@@ -260,7 +260,7 @@
             this.FirstPage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.FirstPage.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.FirstPage.Image = global::UAS_MES_MAXMADE.Properties.Resources.bindingNavigatorMoveFirstItem_Image;
+            this.FirstPage.Image = global::UAS_MES_NEW.Properties.Resources.bindingNavigatorMoveFirstItem_Image;
             this.FirstPage.Location = new System.Drawing.Point(19, 10);
             this.FirstPage.Margin = new System.Windows.Forms.Padding(4);
             this.FirstPage.Name = "FirstPage";

+ 3 - 3
UAS_MES_MAXMADE/CustomControl/Pagination/Pagination.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Data;
 using System.IO;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.DataOperate;
-using UAS_MES_MAXMADE.Entity;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
 
-namespace UAS_MES_MAXMADE.CustomControl.Pagination
+namespace UAS_MES_NEW.CustomControl.Pagination
 {
     public partial class Pagination : UserControl
     {

+ 18 - 18
UAS_MES_MAXMADE/CustomControl/Pagination/PaginationDbFind.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.Pagination
+namespace UAS_MES_NEW.CustomControl.Pagination
 {
     partial class PaginationDbFind
     {
@@ -31,18 +31,18 @@
             this.components = new System.ComponentModel.Container();
             this.panel1 = new System.Windows.Forms.Panel();
             this.ShowItemsNum = new System.Windows.Forms.ComboBox();
-            this.UpLoadData = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
-            this.DownLoadTemplet = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
-            this.Add = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
-            this.Delete = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
-            this.ExportExcel = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
+            this.UpLoadData = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
+            this.DownLoadTemplet = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
+            this.Add = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
+            this.Delete = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
+            this.ExportExcel = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
             this.label2 = new System.Windows.Forms.Label();
             this.TotalPage = new System.Windows.Forms.Label();
             this.CurrentPage = new System.Windows.Forms.TextBox();
-            this.PreviousPage = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
-            this.LastPage = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
-            this.NextPage = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
-            this.FirstPage = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
+            this.PreviousPage = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
+            this.LastPage = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
+            this.NextPage = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
+            this.FirstPage = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
             this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
@@ -106,7 +106,7 @@
             // 
             this.UpLoadData.AllPower = null;
             this.UpLoadData.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.UpLoadData.Image = global::UAS_MES_MAXMADE.Properties.Resources.upload_icon1;
+            this.UpLoadData.Image = global::UAS_MES_NEW.Properties.Resources.upload_icon1;
             this.UpLoadData.Location = new System.Drawing.Point(628, 10);
             this.UpLoadData.Margin = new System.Windows.Forms.Padding(4);
             this.UpLoadData.Name = "UpLoadData";
@@ -121,7 +121,7 @@
             // 
             this.DownLoadTemplet.AllPower = null;
             this.DownLoadTemplet.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.DownLoadTemplet.Image = global::UAS_MES_MAXMADE.Properties.Resources.down_load1;
+            this.DownLoadTemplet.Image = global::UAS_MES_NEW.Properties.Resources.down_load1;
             this.DownLoadTemplet.Location = new System.Drawing.Point(580, 10);
             this.DownLoadTemplet.Margin = new System.Windows.Forms.Padding(4);
             this.DownLoadTemplet.Name = "DownLoadTemplet";
@@ -136,7 +136,7 @@
             // 
             this.Add.AllPower = null;
             this.Add.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.Add.Image = global::UAS_MES_MAXMADE.Properties.Resources.bindingNavigatorAddNewItem_Image;
+            this.Add.Image = global::UAS_MES_NEW.Properties.Resources.bindingNavigatorAddNewItem_Image;
             this.Add.Location = new System.Drawing.Point(484, 10);
             this.Add.Margin = new System.Windows.Forms.Padding(4);
             this.Add.Name = "Add";
@@ -151,7 +151,7 @@
             // 
             this.Delete.AllPower = null;
             this.Delete.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.Delete.Image = global::UAS_MES_MAXMADE.Properties.Resources.bindingNavigatorDeleteItem_Image;
+            this.Delete.Image = global::UAS_MES_NEW.Properties.Resources.bindingNavigatorDeleteItem_Image;
             this.Delete.Location = new System.Drawing.Point(437, 10);
             this.Delete.Margin = new System.Windows.Forms.Padding(4);
             this.Delete.Name = "Delete";
@@ -219,7 +219,7 @@
             this.PreviousPage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.PreviousPage.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.PreviousPage.Image = global::UAS_MES_MAXMADE.Properties.Resources.bindingNavigatorMovePreviousItem_Image;
+            this.PreviousPage.Image = global::UAS_MES_NEW.Properties.Resources.bindingNavigatorMovePreviousItem_Image;
             this.PreviousPage.Location = new System.Drawing.Point(48, 10);
             this.PreviousPage.Margin = new System.Windows.Forms.Padding(4);
             this.PreviousPage.Name = "PreviousPage";
@@ -235,7 +235,7 @@
             this.LastPage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.LastPage.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.LastPage.Image = global::UAS_MES_MAXMADE.Properties.Resources.bindingNavigatorMoveLastItem_Image;
+            this.LastPage.Image = global::UAS_MES_NEW.Properties.Resources.bindingNavigatorMoveLastItem_Image;
             this.LastPage.Location = new System.Drawing.Point(241, 10);
             this.LastPage.Margin = new System.Windows.Forms.Padding(4);
             this.LastPage.Name = "LastPage";
@@ -249,7 +249,7 @@
             // 
             this.NextPage.AllPower = null;
             this.NextPage.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.NextPage.Image = global::UAS_MES_MAXMADE.Properties.Resources.bindingNavigatorMoveNextItem_Image;
+            this.NextPage.Image = global::UAS_MES_NEW.Properties.Resources.bindingNavigatorMoveNextItem_Image;
             this.NextPage.Location = new System.Drawing.Point(209, 10);
             this.NextPage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 25);
             this.NextPage.Name = "NextPage";
@@ -265,7 +265,7 @@
             this.FirstPage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.FirstPage.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.FirstPage.Image = global::UAS_MES_MAXMADE.Properties.Resources.bindingNavigatorMoveFirstItem_Image;
+            this.FirstPage.Image = global::UAS_MES_NEW.Properties.Resources.bindingNavigatorMoveFirstItem_Image;
             this.FirstPage.Location = new System.Drawing.Point(19, 10);
             this.FirstPage.Margin = new System.Windows.Forms.Padding(4);
             this.FirstPage.Name = "FirstPage";

+ 3 - 3
UAS_MES_MAXMADE/CustomControl/Pagination/PaginationDbFind.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Data;
 using System.IO;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.DataOperate;
-using UAS_MES_MAXMADE.Entity;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
 
-namespace UAS_MES_MAXMADE.CustomControl.Pagination
+namespace UAS_MES_NEW.CustomControl.Pagination
 {
     public partial class PaginationDbFind : UserControl
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/PowerControlForm/PowerControlForm.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.PowerControlForm
+namespace UAS_MES_NEW.CustomControl.PowerControlForm
 {
     partial class PowerControlForm
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/PowerControlForm/PowerControlForm.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl.PowerControlForm
+namespace UAS_MES_NEW.CustomControl.PowerControlForm
 {
     public partial class PowerControlForm : Form
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ProcessBar/ProcessBar.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl
+namespace UAS_MES_NEW.CustomControl
 {
     partial class ProcessBar
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/ProcessBar/ProcessBar.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Threading;
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl
+namespace UAS_MES_NEW.CustomControl
 {
     public partial class ProcessBar : UserControl
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/RichText/RichTextAutoBottom.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.RichText
+namespace UAS_MES_NEW.CustomControl.RichText
 {
     partial class RichTextAutoBottom
     {

+ 2 - 2
UAS_MES_MAXMADE/CustomControl/RichText/RichTextAutoBottom.cs

@@ -3,9 +3,9 @@ using System.Drawing;
 using System.Media;
 using System.Threading;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.PublicMethod;
+using UAS_MES_NEW.PublicMethod;
 
-namespace UAS_MES_MAXMADE.CustomControl.RichText
+namespace UAS_MES_NEW.CustomControl.RichText
 {
     public partial class RichTextAutoBottom : RichTextBox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/SetLoading/LoadingCircle.Designer.cs

@@ -3,7 +3,7 @@
 //★★★★★★★           华普软件-VB、C#专业论文与源码荟萃!           ★★★★★★★
 //#####################################################################################
 
-namespace UAS_MES_MAXMADE.CustomControl.SetLoading
+namespace UAS_MES_NEW.CustomControl.SetLoading
 {
     partial class LoadingCircle
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/SetLoading/LoadingCircle.cs

@@ -12,7 +12,7 @@ using System.Drawing.Drawing2D;
 using System.Text;
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl.SetLoading
+namespace UAS_MES_NEW.CustomControl.SetLoading
 {
     public partial class LoadingCircle : Control
     {

+ 2 - 2
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/BlurSearch.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     partial class BlurSearch
     {
@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             this.ListBox = new System.Windows.Forms.ListBox();
-            this.EnterTextBox = new UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.EnterTextBox = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.SuspendLayout();
             // 
             // ListBox

+ 3 - 3
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/BlurSearch.cs

@@ -6,10 +6,10 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.DataOperate;
-using UAS_MES_MAXMADE.Entity;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
 
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     public partial class BlurSearch : UserControl
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/EnterTextBox.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     partial class EnterTextBox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/EnterTextBox.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     public partial class EnterTextBox : TextBox
     {

+ 4 - 4
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     partial class MaCodeSearchTextBox
     {
@@ -28,8 +28,8 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.Search_Icon = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
-            this.TextBox = new UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.Search_Icon = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
+            this.TextBox = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.MaCodeTextBox();
             ((System.ComponentModel.ISupportInitialize)(this.Search_Icon)).BeginInit();
             this.SuspendLayout();
             // 
@@ -38,7 +38,7 @@
             this.Search_Icon.AllPower = null;
             this.Search_Icon.Cursor = System.Windows.Forms.Cursors.Hand;
             this.Search_Icon.Dock = System.Windows.Forms.DockStyle.Right;
-            this.Search_Icon.Image = global::UAS_MES_MAXMADE.Properties.Resources.search_16px_1202802_easyicon_net;
+            this.Search_Icon.Image = global::UAS_MES_NEW.Properties.Resources.search_16px_1202802_easyicon_net;
             this.Search_Icon.Location = new System.Drawing.Point(183, 0);
             this.Search_Icon.Name = "Search_Icon";
             this.Search_Icon.Power = "";

+ 5 - 5
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.cs

@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.CustomControl.CustomCheckBox;
-using UAS_MES_MAXMADE.DataOperate;
-using UAS_MES_MAXMADE.Entity;
-using UAS_MES_MAXMADE.PublicMethod;
+using UAS_MES_NEW.CustomControl.CustomCheckBox;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
 
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     public partial class MaCodeSearchTextBox : UserControl
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/MaCodeTextBox.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     partial class MaCodeTextBox
     {

+ 2 - 2
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/MaCodeTextBox.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.PublicMethod;
+using UAS_MES_NEW.PublicMethod;
 
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     public partial class MaCodeTextBox : TextBox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/NumOnlyTextBox.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     partial class NumOnlyTextBox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/NumOnlyTextBox.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     public partial class NumOnlyTextBox : EnterTextBox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/RoundTextBox.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     partial class RoundTextBox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/RoundTextBox.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Windows.Forms;
 using System.Drawing.Drawing2D;
 
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     public partial class RoundTextBox : UserControl
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/SNCodeEnterTextBox.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     partial class SNCodeEnterTextBox
     {

+ 2 - 2
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/SNCodeEnterTextBox.cs

@@ -7,9 +7,9 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 using System.Runtime.InteropServices;
-using UAS_MES_MAXMADE.PublicMethod;
+using UAS_MES_NEW.PublicMethod;
 
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     public partial class SNCodeEnterTextBox : TextBox
     {

+ 4 - 4
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/SearchTextBox.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     partial class SearchTextBox
     {
@@ -28,8 +28,8 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.Search_Icon = new UAS_MES_MAXMADE.CustomControl.ClickPicBox.ClickPicBox();
-            this.TextBox = new UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.Search_Icon = new UAS_MES_NEW.CustomControl.ClickPicBox.ClickPicBox();
+            this.TextBox = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             ((System.ComponentModel.ISupportInitialize)(this.Search_Icon)).BeginInit();
             this.SuspendLayout();
             // 
@@ -38,7 +38,7 @@
             this.Search_Icon.AllPower = null;
             this.Search_Icon.Cursor = System.Windows.Forms.Cursors.Hand;
             this.Search_Icon.Dock = System.Windows.Forms.DockStyle.Right;
-            this.Search_Icon.Image = global::UAS_MES_MAXMADE.Properties.Resources.search_16px_1202802_easyicon_net;
+            this.Search_Icon.Image = global::UAS_MES_NEW.Properties.Resources.search_16px_1202802_easyicon_net;
             this.Search_Icon.Location = new System.Drawing.Point(183, 0);
             this.Search_Icon.Name = "Search_Icon";
             this.Search_Icon.Power = "";

+ 4 - 4
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/SearchTextBox.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.DataOperate;
-using UAS_MES_MAXMADE.Entity;
-using UAS_MES_MAXMADE.PublicMethod;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
 
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     public partial class SearchTextBox : UserControl
     {

+ 2 - 2
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/SnCollectionBox.Designer.cs

@@ -1,6 +1,6 @@
-using UAS_MES_MAXMADE.Entity;
+using UAS_MES_NEW.Entity;
 
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     partial class SnCollectionBox
     {

+ 2 - 2
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/SnCollectionBox.cs

@@ -6,9 +6,9 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.Entity;
+using UAS_MES_NEW.Entity;
 
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     public partial class SnCollectionBox : EnterTextBox
     {

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/SourceStepCount.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     partial class SourceStepCount
     {

+ 3 - 3
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/SourceStepCount.cs

@@ -6,10 +6,10 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.DataOperate;
-using UAS_MES_MAXMADE.Entity;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
 
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     public partial class SourceStepCount : UserControl
     {

+ 4 - 4
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/TextAreaForm.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     partial class TextAreaForm
     {
@@ -30,9 +30,9 @@
         {   
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TextAreaForm));
             this.TextArea = new System.Windows.Forms.TextBox();
-            this.headBar1 = new UAS_MES_MAXMADE.CustomControl.HeadBar();
-            this.Clean = new UAS_MES_MAXMADE.CustomControl.ButtonUtil.NormalButton();
-            this.Confirm = new UAS_MES_MAXMADE.CustomControl.ButtonUtil.NormalButton();
+            this.headBar1 = new UAS_MES_NEW.CustomControl.HeadBar();
+            this.Clean = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.Confirm = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.label1 = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 

+ 1 - 1
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/TextAreaForm.cs

@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     public partial class TextAreaForm : Form
     {

+ 3 - 3
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/TextBoxGeneratePaCode.Designer.cs

@@ -1,4 +1,4 @@
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     partial class TextBoxGeneratePaCode
     {
@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.enterTextBox1 = new UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.enterTextBox1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.GeneratePaCode = new System.Windows.Forms.PictureBox();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.GeneratePaCode)).BeginInit();
@@ -58,7 +58,7 @@
             this.GeneratePaCode.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.GeneratePaCode.Cursor = System.Windows.Forms.Cursors.Hand;
             this.GeneratePaCode.Dock = System.Windows.Forms.DockStyle.Right;
-            this.GeneratePaCode.Image = global::UAS_MES_MAXMADE.Properties.Resources.box_17_453077699294px_1191579_easyicon_net;
+            this.GeneratePaCode.Image = global::UAS_MES_NEW.Properties.Resources.box_17_453077699294px_1191579_easyicon_net;
             this.GeneratePaCode.Location = new System.Drawing.Point(181, 0);
             this.GeneratePaCode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.GeneratePaCode.Name = "GeneratePaCode";

+ 2 - 2
UAS_MES_MAXMADE/CustomControl/TextBoxWithIcon/TextBoxGeneratePaCode.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Windows.Forms;
-using UAS_MES_MAXMADE.PublicMethod;
+using UAS_MES_NEW.PublicMethod;
 
-namespace UAS_MES_MAXMADE.CustomControl.TextBoxWithIcon
+namespace UAS_MES_NEW.CustomControl.TextBoxWithIcon
 {
     public partial class TextBoxGeneratePaCode : UserControl
     {

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác