Merge branch 'master' of https://gitee.com/zxyabc/COMONE

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();
                     }

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();//发货单
+                if (rowDataKeys[3] != null)
+                {
                     inv.AsnBillNum = rowDataKeys[3].ToString();//发货单
+                }
                 inv.PartCode = rowDataKeys[4].ToString();//零件号
-                inv.PartDesc1 = rowDataKeys[5].ToString();//零件名称
+                //inv.PartDesc1 = rowDataKeys[5].ToString();//零件名称
-                inv.Currency = rowDataKeys[6].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.PartDesc1 = rowDataKeys[5].ToString();//零件名称
-                inv.Currency = rowDataKeys[6].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());//单价