取消采集优化

UAS_BARCODEIO/DataHelper.cs

@@ -13,9 +13,9 @@ namespace UAS_BARCODEIO
         ////用户选择的数据库的连接字符串
         //public static string DBConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=SENGWILL;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=sengwill.hicp.net)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
 
-        private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_JICE_ZS;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=172.16.9.2)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11702)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
         //用户选择的数据库的连接字符串
-        public static string DBConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_JICE_ZS;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=172.16.9.2)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        public static string DBConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11702)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
 
         public static OracleConnection connection = null;
         OracleCommand command = null;

UAS_BARCODEIO/极测_出货清单打印.Designer.cs

@@ -49,6 +49,7 @@
             this.PrintBarCode = new System.Windows.Forms.Button();
             this.label3 = new System.Windows.Forms.Label();
             this.spl_code = new UAS_BARCODEIO.SearchTextBox();
+            this.Refresh = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.BarcodeIO)).BeginInit();
             this.SuspendLayout();
             // 
@@ -262,11 +263,22 @@
             this.spl_code.TextBoxEnable = false;
             this.spl_code.UserControlTextChanged += new UAS_BARCODEIO.SearchTextBox.OnTextChange(this.spl_code_UserControlTextChanged);
             // 
+            // Refresh
+            // 
+            this.Refresh.Location = new System.Drawing.Point(1439, 34);
+            this.Refresh.Name = "Refresh";
+            this.Refresh.Size = new System.Drawing.Size(169, 45);
+            this.Refresh.TabIndex = 42;
+            this.Refresh.Text = "刷新数据";
+            this.Refresh.UseVisualStyleBackColor = true;
+            this.Refresh.Click += new System.EventHandler(this.Refresh_Click);
+            // 
             // 极测_出货清单打印
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(2136, 1338);
+            this.Controls.Add(this.Refresh);
             this.Controls.Add(this.spl_code);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.ChooseAll);
@@ -309,6 +321,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn spld_sncode;
         private System.Windows.Forms.DataGridViewTextBoxColumn spld_wjqty;
         private System.Windows.Forms.DataGridViewTextBoxColumn spld_remark;
+        private System.Windows.Forms.Button Refresh;
     }
 }
 

UAS_BARCODEIO/极测_出货清单打印.cs

