From eedb38f43fdc7626b5f0cf902dc375d67819166e Mon Sep 17 00:00:00 2001
From: TML <1448969505@qq.com>
Date: Fri, 16 Oct 2020 08:41:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=A6=E5=B7=9E=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WarehouseData/SCP_INVOICE_RECVICE.aspx.cs | 30 +++++++++++++++----
 SCP/Views/WarehouseData/SCP_RECEIVE.aspx.cs   |  2 +-
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx.cs b/SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx.cs
index 89bfcb3..0a6cfb4 100644
--- a/SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx.cs
+++ b/SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx.cs
@@ -108,10 +108,22 @@ namespace SCP.WarehouseData
                 {
                     inv.PoLineNum = int.Parse(rowDataKeys[2].ToString());//订单行
                 }
-                inv.AsnBillNum = rowDataKeys[3].ToString();//发货单
+                // inv.AsnBillNum = rowDataKeys[3].ToString();//发货单
+                if (rowDataKeys[3] != null)
+                {
+                    inv.AsnBillNum = rowDataKeys[3].ToString();//发货单
+                }
                 inv.PartCode = rowDataKeys[4].ToString();//零件号
-                inv.PartDesc1 = rowDataKeys[5].ToString();//零件名称
-                inv.Currency = rowDataKeys[6].ToString();//币种
+                //inv.PartDesc1 = rowDataKeys[5].ToString();//零件名称
+                if (rowDataKeys[5] != null)
+                {
+                    inv.PartDesc1 = rowDataKeys[5].ToString();//发货单
+                }
+                //inv.Currency = rowDataKeys[6].ToString();//币种
+                if (rowDataKeys[6] != null)
+                {
+                    inv.Currency = rowDataKeys[6].ToString();//发货单
+                }
                 if (rowDataKeys[7] != null)
                 {
                     inv.Price = decimal.Parse(rowDataKeys[7].ToString());//单价
@@ -208,8 +220,16 @@ namespace SCP.WarehouseData
                     inv.AsnBillNum = rowDataKeys[3].ToString();//发货单
                 }
                 inv.PartCode = rowDataKeys[4].ToString();//零件号
-                inv.PartDesc1 = rowDataKeys[5].ToString();//零件名称
-                inv.Currency = rowDataKeys[6].ToString();//币种
+                //inv.PartDesc1 = rowDataKeys[5].ToString();//零件名称
+                if (rowDataKeys[5] != null)
+                {
+                    inv.PartDesc1 = rowDataKeys[5].ToString();
+                }
+                //inv.Currency = rowDataKeys[6].ToString();//币种
+                if (rowDataKeys[6] != null)
+                {
+                    inv.Currency = rowDataKeys[6].ToString();
+                }
                 if (rowDataKeys[7] != null)
                 {
                     inv.Price = decimal.Parse(rowDataKeys[7].ToString());//单价
diff --git a/SCP/Views/WarehouseData/SCP_RECEIVE.aspx.cs b/SCP/Views/WarehouseData/SCP_RECEIVE.aspx.cs
index 44d2d62..cea4133 100644
--- a/SCP/Views/WarehouseData/SCP_RECEIVE.aspx.cs
+++ b/SCP/Views/WarehouseData/SCP_RECEIVE.aspx.cs
@@ -171,7 +171,7 @@ namespace SCP.WarehouseData
             }
 
             string roleID = GetSelectedDataKey(Grid_V_TB_RECEIVE, 1);
-            string url = String.Format("../WarehouseData/SCP_RECEIVE_DETAIL.aspx?ID={0}&STATE={1}", roleID, STATE);
+            string url = String.Format("../WarehouseData/SCP_RECEIVE.aspx?ID={0}&STATE={1}", roleID, STATE);
             PageContext.RegisterStartupScript(Window1.GetShowReference(url));
         }
         //查询