From ff0f9604147859e00fc3402eafaccf34dbe08892 Mon Sep 17 00:00:00 2001
From: qian <feng.qian@ccwin-in.com>
Date: Mon, 8 Apr 2024 16:13:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E5=8D=95=E4=BD=9C=E5=BA=9F=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SCP/Views/SupplierData/SCP_ASN.aspx        |  2 +-
 .../SCP/Views/SupplierData/SCP_ASN.aspx.cs     |  3 ++-
 .../Views/SupplierData/SCP_ASN_DETAIL.aspx.cs  | 18 +++++++++++++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx b/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx
index f1ff991..136184a 100644
--- a/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx
+++ b/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx
@@ -125,7 +125,7 @@
                         <f:BoundField Width = "100px" DataField = "ReceiveUser" DataFormatString = "{0}" HeaderText = "收货人" />
                         <f:BoundField runat="server" HeaderText="发往地点" ColumnID="" DataField="Site_Desc" />
                         <f:BoundField runat="server" HeaderText="备注" ColumnID="" DataField="Remark" Hidden="true" />
-                        <f:BoundField runat="server" HeaderText="作废原因" ColumnID="Reason" DataField="Reason" Hidden="true"  />
+                        <f:BoundField runat="server" HeaderText="作废原因" ColumnID="Reason" DataField="Reason" />
 
 
                     </Columns>
diff --git a/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx.cs b/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx.cs
index b4e534a..9b9313a 100644
--- a/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx.cs
+++ b/北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx.cs
@@ -81,7 +81,8 @@ namespace SCP.SupplierData
         {
             object[] rowDataKeys = Grid_V_TB_ASN.DataKeys[e.RowIndex];
             string AsnBillNum = rowDataKeys[1] as string;
-            PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../SupplierData/SCP_ASN_DETAIL.aspx?AsnBillNum={0}", AsnBillNum)));
+            string IsDeleted = rowDataKeys[25].ToString();
+            PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../SupplierData/SCP_ASN_DETAIL.aspx?AsnBillNum={0}&IsDeleted={1}", AsnBillNum, IsDeleted)));
         }
 
         protected void BtnOutPut_Click(object sender, EventArgs e)
diff --git a/北京北汽/SCP/Views/SupplierData/SCP_ASN_DETAIL.aspx.cs b/北京北汽/SCP/Views/SupplierData/SCP_ASN_DETAIL.aspx.cs
index 54806e9..4422eb8 100644
--- a/北京北汽/SCP/Views/SupplierData/SCP_ASN_DETAIL.aspx.cs
+++ b/北京北汽/SCP/Views/SupplierData/SCP_ASN_DETAIL.aspx.cs
@@ -47,6 +47,11 @@ namespace SCP.SupplierData
             V_TB_ASN_DETAIL _entity = new V_TB_ASN_DETAIL();
             _entity.UserInAddress = CurrentUser.FactoryList;
             _entity.AsnBillNum = Request["AsnBillNum"];
+            string IsDeleted = Request["IsDeleted"];
+            if (IsDeleted == "True")
+            {
+                _entity.IsDeleted = true;
+            }
             SCP_ASN_CONTROLLER.Get_V_TB_ASN_DETAIL_List(_entity, (_ret) =>
             {
                 if (_ret.State == ReturnStatus.Succeed)
@@ -62,6 +67,11 @@ namespace SCP.SupplierData
             _entity.AsnBillNum = Request["AsnBillNum"];
             _entity.UserInVendIds = CurrentUser.VenderList;
             _entity.UserInAddress = CurrentUser.FactoryList;
+            string IsDeleted = Request["IsDeleted"];
+            if (IsDeleted == "True")
+            {
+                _entity.IsDeleted = true;
+            }
             SCP_ASN_CONTROLLER.Get_V_TB_ASN_List(_entity, (_ret) =>
             {
                 if (_ret.State == ReturnStatus.Succeed)
@@ -78,7 +88,7 @@ namespace SCP.SupplierData
                     DP_ReceiveTime.SelectedDate = _result.ReceiveTime;
                     DP_ShipTime.SelectedDate = _result.ShipTime;
                     TXT_StateDesc.Text = GetResourceKey(_result.State_DESC);
-                    if (_result.State == (int)AsnState.Ship)
+                    if (_result.State == (int)AsnState.Ship )
                     {
                         string la = GetCurrentLanguage();
                         if (la == "CH")
@@ -99,6 +109,12 @@ namespace SCP.SupplierData
                         btnException.Hidden = true;
                         btnException2.Hidden = true;
                     }
+                    if (_result.IsDeleted)
+                    {
+                        Toolbar2.Hidden = true;
+                        Toolbar1.Hidden = true;
+                        Toolbar3.Hidden = true;
+                    }
                 }
                 
             });