@@ -55,7 +55,7 @@ namespace UAS_BARCODEIO
         private void Form1_Load(object sender, EventArgs e)
         {
             SystemInf.dh = dh;
-            spl_code.TableName = "SnPartsList ";
+            spl_code.TableName = "SnPartsList@ERP";
             spl_code.SelectField = "spl_code # 单据编号";
             spl_code.FormName = Name;
             spl_code.DBTitle = "解析规则查询";
@@ -126,7 +126,7 @@ namespace UAS_BARCODEIO
                 {
                     string barcode = "";
                     string[] param = new string[] { "", "", barcode };
-                    dh.CallProcedure("SP_GETBARCODE", ref param);
+                    dh.CallProcedure("SP_GETBARCODE@ERP", ref param);
                     barcode = param[2].Replace("BARCODE:", "");
                     format.SubStrings["BARCODE"].Value = barcode;
                     format.SubStrings["PRSPEC"].Value = BarcodeIO.Rows[i].Cells["spld_prodspec"].Value.ToString();
@@ -135,8 +135,8 @@ namespace UAS_BARCODEIO
                     format.SubStrings["QTY"].Value = BarcodeIO.Rows[i].Cells["spld_thisqty"].Value.ToString();
                     format.SubStrings["DC"].Value = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
 
-                    dh.ExecuteSql("insert into prodiobarcode(pib_id,pib_prodcode,pib_inoutno,pib_barcode,pib_indate,pib_qty)" +
-                        "values(prodiobarcode_seq.nextval,'" + BarcodeIO.Rows[i].Cells["spld_prodcode"].Value.ToString() + "','" + spl_code.Text + "','" + barcode + "',sysdate,'" + BarcodeIO.Rows[i].Cells["spld_thisqty"].Value.ToString() + "')", "insert");
+                    dh.ExecuteSql("insert into prodiobarcode@ERP(pib_id,pib_prodcode,pib_inoutno,pib_barcode,pib_indate,pib_qty)" +
+                        "values(prodiobarcode_seq.nextval@ERP,'" + BarcodeIO.Rows[i].Cells["spld_prodcode"].Value.ToString() + "','" + spl_code.Text + "','" + barcode + "',sysdate,'" + BarcodeIO.Rows[i].Cells["spld_thisqty"].Value.ToString() + "')", "insert");
 
                     format.PrintSetup.PrinterName = PrinterList.Text;
                     format.PrintSetup.IdenticalCopiesOfLabel = 1;
@@ -205,7 +205,7 @@ namespace UAS_BARCODEIO
         {
             DataTable dt = (DataTable)dh.ExecuteSql("select spld_detno,spld_module,spld_prodcode,spld_proddetail" +
                 ",spld_prodspec,spld_produnit,spld_baseqty,spld_qty,spld_sncode,spld_sndetno,spld_thisqty,spld_remark " +
-                " from SnPartsList left join SNPARTSLISTDETAIL on spl_id=spld_splid where spl_code='" + spl_code.Text + "'", "select");
+                " from SnPartsList@ERP left join SNPARTSLISTDETAIL@ERP on spl_id=spld_splid where spl_code='" + spl_code.Text + "'", "select");
             if (dt.Rows.Count == 0)
             {
                 MessageBox.Show("单据编号不存在");
@@ -213,5 +213,10 @@ namespace UAS_BARCODEIO
             }
             BarcodeIO.DataSource = dt;
         }
+
+        private void Refresh_Click(object sender, EventArgs e)
+        {
+            LoadGridData();
+        }
     }
 }

UAS_BARCODEIO/极测_出货清单打印.resx

@@ -159,4 +159,46 @@
   <metadata name="spld_remark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="CheckBox.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="spld_detno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="spld_module.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="spld_prodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="spld_proddetail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="spld_prodspec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="spld_produnit.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="spld_baseqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="spld_qty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="spld_thisqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="spld_sndetno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="spld_sncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="spld_wjqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="spld_remark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

UAS_MES_YD/FunctionCode/Special/Special_CancelOQC.cs

@@ -46,6 +46,8 @@ namespace UAS_MES_NEW.Special
             if (ms_id == "") { OperateResult.AppendText(">>请先获取SN\n"); return; }
             if (cd_stepcode.Text == "") { OperateResult.AppendText(">>请选择回流工序\n"); return; }
             DataTable dt = (DataTable)dh.ExecuteSql("select ms_makecode,ms_firstsn,ms_sncode,ms_prodcode,ms_checkno,ms_craftcode,ms_outboxcode from makeserial where ms_id='" + ms_id + "' and instr(ms_paststep,'" + cd_stepcode.Text + "')>0 ", "select");
+            string ms_checkno = dt.Rows[0]["ms_checkno"].ToString();
+            if (ms_checkno == "") { OperateResult.AppendText(">>" + SN.Text + "不存在抽检批次中\n", System.Drawing.Color.Red, SN); return; }
 
             if (dt.Rows.Count == 0) { OperateResult.AppendText(">>" + SN.Text + "不存在或未执行过" + cd_stepcode.Text + "工序\n"); return; }
 
@@ -53,7 +55,6 @@ namespace UAS_MES_NEW.Special
             string ms_firstsn = dt.Rows[0]["ms_firstsn"].ToString();
             string ms_prodcode = dt.Rows[0]["ms_prodcode"].ToString();
             string ms_sncode = dt.Rows[0]["ms_sncode"].ToString();
-            string ms_checkno = dt.Rows[0]["ms_checkno"].ToString();
             string ms_craftcode = dt.Rows[0]["ms_craftcode"].ToString();
             string ms_outboxcode = dt.Rows[0]["ms_outboxcode"].ToString();
             if (ms_outboxcode != "")
