소스 검색

数据库连接方法移至空间适配方法之后

Hcsy 8 년 전
부모
커밋
d9b1de6989

+ 3 - 2
UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -45,10 +45,11 @@ namespace UAS_MES.Make
 
         private void Make_CollectBTMAC_Load(object sender, EventArgs e)
         {
-            sncode.Focus();
-            dh = new DataHelper();
+
             asc.controllInitializeSize(this);
             printcount = 0;
+            sncode.Focus();
+            dh = new DataHelper();
         }
 
         private void Make_CollectBTMAC_Activated(object sender, EventArgs e)

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -39,9 +39,9 @@ namespace UAS_MES.Make
 
         private void Make_CollectNetCode_Load(object sender, EventArgs e)
         {
+            asc.controllInitializeSize(this);
             sncode.Focus();
             dh = new DataHelper();
-            asc.controllInitializeSize(this);
         }
 
         private void sncode_KeyDown(object sender, KeyEventArgs e)

+ 2 - 4
UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -53,18 +53,16 @@ namespace UAS_MES.Make
 
         private void Make_ColorBoxLabelPrint_Load(object sender, EventArgs e)
         {
-            dh = new DataHelper();
+
             sncode.Focus();
             asc.controllInitializeSize(this);
             InitPrint = new Thread(InPrint);
             SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
             BaseUtil.SetFormCenter(stw);
             stw.ShowDialog();
-
             //设置锁定工单
             LockMakeCode.GetMakeCodeCtl(ma_code);
             ma_code.SetLockCheckBox(LockMakeCode);
-
             //工单号放大镜配置
             ma_code.TableName = "make left join product on ma_prodcode=pr_code";
             ma_code.SelectField = "ma_code # 工单号,pr_code # 产品编号,pr_detail # 产品名称";
@@ -72,8 +70,8 @@ namespace UAS_MES.Make
             ma_code.SetValueField = new string[] { "ma_code", "pr_code", "pr_detail" };
             ma_code.Condition = "ma_statuscode='STARTED'";
             ma_code.DbChange += Ma_code_DbChange;
-
             OperateResult.AppendText(">>请输入TSN\n", Color.Black);
+            dh = new DataHelper();
         }
 
         private void Ma_code_DbChange(object sender, EventArgs e)

+ 2 - 4
UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -56,14 +56,11 @@ namespace UAS_MES.Make
 
         private void Make_ColorBoxLoadPrint_Load(object sender, EventArgs e)
         {
-            dh = new DataHelper();
-            code.Focus();
             asc.controllInitializeSize(this);
             InitPrint = new Thread(InPrint);
             SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
             BaseUtil.SetFormCenter(stw);
             stw.ShowDialog();
-
             //工单号放大镜配置
             ma_code.TableName = "make left join product on ma_prodcode=pr_code";
             ma_code.SelectField = "ma_code # 工单号,pr_code # 产品编号,ma_qty # 工单数量,ma_craftcode # 途程编号,pr_detail # 产品名称,ma_bomversion # Bom版本";
@@ -72,9 +69,10 @@ namespace UAS_MES.Make
             ma_code.SetValueField = new string[] { "ma_code", "pr_code", "ma_qty", "pr_detail", "ma_craftcode", "ma_bomversion" };
             ma_code.Condition = "ma_statuscode='STARTED' order by ma_updatedate desc";
             ma_code.DbChange += Ms_makecode_DbChange;
-
             Lock.GetMakeCodeCtl(ma_code);
             ma_code.SetLockCheckBox(Lock);
+            code.Focus();
+            dh = new DataHelper();
         }
 
         private void Ms_makecode_DbChange(object sender, EventArgs e)

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_CustomLabelPrint.cs

