diff --git a/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx b/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx
index b992ebc..7d46f94 100644
--- a/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx
+++ b/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx
@@ -68,7 +68,7 @@
-
+
diff --git a/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.cs b/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.cs
index 1be817f..4da108a 100644
--- a/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.cs
+++ b/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.cs
@@ -145,7 +145,7 @@ namespace SCP.Views.锦州锦恒.SupplierData
dpUpdateTime.SelectedDate = _Model.UpdateTime;
txtTax.SelectedValue = _Model.Tax != null ? _Model.Tax.Value.ToString() : "0";
txtTaxAmount.Text = _Model.TaxAmount != null ? _Model.TaxAmount.Value.ToString() : "0";
- txtContractPrice1.Text = _Model.ContractPrice != null ? _Model.ContractPrice.ToString() : string.Empty;
+ txtDiscountPrice1.Text = _Model.DiscountPrice != null ? _Model.DiscountPrice.ToString() : string.Empty;
txtBlancePrice1.Text = _Model.BlancePrice != null ? _Model.BlancePrice.ToString() : string.Empty;
txtAmount.Text = _Model.Amount.ToString();
txtTotal.Text = _Model.Total != null ? _Model.Total.ToString() : string.Empty;
@@ -187,9 +187,9 @@ namespace SCP.Views.锦州锦恒.SupplierData
txtExpressNumber.Readonly = true;
txtExpressNumber.Required = false;
- txtContractPrice1.Readonly = true;
- txtContractPrice1.Required = false;
- txtContractPrice1.Enabled = false;
+ txtDiscountPrice1.Readonly = true;
+ txtDiscountPrice1.Required = false;
+ txtDiscountPrice1.Enabled = false;
txtBlancePrice1.Readonly = true;
txtBlancePrice1.Required = false;
@@ -213,9 +213,9 @@ namespace SCP.Views.锦州锦恒.SupplierData
txtInvoiceNumber.Readonly = false;
txtInvoiceNumber.Required = true;
txtExpressNumber.Readonly = false;
- txtContractPrice1.Readonly = false;
- txtContractPrice1.Required = true;
- txtContractPrice1.Enabled = true;
+ txtDiscountPrice1.Readonly = false;
+ txtDiscountPrice1.Required = true;
+ txtDiscountPrice1.Enabled = true;
txtExtend1.Readonly = false;
txtExtend1.Required = true;
txtExtend1.Enabled = true;
@@ -271,7 +271,7 @@ namespace SCP.Views.锦州锦恒.SupplierData
string InvoiceNumber = MyWebString.GetString(this.txtInvoiceNumber.Text.Trim());
string Memo = MyWebString.GetString(this.txtMemo.Text.Trim());
string ExpressNumber = MyWebString.GetString(this.txtExpressNumber.Text.Trim());
- string ContractPrice1 = MyWebString.GetString(this.txtContractPrice1.Text.Trim());//折扣
+ string DiscountPrice1 = MyWebString.GetString(this.txtDiscountPrice1.Text.Trim());//折扣
string BlancePrice1 = MyWebString.GetString(this.txtBlancePrice1.Text.Trim());//税额调整
string Extend1 = MyWebString.GetString(this.txtExtend1.Text.Trim());//实际发票税前金额
string Extend2 = MyWebString.GetString(this.txtExtend2.Text.Trim());//实际发票税额
@@ -300,9 +300,9 @@ namespace SCP.Views.锦州锦恒.SupplierData
{
_invoice.Extend2 = 0;
}
- if (string.IsNullOrEmpty(ContractPrice1))
+ if (string.IsNullOrEmpty(DiscountPrice1))
{
- _invoice.ContractPrice = 0;
+ _invoice.DiscountPrice = 0;
}
if (string.IsNullOrEmpty(BlancePrice1))
@@ -328,9 +328,9 @@ namespace SCP.Views.锦州锦恒.SupplierData
decimal b1;
decimal d1;
decimal e1;
- if (decimal.TryParse(ContractPrice1, out c1))
+ if (decimal.TryParse(DiscountPrice1, out c1))
{
- _invoice.ContractPrice = c1;
+ _invoice.DiscountPrice = c1;
}
if (decimal.TryParse(Extend1, out d1))
{
@@ -439,7 +439,7 @@ namespace SCP.Views.锦州锦恒.SupplierData
string ExpressNumber = MyWebString.GetString(this.txtExpressNumber.Text.Trim());//快递单号
string Extend1 = MyWebString.GetString(this.txtExtend1.Text.Trim());//折扣价格
string Extend2 = MyWebString.GetString(this.txtExtend2.Text.Trim());//折扣价格
- string ContractPrice1 = MyWebString.GetString(this.txtContractPrice1.Text.Trim());//折扣价格
+ string DiscountPrice1 = MyWebString.GetString(this.txtDiscountPrice1.Text.Trim());//折扣价格
string BlancePrice1 = MyWebString.GetString(this.txtBlancePrice1.Text.Trim());//合同差额
_Invoice.InvoiceNum = InvoiceNumber;
@@ -453,9 +453,9 @@ namespace SCP.Views.锦州锦恒.SupplierData
{
_Invoice.Extend2 = 0;
}
- if (string.IsNullOrEmpty(ContractPrice1))
+ if (string.IsNullOrEmpty(DiscountPrice1))
{
- _Invoice.ContractPrice = 0;
+ _Invoice.DiscountPrice = 0;
}
if (string.IsNullOrEmpty(BlancePrice1))
{
@@ -482,9 +482,9 @@ namespace SCP.Views.锦州锦恒.SupplierData
{
_Invoice.Extend2 = 0;
}
- if (decimal.TryParse(ContractPrice1, out c1))
+ if (decimal.TryParse(DiscountPrice1, out c1))
{
- _Invoice.ContractPrice = c1;
+ _Invoice.DiscountPrice = c1;
}
else
{
diff --git a/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.designer.cs b/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.designer.cs
index 861d5c5..8538b1d 100644
--- a/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.designer.cs
+++ b/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.designer.cs
@@ -231,13 +231,13 @@ namespace SCP.Views.锦州锦恒.SupplierData
protected global::FineUI.NumberBox txtExtend2;
///
- /// txtContractPrice1 控件。
+ /// txtDiscountPrice1 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUI.NumberBox txtContractPrice1;
+ protected global::FineUI.NumberBox txtDiscountPrice1;
///
/// txtBlancePrice1 控件。
diff --git a/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx b/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx
index 0478d44..30e0a4e 100644
--- a/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx
+++ b/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx
@@ -63,7 +63,7 @@
-
+
@@ -92,7 +92,7 @@
diff --git a/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx.cs b/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx.cs
index f28654a..a03d133 100644
--- a/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx.cs
+++ b/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx.cs
@@ -67,7 +67,7 @@ namespace SCP.Views.锦州锦恒.WarehouseData
txtExpressNumber.Text = _Model.ExpressNum;
txtAmount.Text = _Model.Amount.ToString();
txtTotal.Text = _Model.Total != null ? _Model.Total.ToString() : string.Empty;
- txtContractPrice1.Text = _Model.ContractPrice != null ? _Model.ContractPrice.ToString() : string.Empty;
+ txtDiscountPrice1.Text = _Model.DiscountPrice != null ? _Model.DiscountPrice.ToString() : string.Empty;
txtExtend1.Text = _Model.Extend1 != null ? _Model.Extend1.ToString() : string.Empty;
txtExtend2.Text = _Model.Extend2 != null ? _Model.Extend2.ToString() : string.Empty;
txtRealTotal.Text = _Model.RealTotal != null ? _Model.RealTotal.ToString() : string.Empty;
@@ -208,6 +208,7 @@ namespace SCP.Views.锦州锦恒.WarehouseData
var txtLineMemo = (System.Web.UI.WebControls.TextBox)row.FindControl("txtLineMemo");
_entity.ContractPrice = ConvertHelper.To(rowDataKeys[6]);
_entity.BlancePrice = ConvertHelper.To(rowDataKeys[7]);
+ _entity.DiscountPrice = ConvertHelper.To(rowDataKeys[8]);
_entity.Remark = txtLineMemo.Text;
//把备注添加到TB_INVOICE、TB_INVOICE_DETAIL
_ls.Add(_entity);
@@ -266,6 +267,7 @@ namespace SCP.Views.锦州锦恒.WarehouseData
_entity.Price = ConvertHelper.To(rowDataKeys[5]);
_entity.ContractPrice = ConvertHelper.To(rowDataKeys[6]);
_entity.BlancePrice = ConvertHelper.To(rowDataKeys[7]);
+ _entity.DiscountPrice = ConvertHelper.To(rowDataKeys[8]);
var txtLineMemo = (System.Web.UI.WebControls.TextBox)row.FindControl("txtLineMemo");
_entity.Remark = txtLineMemo.Text;
diff --git a/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx.designer.cs b/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx.designer.cs
index 649e0c2..be785c2 100644
--- a/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx.designer.cs
+++ b/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx.designer.cs
@@ -186,13 +186,13 @@ namespace SCP.Views.锦州锦恒.WarehouseData
protected global::FineUI.TextBox txtExtend2;
///
- /// txtContractPrice1 控件。
+ /// txtDiscountPrice1 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUI.TextBox txtContractPrice1;
+ protected global::FineUI.TextBox txtDiscountPrice1;
///
/// txtBlancePrice1 控件。
diff --git a/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx b/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx
index 77e33ba..1b39a10 100644
--- a/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx
+++ b/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx
@@ -56,7 +56,7 @@
-
+
diff --git a/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx.cs b/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx.cs
index d54ef77..78a1088 100644
--- a/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx.cs
+++ b/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx.cs
@@ -163,8 +163,8 @@ namespace SCP.Views.锦州锦恒.WarehouseData
txtExtend1.Text = _Model.Extend1 != null ? _Model.Extend1.ToString() : string.Empty;
txtExtend2.Text = _Model.Extend2 != null ? _Model.Extend2.ToString() : string.Empty;
- txtContractPrice1.Text = _Model.ContractPrice != null ? _Model.ContractPrice.ToString() : string.Empty;
- txtContractPrice1.Text = _Model.ContractPrice != null ? _Model.ContractPrice.ToString() : string.Empty;
+ txtDiscountPrice1.Text = _Model.DiscountPrice != null ? _Model.DiscountPrice.ToString() : string.Empty;
+ txtDiscountPrice1.Text = _Model.DiscountPrice != null ? _Model.DiscountPrice.ToString() : string.Empty;
txtBlancePrice1.Text = _Model.BlancePrice != null ? _Model.BlancePrice.ToString() : string.Empty;
txtAmount.Text = _Model.Amount.ToString();
txtTotal.Text = _Model.Total != null ? _Model.Total.ToString() : string.Empty;
diff --git a/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx.designer.cs b/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx.designer.cs
index a4759ec..3e4d415 100644
--- a/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx.designer.cs
+++ b/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx.designer.cs
@@ -168,13 +168,13 @@ namespace SCP.Views.锦州锦恒.WarehouseData
protected global::FineUI.NumberBox txtExtend2;
///
- /// txtContractPrice1 控件。
+ /// txtDiscountPrice1 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUI.NumberBox txtContractPrice1;
+ protected global::FineUI.NumberBox txtDiscountPrice1;
///
/// txtRealTotal 控件。
diff --git a/UniApiGroup/Controller/OdbcApiScpController.cs b/UniApiGroup/Controller/OdbcApiScpController.cs
index 90a5a94..8f75c12 100644
--- a/UniApiGroup/Controller/OdbcApiScpController.cs
+++ b/UniApiGroup/Controller/OdbcApiScpController.cs
@@ -326,11 +326,11 @@ namespace CK.SCP.GrupUniApi.Controller
qadData.xxscm_inv_date = _invoice.UpdateTime == null ? _invoice.CreateTime.Value.AddDays(1) : _invoice.UpdateTime.Value;
qadData.xxscm_inv_totamt = _invoice.Amount.Value;
qadData.xxscm_inv_tottax = _invoice.Total.Value;
- qadData.xxscm_inv_totdiscount = _invoice.DiscountPrice == null ? 0 : _invoice.DiscountPrice.Value;
- qadData.xxscm_inv_tottaxvar = _invoice.BlancePrice == null ? 0 : _invoice.BlancePrice.Value;
- qadData.xxscm_inv_totclaim= _invoice.ContractPrice == null ? 0 : _invoice.ContractPrice.Value;
- qadData.xxscm_inv_extend1 = _invoice.Extend1 == null ? 0 : _invoice.Extend1.Value;
- qadData.xxscm_inv_extend2 = _invoice.Extend2 == null ? 0 : _invoice.Extend2.Value;
+ qadData.xxscm_inv_totdiscount = _invoice.DiscountPrice == null ? 0 : _invoice.DiscountPrice.Value;//折扣金额
+ qadData.xxscm_inv_tottaxvar = _invoice.BlancePrice == null ? 0 : _invoice.BlancePrice.Value;//调整税额
+ qadData.xxscm_inv_totclaim= _invoice.ContractPrice == null ? 0 : _invoice.ContractPrice.Value;//索赔金额
+ qadData.xxscm_inv_extend1 = _invoice.Extend1 == null ? 0 : _invoice.Extend1.Value;//纸质发票税前金额
+ qadData.xxscm_inv_extend2 = _invoice.Extend2 == null ? 0 : _invoice.Extend2.Value;//纸质发票税额
qadDataList.Add(qadData);
p.State = (int)BillState.Finish;
p.PutTime = DateTime.Now;