From e045fc98fbd320ad4cd68e4b25f01c9760dd5122 Mon Sep 17 00:00:00 2001 From: TML <1448969505@qq.com> Date: Thu, 15 Oct 2020 11:36:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=94=A6=E5=B7=9E=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs b/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs index 4a7a9d0..d6a1a66 100644 --- a/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs +++ b/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs @@ -120,7 +120,7 @@ namespace SCP.SupplierData if (!string.IsNullOrEmpty(_ls.Site) && !string.IsNullOrEmpty(_venderId)) { var _vender = SCP_TB_VENDER_CONTROLLER.GetVender(_venderId, _ls.Site); - if (_vender.Tax != null) + if (_vender.Tax > 0 && _vender.Tax != null) { lbTaxRate.SelectedValue = _vender.Tax.ToString(); } @@ -139,13 +139,13 @@ namespace SCP.SupplierData if (!string.IsNullOrEmpty(_ls.Site) && !string.IsNullOrEmpty(_venderId)) { var _vender = SCP_TB_VENDER_CONTROLLER.GetVender(_venderId, _ls.Site); - if (_vender.Tax != null) + if (_vender.Tax >0&&_vender.Tax!=null) { - lbTaxRate.Text = _vender.Tax.ToString(); + lbTaxRate.SelectedValue = _vender.Tax.ToString(); } else { - lbTaxRate.SelectedValue = _vender.Tax.ToString(); + lbTaxRate.SelectedValue = "0"; } } } @@ -420,7 +420,7 @@ namespace SCP.SupplierData if (!string.IsNullOrEmpty(_ls.Site) && !string.IsNullOrEmpty(_venderId)) { var _vender = SCP_TB_VENDER_CONTROLLER.GetVender(_venderId, _ls.Site); - if (_vender.Tax != null) + if (_vender.Tax > 0 && _vender.Tax != null) { lbTaxRate.SelectedValue = _vender.Tax.ToString(); } 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 2/3] =?UTF-8?q?=E9=94=A6=E5=B7=9E=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=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)); } //查询 From 4c7629c8adaca0a1dd1c6d14cd5f6dfddbe31a8e Mon Sep 17 00:00:00 2001 From: TML <1448969505@qq.com> Date: Fri, 16 Oct 2020 10:02:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=94=A6=E5=B7=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx.cs | 2 +- SCP/Views/WarehouseData/SCP_RECEIVE.aspx.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx.cs b/SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx.cs index 0a6cfb4..11dbee2 100644 --- a/SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx.cs +++ b/SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx.cs @@ -108,7 +108,7 @@ 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();//发货单 diff --git a/SCP/Views/WarehouseData/SCP_RECEIVE.aspx.cs b/SCP/Views/WarehouseData/SCP_RECEIVE.aspx.cs index cea4133..44d2d62 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.aspx?ID={0}&STATE={1}", roleID, STATE); + string url = String.Format("../WarehouseData/SCP_RECEIVE_DETAIL.aspx?ID={0}&STATE={1}", roleID, STATE); PageContext.RegisterStartupScript(Window1.GetShowReference(url)); } //查询