导入BUG调整

UAS-出货标签管理(贸易版)/PublicMethod/LogicHandler.cs

@@ -291,26 +291,39 @@ namespace UAS_LabelMachine.PublicMethod
                 {
                     FilterData(iCustCode, dr[0]["pr_brand"].ToString(), pr_spec, qty, DateCode, LotNo, out pr_spec, out qty, out DateCode, out LotNo);
                 }
+                DataRow datarow = null;
+                //获取指定行的数据，先被扣除完
+                if (dr.Length > 0)
+                {
+                    for (int m = 0; m < dr.Length; m++)
+                    {
+                        if (outsumqty[pr_spec][dr[m]["pd_pdno"].ToString()] != 0)
+                        {
+                            datarow = dr[m];
+                            break;
+                        }
+                    }
+                }
                 if (dr.Length == 0)
                 {
                     MessageBox.Show("出货单" + iInOutNo + "不包含型号" + pr_spec);
                     return;
                 }
                 decimal outqty = decimal.Parse(Regex.Replace(qty, @"[^\d]*", ""));
-                for (int k = 0; k < dr.Length; k++)
+                for (int k = 0; k < 1; k++)
                 {
-                    string pd_orderdetno = dr[k]["pd_orderdetno"].ToString();
-                    string pd_prodcode = dr[k]["pd_prodcode"].ToString();
-                    string pd_ordercode = dr[k]["pd_ordercode"].ToString();
-                    string pd_piid = dr[k]["pd_piid"].ToString();
-                    string pr_brand = dr[k]["pr_brand"].ToString();
-                    string pd_pdno = dr[k]["pd_pdno"].ToString();
-                    string pd_id = dr[k]["pd_id"].ToString();
-                    string pd_piclass = dr[k]["pd_piclass"].ToString();
-                    string pr_id = dr[k]["pr_id"].ToString();
-                    string pr_madein = dr[k]["pr_madein"].ToString();
+                    string pd_orderdetno = datarow["pd_orderdetno"].ToString();
+                    string pd_prodcode = datarow["pd_prodcode"].ToString();
+                    string pd_ordercode = datarow["pd_ordercode"].ToString();
+                    string pd_piid = datarow["pd_piid"].ToString();
+                    string pr_brand = datarow["pr_brand"].ToString();
+                    string pd_pdno = datarow["pd_pdno"].ToString();
+                    string pd_id = datarow["pd_id"].ToString();
+                    string pd_piclass = datarow["pd_piclass"].ToString();
+                    string pr_id = datarow["pr_id"].ToString();
+                    string pr_madein = datarow["pr_madein"].ToString();
                     //已导入数量
-                    decimal zxbzs = decimal.Parse(dr[k]["pr_zxbzs"].ToString());
+                    decimal zxbzs = decimal.Parse(datarow["pr_zxbzs"].ToString());
                     decimal pd_outqty = 0;
                     decimal barcodenum = 0;
                     if (outsumqty[pr_spec][pd_pdno] == 0)