@@ -56,14 +56,14 @@ namespace UAS_MES.Make
 
         private void Make_CustomLablePrint_Load(object sender, EventArgs e)
         {
-            dh = new DataHelper();
-            pr_code.Focus();
             asc.controllInitializeSize(this);
             OperateResult.AppendText(">>请输入产品代码\n", Color.Black);
             InitPrint = new Thread(InPrint);
             SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
             BaseUtil.SetFormCenter(stw);
             stw.ShowDialog();
+            pr_code.Focus();
+            dh = new DataHelper();
         }
         private void InPrint()
         {

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -54,11 +54,11 @@ namespace UAS_MES.Make
         private void Make_Decompose_Load(object sender, EventArgs e)
         {
             asc.controllInitializeSize(this);
-            dh = new DataHelper();
             sn_code.Focus();
             OperateResult.AppendText(">>请输入序列号\n");
             count = 0;
             deccount.Text = count + "";
+            dh = new DataHelper();
         }
 
         private void sn_code_KeyDown(object sender, KeyEventArgs e)

+ 1 - 3
UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -64,12 +64,9 @@ namespace UAS_MES.Make
 
         private void Make_FeedingCollection_Load(object sender, EventArgs e)
         {
-            code.Focus();
             asc.controllInitializeSize(this);
-
             LockMakeCode.GetMakeCodeCtl(ma_code);
             ma_code.SetLockCheckBox(LockMakeCode);
-
             //工单号放大镜配置
             ma_code.TableName = "make left join product on ma_prodcode=pr_code";
             ma_code.SelectField = "ma_code # 工单号,ma_prodcode # 产品编号,ma_qty # 工单数量,ma_craftcode # 途程编号,pr_detail # 产品名称,ma_bomversion # Bom版本,ma_softversion # 软件版本,ma_ecncode # ECN号";
@@ -78,6 +75,7 @@ namespace UAS_MES.Make
             ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "ma_qty", "pr_detail", "ma_craftcode", "ma_bomversion", "ma_softversion", "ma_ecncode" };
             ma_code.Condition = "ma_statuscode='STARTED'";
             ma_code.DbChange += Ma_code_DBChange;
+            code.Focus();
             dh = new DataHelper();
         }
 

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -44,14 +44,14 @@ namespace UAS_MES.Make
 
         private void Make_FuselageLabelPrint_Load(object sender, EventArgs e)
         {
-            dh = new DataHelper();
-            sncode.Focus();
             asc.controllInitializeSize(this);
             OperateResult.AppendText(">>请输入SN\n", Color.Black);
             InitPrint = new Thread(InPrint);
             SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
             BaseUtil.SetFormCenter(stw);
             stw.ShowDialog();
+            sncode.Focus();
+            dh = new DataHelper();
         }
 
         private void InPrint()

+ 1 - 2
UAS-MES/FunctionCode/Make/Make_GetReMakeSN.cs

@@ -65,8 +65,6 @@ namespace UAS_MES.Make
 
             ma_code.SetLockCheckBox(LockCheckBox);
             LockCheckBox.GetMakeCodeCtl(ma_code);
-            dh = new DataHelper();
-
             OperateResult.AppendText(">>请输入返工工单号\n", Color.Black);
 
             asc.controllInitializeSize(this);
@@ -75,6 +73,7 @@ namespace UAS_MES.Make
             BaseUtil.SetFormCenter(stw);
             stw.ShowDialog();
             sn_code.Focus();
+            dh = new DataHelper();
         }
 
         private void Ma_code_DbChange(object sender, EventArgs e)

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_MakeCancelDown.cs

@@ -35,9 +35,9 @@ namespace UAS_MES.Make
         private void Make_MakeCancelDown_Load(object sender, EventArgs e)
         {
             asc.controllInitializeSize(this);
-            dh = new DataHelper();
             md_code_rb.Focus();
             ChooseAll.ChooseAll(LabelDataGridView);
+            dh = new DataHelper();
         }
 
         private void Make_MakeCancelDown_SizeChanged(object sender, EventArgs e)

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs

@@ -55,15 +55,15 @@ namespace UAS_MES.Make
             asc.controllInitializeSize(this);
             OperateResult.AppendText(">>请输入栈板号\n", Color.Black);
             //栈板号输入框聚焦
-            palletcode.Focus();
             ComList.Text = BaseUtil.GetCacheData("PortName").ToString();
             BaudRate.Text = BaseUtil.GetCacheData("BaudRate").ToString();