@@ -75,7 +76,7 @@ namespace UAS_MES_NEW.Special
 
             dh.ExecuteSql("update oqcbatch set ob_nowcheckqty=(select count(1) from oqcbatchdetail where obd_checkno='" + ms_checkno + "') where ob_checkno='" + ms_checkno + "'", "update");
 
-            dh.ExecuteSql("update makeserial set ms_nextstepcode='" + cd_stepcode.Text + "',ms_checkno='' where ms_id='" + ms_id + "'", "update");
+            dh.ExecuteSql("update makeserial set ms_status=1,ms_nextstepcode='" + cd_stepcode.Text + "',ms_checkno='' where ms_id='" + ms_id + "'", "update");
 
             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "OQC回流", "回流成功" + cd_stepcode.Text + "产品:" + ms_prodcode + "序号:" + stepno, ms_sncode, ms_checkno);
             OperateResult.AppendText(">>" + SN.Text + "回流成功\n");

UAS_MES_YD/FunctionCode/Special/Special_CancelOQCToLastStep.cs

@@ -46,6 +46,8 @@ namespace UAS_MES_NEW.Special
             if (ms_id == "") { OperateResult.AppendText(">>请先获取SN\n"); return; }
             if (cd_stepcode.Text == "") { OperateResult.AppendText(">>请选择回流工序\n"); return; }
             DataTable dt = (DataTable)dh.ExecuteSql("select ms_nextstepcode,ms_makecode,ms_firstsn,ms_sncode,ms_prodcode,ms_checkno,ms_craftcode from makeserial where ms_id='" + ms_id + "' and instr(ms_paststep,'" + cd_stepcode.Text + "')>0 ", "select");
+            string ms_checkno = dt.Rows[0]["ms_checkno"].ToString();
+            //if (ms_checkno == "") { OperateResult.AppendText(">>" + SN.Text + "不存在抽检批次中\n", System.Drawing.Color.Red, SN); return; }
 
             if (dt.Rows.Count == 0) { OperateResult.AppendText(">>" + SN.Text + "不存在或未执行过" + cd_stepcode.Text + "工序\n"); return; }
 
@@ -53,7 +55,6 @@ namespace UAS_MES_NEW.Special
             string ms_firstsn = dt.Rows[0]["ms_firstsn"].ToString();
             string ms_prodcode = dt.Rows[0]["ms_prodcode"].ToString();
             string ms_sncode = dt.Rows[0]["ms_sncode"].ToString();
-            string ms_checkno = dt.Rows[0]["ms_checkno"].ToString();
             string ms_craftcode = dt.Rows[0]["ms_craftcode"].ToString();
             string ms_nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
 
@@ -73,7 +74,7 @@ namespace UAS_MES_NEW.Special
                     cd_stepcode.Text = dt.Rows[0]["cd_stepcode"].ToString();
                     StringBuilder sql = new StringBuilder();
 
-                    dh.ExecuteSql("update makeserial set ms_nextstepcode='" + cd_stepcode.Text + "',ms_checkno='' where ms_id='" + ms_id + "'", "update");
+                    dh.ExecuteSql("update makeserial set ms_status=1,ms_nextstepcode='" + cd_stepcode.Text + "',ms_checkno='' where ms_id='" + ms_id + "'", "update");
 
                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "OQC回流", "回流成功", ms_sncode, ms_checkno);
                     OperateResult.AppendText(">>" + SN.Text + "回流成功\n");
@@ -87,7 +88,7 @@ namespace UAS_MES_NEW.Special
 
         private void SN_KeyDown(object sender, KeyEventArgs e)
         {
-            if (e.KeyCode == Keys.Enter)
+            if (e.KeyCode == Keys.Enter)    
             {
                 DataTable dt = (DataTable)dh.ExecuteSql("select ms_sncode,ms_firstsn,ms_makecode,ms_id,ms_craftcode,ms_prodcode,ms_nextstepcode,ms_checkno from makeserial where ms_sncode='" + SN.Text + "' order by ms_id desc", "select");