Quellcode durchsuchen

优化栈板出货打印功能

callm vor 1 Tag
Ursprung
Commit
0bebadada0

+ 1 - 0
UAS_MES_YDCY/FunctionCode/Warehouse/Warehouse_FinishedProductOutSumNEW.Designer.cs

@@ -630,6 +630,7 @@
             this.InOutDetailDGV.Size = new System.Drawing.Size(1144, 383);
             this.InOutDetailDGV.TabIndex = 218;
             this.InOutDetailDGV.DataSourceChanged += new System.EventHandler(this.InOutDetailDGV_DataSourceChanged);
+            this.InOutDetailDGV.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.InOutDetailDGV_CellClick);
             // 
             // pa_mothercode
             // 

+ 14 - 4
UAS_MES_YDCY/FunctionCode/Warehouse/Warehouse_FinishedProductOutSumNEW.cs

@@ -380,6 +380,7 @@ namespace UAS_MES_NEW.Warehouse
                             }
                             dh.BatchInsert("update makeserial set ms_outno='" + pi_inoutno.Text + "' where ms_sncode = :v_barcode and ms_makecode = :v_makecode and ms_outno is null", new string[] { "v_barcode", "v_makecode" }, v_barcode.ToArray(), v_makecode.ToArray());
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode, User.UserLineCode, User.UserSourceCode, "栈板" + input.Text + "出货备货", "栈板" + input.Text + "出货备货成功", input.Text, "");
+                            PrintPrcode = input.Text;
                             Printlab.PerformClick();
                         }
                         else if (bigboxBtn.Checked)
@@ -459,6 +460,7 @@ namespace UAS_MES_NEW.Warehouse
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode, User.UserLineCode, User.UserSourceCode, "箱号" + input.Text + "出货备货", "箱号" + input.Text + "出货备货成功", input.Text, "");
                                 if (int.Parse(pa_standardqty.Text) == datatable.Rows.Count)
                                 {
+                                    PrintPrcode = pa_outboxcode.Text;
                                     Printlab.PerformClick();
                                 }
                             }
@@ -817,7 +819,6 @@ namespace UAS_MES_NEW.Warehouse
                 string pd_id = Prodiodetail.Rows[e.RowIndex].Cells["pd_id"].Value.ToString();
                 custpo = Prodiodetail.Rows[e.RowIndex].Cells["pd_custpo"].Value.ToString();
                 custpodetno = Prodiodetail.Rows[e.RowIndex].Cells["pd_custpodetno"].Value.ToString();
-                PrintPrcode = pd_prodcode;
                 PdPDNO = pd_pdno;
                 PDID = pd_id;
                 FillPrintLabel(pd_prodcode);
@@ -854,7 +855,7 @@ namespace UAS_MES_NEW.Warehouse
                 OperateResult.AppendText(">>重量不符合" + pa_outboxcode.Text + "\n", Color.Black);
                 return;
             }
-            if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, PDID, PrintPrcode, int.Parse(PrintNum.Text), PdPDNO, PrintPrcode, "栈板标", "0", out ErrorMessage))
+            if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, PrintPrcode, PrintPrcode, int.Parse(PrintNum.Text), PdPDNO, PrintPrcode, "栈板标", "0", out ErrorMessage))
             {
                 OperateResult.AppendText(">>打印料号" + PrintPrcode + "\n", Color.Black);
             }
@@ -864,7 +865,7 @@ namespace UAS_MES_NEW.Warehouse
             }
             if (PrintSecond.Checked)
             {
-                if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrinterList1.Text, PDID, PrintPrcode, int.Parse(PrintNum1.Text), PdPDNO, PrintPrcode, "栈板标", "0", out ErrorMessage))
+                if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel1.Text, PrintLabel1.SelectedValue.ToString(), PrinterList1.Text, PrintPrcode, PrintPrcode, int.Parse(PrintNum1.Text), PdPDNO, PrintPrcode, "栈板标", "0", out ErrorMessage))
                 {
                     OperateResult.AppendText(">>打印料号" + PrintPrcode + "\n", Color.Black);
                 }
@@ -875,7 +876,7 @@ namespace UAS_MES_NEW.Warehouse
             }
             if (PrintThird.Checked)
             {
-                if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel2.Text, PrintLabel2.SelectedValue.ToString(), PrinterList2.Text, PDID, PrintPrcode, int.Parse(PrintNum2.Text), PdPDNO, PrintPrcode, "栈板标", "0", out ErrorMessage))
+                if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel2.Text, PrintLabel2.SelectedValue.ToString(), PrinterList2.Text, PrintPrcode, PrintPrcode, int.Parse(PrintNum2.Text), PdPDNO, PrintPrcode, "栈板标", "0", out ErrorMessage))
                 {
                     OperateResult.AppendText(">>打印料号" + PrintPrcode + "\n", Color.Black);
                 }
@@ -975,5 +976,14 @@ namespace UAS_MES_NEW.Warehouse
                 else OperateResult.AppendText(">>单号" + pi_inoutno.Text + "不存在\n", Color.Red);
             }
         }
+
+        private void InOutDetailDGV_CellClick(object sender, DataGridViewCellEventArgs e)
+        {
+            if (e.RowIndex >= 0)
+            {
+                string pd_prodcode = InOutDetailDGV.Rows[e.RowIndex].Cells["pa_mothercode"].Value.ToString();
+                PrintPrcode = pd_prodcode;
+            }
+        }
     }
 }

+ 0 - 45
UAS_MES_YDCY/FunctionCode/Warehouse/Warehouse_FinishedProductOutSumNEW.resx

@@ -279,33 +279,6 @@
   <metadata name="pr_spec1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="pd_pdno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_cartons.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_prodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_custpo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_custpodetno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pr_detail1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pr_spec1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="Clean.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -362,24 +335,6 @@
   <metadata name="blank.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="pa_mothercode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="PA_TOTALQTY.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pa_prodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pr_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="blank.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="ProdDetail.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m