-            dh = new DataHelper();
             InitPrint = new Thread(InPrint);
             SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
             BaseUtil.SetFormCenter(stw);
             stw.ShowDialog();
             startWeigh.PerformClick();
+            dh = new DataHelper();
+            palletcode.Focus();
         }
 
         protected override void OnVisibleChanged(EventArgs e)

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -57,14 +57,14 @@ namespace UAS_MES.Make
 
         private void Make_RePrintLabel_Load(object sender, EventArgs e)
         {
-            dh = new DataHelper();
-            inputText.Focus();
             asc.controllInitializeSize(this);
             OperateResult.AppendText(">>请输入SN\n", Color.Black);
             InitPrint = new Thread(InPrint);
             SetLoadingWindow stw = new SetLoadingWindow(InitPrint, "初始化打印程序");
             BaseUtil.SetFormCenter(stw);
             stw.ShowDialog();
+            inputText.Focus();
+            dh = new DataHelper();
         }
 
         private void InPrint()

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -72,10 +72,10 @@ namespace UAS_MES.Make
         private void Make_SeqProgramTransform_Load(object sender, EventArgs e)
         {
             asc.controllInitializeSize(this);
-            dh = new DataHelper();
             code.Focus();
             //提示用户“>>请输入TSN号”
             OperateResult.AppendText(">>请输入TSN号\n", Color.Black);
+            dh = new DataHelper();
         }
 
         private void 序列烧录转换_SizeChanged(object sender, EventArgs e)

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -53,7 +53,6 @@ namespace UAS_MES.Make
 
         private void TestCollection_Load(object sender, EventArgs e)
         {
-            dh = new DataHelper();
             GoodProduct.Checked = true;
             asc.controllInitializeSize(this);
             ms_sncode.Focus();
@@ -68,6 +67,7 @@ namespace UAS_MES.Make
             ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "ma_qty", "pr_detail", "ma_softversion" };
             ma_code.Condition = "ma_statuscode='STARTED'";
             ma_code.DbChange += Ma_code_DbChange;
+            dh = new DataHelper();
         }
 
         private void Ma_code_DbChange(object sender, EventArgs e)

+ 2 - 1
UAS-MES/FunctionCode/Packing/Packing_CartonSplit.cs

@@ -39,10 +39,11 @@ namespace UAS_MES.Packing
 
         private void Packing_CartonSplit_Load(object sender, EventArgs e)
         {
-            dh = new DataHelper();
+
             asc.controllInitializeSize(this);
             OperateResult.AppendText(">>请输入箱号\n", Color.Black);
             pa_outboxcode.Focus();
+            dh = new DataHelper();
         }
 
         private void pa_outboxcode_KeyDown(object sender, KeyEventArgs e)

+ 2 - 3
UAS-MES/FunctionCode/Warehouse/Warehouse_FinishedProductOut.cs

@@ -51,13 +51,12 @@ namespace UAS_MES.Warehouse
             pi_inoutno.FormName = Name;
             pi_inoutno.Condition = "pi_pdastatus<>'已出库' and pi_class='出货单'";
             pi_inoutno.DbChange += Pi_inoutno_DbChange;
-
-            dh = new DataHelper();
-
             asc.controllInitializeSize(this);
+            dh = new DataHelper();
             needMakeIn = dh.GetConfig("needMakeIn", "MESSetting").ToString();
             input.Focus();
             OperateResult.AppendText("请输入栈板进行采集\n", Color.Black, input);
+         
 
         }
 

+ 1 - 2
UAS-MES/FunctionCode/Warehouse/Warehouse_ProductMakeIn.cs

@@ -442,11 +442,10 @@ namespace UAS_MES.Warehouse
 
         private void Warehouse_ProductMakeIn_Load(object sender, EventArgs e)
         {
-            dh = new DataHelper();
-
             asc.controllInitializeSize(this);
             getcount = 0;
             getqty.Text = getcount.ToString();
+            dh = new DataHelper();
             sql.Clear();
             sql.Append("select pim_id,pim_outboxcode,pim_mac,pim_prodcode,pr_detail,pr_spec from prodiomac ");
             sql.Append("left join product on pr_code=pim_prodcode where pr_detail is null");