手动送检添加工单号

UAS-MES/FunctionCode/OQC/OQC_Inspection.cs

@@ -90,10 +90,11 @@ namespace UAS_MES.OQC
                     //未勾选撤销
                     else
                     {
-                        dt = (DataTable)dh.ExecuteSql("select pa_prodcode from package where pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
+                        dt = (DataTable)dh.ExecuteSql("select pa_prodcode,pa_makecode from package where pa_outboxcode='" + pa_outboxcode.Text + "'", "select");
                         if (dt.Rows.Count > 0)
                         {
                             string pa_prodcode = dt.Rows[0]["pa_prodcode"].ToString();
+                            string pa_makecode = dt.Rows[0]["pa_makecode"].ToString();
                             if (dt.Rows[0]["pa_prodcode"].ToString() == ma_prodcode.Text || ma_prodcode.Text == "")
                             {
                                 dt = dh.getFieldsDataByCondition("OQCBatchDetail", new string[] { "obd_checkno" }, "obd_outboxcode='" + pa_outboxcode.Text + "'");
@@ -104,6 +105,11 @@ namespace UAS_MES.OQC
                                     {
                                         dh.UpdateByCondition("Oqcbatch", "ob_prodcode='" + pa_prodcode + "'", "ob_checkno='" + ob_checkno.Text + "'");
                                     }
+                                    if (pa_makecode == "")
+                                    {
+                                        string macode = dh.getFieldDataByCondition("packagedetail", "pd_makecode", "pd_outboxcode='" + pa_outboxcode.Text + "'").ToString();
+                                        dh.UpdateByCondition("Oqcbatch", "ob_makecode='" + pa_makecode + "'", "ob_checkno='" + ob_checkno.Text + "'");
+                                    }
                                     sql.Clear();
                                     sql.Append("insert into OQCBatchDetail (obd_id,obd_obid,obd_checkno, obd_sncode,obd_outboxcode,");
                                     sql.Append("obd_makecode, obd_builddate) select OQCBatchDetail_seq.nextval,(select ob_id from OQCBatch where ob_checkno='" + ob_checkno.Text + "'),'" + ob_checkno.Text + "',v_barcode");