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 @@
-
+
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;
+ }
}
});