Browse Source

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

master
学 赵 4 years ago
parent
commit
f19f4a3a4b
  1. 2
      Controller/SCP_RECEIVE_CONTROLLER.cs
  2. 10
      SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs
  3. 30
      SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx.cs
  4. 2
      SCP/Views/WarehouseData/SCP_RECEIVE.aspx.cs
  5. 2
      SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx
  6. 4
      SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.cs
  7. 2
      SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE.aspx
  8. 2
      SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx
  9. 34
      SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.cs
  10. 4
      SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.designer.cs
  11. 4
      SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx
  12. 4
      SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx.cs
  13. 4
      SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx.designer.cs
  14. 2
      SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx
  15. 4
      SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx.cs
  16. 4
      SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx.designer.cs
  17. 10
      UniApiGroup/Controller/OdbcApiScpController.cs

2
Controller/SCP_RECEIVE_CONTROLLER.cs

@ -1028,7 +1028,7 @@ namespace CK.SCP.Controller
if (p_entity.UIDList != null && p_entity.UIDList.Count > 0) if (p_entity.UIDList != null && p_entity.UIDList.Count > 0)
{ {
q = q.Where(p => p_entity.UIDList.Contains(p.UID)); q = q.Where(p => p_entity.UIDList.Contains(p.UID));
} }
_ret.State = ReturnStatus.Succeed; _ret.State = ReturnStatus.Succeed;
_ret.Result = q; _ret.Result = q;
p_action(_ret); p_action(_ret);

10
SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs

@ -120,7 +120,7 @@ namespace SCP.SupplierData
if (!string.IsNullOrEmpty(_ls.Site) && !string.IsNullOrEmpty(_venderId)) if (!string.IsNullOrEmpty(_ls.Site) && !string.IsNullOrEmpty(_venderId))
{ {
var _vender = SCP_TB_VENDER_CONTROLLER.GetVender(_venderId, _ls.Site); 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(); lbTaxRate.SelectedValue = _vender.Tax.ToString();
} }
@ -139,13 +139,13 @@ namespace SCP.SupplierData
if (!string.IsNullOrEmpty(_ls.Site) && !string.IsNullOrEmpty(_venderId)) if (!string.IsNullOrEmpty(_ls.Site) && !string.IsNullOrEmpty(_venderId))
{ {
var _vender = SCP_TB_VENDER_CONTROLLER.GetVender(_venderId, _ls.Site); 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(); lbTaxRate.SelectedValue = _vender.Tax.ToString();
} }
else else
{ {
lbTaxRate.SelectedValue = _vender.Tax.ToString(); lbTaxRate.SelectedValue = "0";
} }
} }
} }
@ -420,7 +420,7 @@ namespace SCP.SupplierData
if (!string.IsNullOrEmpty(_ls.Site) && !string.IsNullOrEmpty(_venderId)) if (!string.IsNullOrEmpty(_ls.Site) && !string.IsNullOrEmpty(_venderId))
{ {
var _vender = SCP_TB_VENDER_CONTROLLER.GetVender(_venderId, _ls.Site); 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(); lbTaxRate.SelectedValue = _vender.Tax.ToString();
} }

30
SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx.cs

@ -108,10 +108,22 @@ namespace SCP.WarehouseData
{ {
inv.PoLineNum = int.Parse(rowDataKeys[2].ToString());//订单行 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.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) if (rowDataKeys[7] != null)
{ {
inv.Price = decimal.Parse(rowDataKeys[7].ToString());//单价 inv.Price = decimal.Parse(rowDataKeys[7].ToString());//单价
@ -208,8 +220,16 @@ namespace SCP.WarehouseData
inv.AsnBillNum = rowDataKeys[3].ToString();//发货单 inv.AsnBillNum = rowDataKeys[3].ToString();//发货单
} }
inv.PartCode = rowDataKeys[4].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) if (rowDataKeys[7] != null)
{ {
inv.Price = decimal.Parse(rowDataKeys[7].ToString());//单价 inv.Price = decimal.Parse(rowDataKeys[7].ToString());//单价

2
SCP/Views/WarehouseData/SCP_RECEIVE.aspx.cs

@ -170,7 +170,7 @@ namespace SCP.WarehouseData
STATE = "0"; STATE = "0";
} }
string roleID = GetSelectedDataKey(Grid_V_TB_RECEIVE, 1); string roleID = GetSelectedDataKey(Grid_V_TB_RECEIVE, 2);
string url = String.Format("../WarehouseData/SCP_RECEIVE_DETAIL.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)); PageContext.RegisterStartupScript(Window1.GetShowReference(url));
} }

2
SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx

@ -90,7 +90,7 @@
</Items> </Items>
</f:GroupPanel> </f:GroupPanel>
<f:Grid ID="Grid_V_TB_RECEIVE" ShowBorder="true" ShowHeader="true" PageSize="20" BoxFlex="1" CssClass="maingrid" <f:Grid ID="Grid_V_TB_RECEIVE" ShowBorder="true" ShowHeader="true" PageSize="20" BoxFlex="1" CssClass="maingrid"
runat="server" DataKeyNames="UID,RecvBillNum,ReceiveDetailList,Site" IsDatabasePaging="True" AllowPaging="True" EnableRowDoubleClickEvent="True" OnRowDataBound="Grid_V_TB_RECEIVE_RowDataBound" runat="server" DataKeyNames="UID,RecvBillNum,ReceiveDetailList,Site,ErpRecvBillNum" IsDatabasePaging="True" AllowPaging="True" EnableRowDoubleClickEvent="True" OnRowDataBound="Grid_V_TB_RECEIVE_RowDataBound"
OnRowDoubleClick="Grid1_OnRowDoubleClick" SortDirection="DESC" SortField="ShipTime" EnableCheckBoxSelect="True" EnableCollapse="true" OnRowDoubleClick="Grid1_OnRowDoubleClick" SortDirection="DESC" SortField="ShipTime" EnableCheckBoxSelect="True" EnableCollapse="true"
EnableRowSelectEvent="False" AutoScroll="True" OnPageIndexChange="Grid1_OnPageIndexChange"> EnableRowSelectEvent="False" AutoScroll="True" OnPageIndexChange="Grid1_OnPageIndexChange">
<PageItems> <PageItems>

4
SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.cs

@ -162,8 +162,8 @@ namespace SCP.WarehouseData
STATE = "0"; STATE = "0";
} }
string roleID = GetSelectedDataKey(Grid_V_TB_RECEIVE, 1); string ErpRecvBillNum = GetSelectedDataKey(Grid_V_TB_RECEIVE,4);
string url = String.Format("../WarehouseData/SCP_RECEIVE_DETAIL.aspx?ID={0}&STATE={1}", roleID, STATE); string url = String.Format("../WarehouseData/SCP_RECEIVE_DETAIL.aspx?ID={0}&STATE={1}", ErpRecvBillNum, STATE);
PageContext.RegisterStartupScript(Window1.GetShowReference(url)); PageContext.RegisterStartupScript(Window1.GetShowReference(url));
} }
//查询 //查询

2
SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE.aspx

@ -124,7 +124,7 @@
</f:TemplateField> </f:TemplateField>
<f:BoundField runat="server" HeaderText="实际税前金额" ColumnID="" DataField="Extend1" DataFormatString="{0:F}" /> <f:BoundField runat="server" HeaderText="实际税前金额" ColumnID="" DataField="Extend1" DataFormatString="{0:F}" />
<f:BoundField runat="server" HeaderText="实际税额" ColumnID="" DataField="Extend2" DataFormatString="{0:F}" /> <f:BoundField runat="server" HeaderText="实际税额" ColumnID="" DataField="Extend2" DataFormatString="{0:F}" />
<f:BoundField runat="server" HeaderText="折扣金额" ColumnID="" DataField="ContractPrice" DataFormatString="{0:F}" /> <f:BoundField runat="server" HeaderText="折扣金额" ColumnID="" DataField="DiscountPrice" DataFormatString="{0:F}" />
<f:BoundField runat="server" HeaderText="调整税额" ColumnID="" DataField="BlancePrice" DataFormatString="{0:F}" Hidden="true" /> <f:BoundField runat="server" HeaderText="调整税额" ColumnID="" DataField="BlancePrice" DataFormatString="{0:F}" Hidden="true" />
<f:BoundField runat="server" HeaderText="开票金额" ColumnID="" DataField="RealTotal" DataFormatString="{0:F}" /> <f:BoundField runat="server" HeaderText="开票金额" ColumnID="" DataField="RealTotal" DataFormatString="{0:F}" />
<f:BoundField runat="server" HeaderText="备注" ColumnID="" DataField="Remark" /> <f:BoundField runat="server" HeaderText="备注" ColumnID="" DataField="Remark" />

2
SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx

@ -68,7 +68,7 @@
<Items> <Items>
<f:NumberBox ID="txtExtend1" runat="server" Label="实际税前金额" Readonly="true" Enabled="false"/> <f:NumberBox ID="txtExtend1" runat="server" Label="实际税前金额" Readonly="true" Enabled="false"/>
<f:NumberBox ID="txtExtend2" runat="server" Label="实际税额" Readonly="true" Enabled="false"/> <f:NumberBox ID="txtExtend2" runat="server" Label="实际税额" Readonly="true" Enabled="false"/>
<f:NumberBox ID="txtContractPrice1" runat="server" Label="折扣金额" Readonly="true" Enabled="false"/> <f:NumberBox ID="txtDiscountPrice1" runat="server" Label="折扣金额" Readonly="true" Enabled="false"/>
<f:NumberBox ID="txtBlancePrice1" runat="server" Label="调整税额" MaxValue="1" Hidden="true" /> <f:NumberBox ID="txtBlancePrice1" runat="server" Label="调整税额" MaxValue="1" Hidden="true" />
<f:TextBox ID="txtRealTotal" runat="server" Label="开票金额" Text="" Readonly="true" Enabled="false" /> <f:TextBox ID="txtRealTotal" runat="server" Label="开票金额" Text="" Readonly="true" Enabled="false" />
</Items> </Items>

34
SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.cs

@ -145,7 +145,7 @@ namespace SCP.Views.锦州锦恒.SupplierData
dpUpdateTime.SelectedDate = _Model.UpdateTime; dpUpdateTime.SelectedDate = _Model.UpdateTime;
txtTax.SelectedValue = _Model.Tax != null ? _Model.Tax.Value.ToString() : "0"; txtTax.SelectedValue = _Model.Tax != null ? _Model.Tax.Value.ToString() : "0";
txtTaxAmount.Text = _Model.TaxAmount != null ? _Model.TaxAmount.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; txtBlancePrice1.Text = _Model.BlancePrice != null ? _Model.BlancePrice.ToString() : string.Empty;
txtAmount.Text = _Model.Amount.ToString(); txtAmount.Text = _Model.Amount.ToString();
txtTotal.Text = _Model.Total != null ? _Model.Total.ToString() : string.Empty; txtTotal.Text = _Model.Total != null ? _Model.Total.ToString() : string.Empty;
@ -187,9 +187,9 @@ namespace SCP.Views.锦州锦恒.SupplierData
txtExpressNumber.Readonly = true; txtExpressNumber.Readonly = true;
txtExpressNumber.Required = false; txtExpressNumber.Required = false;
txtContractPrice1.Readonly = true; txtDiscountPrice1.Readonly = true;
txtContractPrice1.Required = false; txtDiscountPrice1.Required = false;
txtContractPrice1.Enabled = false; txtDiscountPrice1.Enabled = false;
txtBlancePrice1.Readonly = true; txtBlancePrice1.Readonly = true;
txtBlancePrice1.Required = false; txtBlancePrice1.Required = false;
@ -213,9 +213,9 @@ namespace SCP.Views.锦州锦恒.SupplierData
txtInvoiceNumber.Readonly = false; txtInvoiceNumber.Readonly = false;
txtInvoiceNumber.Required = true; txtInvoiceNumber.Required = true;
txtExpressNumber.Readonly = false; txtExpressNumber.Readonly = false;
txtContractPrice1.Readonly = false; txtDiscountPrice1.Readonly = false;
txtContractPrice1.Required = true; txtDiscountPrice1.Required = true;
txtContractPrice1.Enabled = true; txtDiscountPrice1.Enabled = true;
txtExtend1.Readonly = false; txtExtend1.Readonly = false;
txtExtend1.Required = true; txtExtend1.Required = true;
txtExtend1.Enabled = true; txtExtend1.Enabled = true;
@ -271,7 +271,7 @@ namespace SCP.Views.锦州锦恒.SupplierData
string InvoiceNumber = MyWebString.GetString(this.txtInvoiceNumber.Text.Trim()); string InvoiceNumber = MyWebString.GetString(this.txtInvoiceNumber.Text.Trim());
string Memo = MyWebString.GetString(this.txtMemo.Text.Trim()); string Memo = MyWebString.GetString(this.txtMemo.Text.Trim());
string ExpressNumber = MyWebString.GetString(this.txtExpressNumber.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 BlancePrice1 = MyWebString.GetString(this.txtBlancePrice1.Text.Trim());//税额调整
string Extend1 = MyWebString.GetString(this.txtExtend1.Text.Trim());//实际发票税前金额 string Extend1 = MyWebString.GetString(this.txtExtend1.Text.Trim());//实际发票税前金额
string Extend2 = MyWebString.GetString(this.txtExtend2.Text.Trim());//实际发票税额 string Extend2 = MyWebString.GetString(this.txtExtend2.Text.Trim());//实际发票税额
@ -300,9 +300,9 @@ namespace SCP.Views.锦州锦恒.SupplierData
{ {
_invoice.Extend2 = 0; _invoice.Extend2 = 0;
} }
if (string.IsNullOrEmpty(ContractPrice1)) if (string.IsNullOrEmpty(DiscountPrice1))
{ {
_invoice.ContractPrice = 0; _invoice.DiscountPrice = 0;
} }
if (string.IsNullOrEmpty(BlancePrice1)) if (string.IsNullOrEmpty(BlancePrice1))
@ -328,9 +328,9 @@ namespace SCP.Views.锦州锦恒.SupplierData
decimal b1; decimal b1;
decimal d1; decimal d1;
decimal e1; 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)) if (decimal.TryParse(Extend1, out d1))
{ {
@ -439,7 +439,7 @@ namespace SCP.Views.锦州锦恒.SupplierData
string ExpressNumber = MyWebString.GetString(this.txtExpressNumber.Text.Trim());//快递单号 string ExpressNumber = MyWebString.GetString(this.txtExpressNumber.Text.Trim());//快递单号
string Extend1 = MyWebString.GetString(this.txtExtend1.Text.Trim());//折扣价格 string Extend1 = MyWebString.GetString(this.txtExtend1.Text.Trim());//折扣价格
string Extend2 = MyWebString.GetString(this.txtExtend2.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());//合同差额 string BlancePrice1 = MyWebString.GetString(this.txtBlancePrice1.Text.Trim());//合同差额
_Invoice.InvoiceNum = InvoiceNumber; _Invoice.InvoiceNum = InvoiceNumber;
@ -453,9 +453,9 @@ namespace SCP.Views.锦州锦恒.SupplierData
{ {
_Invoice.Extend2 = 0; _Invoice.Extend2 = 0;
} }
if (string.IsNullOrEmpty(ContractPrice1)) if (string.IsNullOrEmpty(DiscountPrice1))
{ {
_Invoice.ContractPrice = 0; _Invoice.DiscountPrice = 0;
} }
if (string.IsNullOrEmpty(BlancePrice1)) if (string.IsNullOrEmpty(BlancePrice1))
{ {
@ -482,9 +482,9 @@ namespace SCP.Views.锦州锦恒.SupplierData
{ {
_Invoice.Extend2 = 0; _Invoice.Extend2 = 0;
} }
if (decimal.TryParse(ContractPrice1, out c1)) if (decimal.TryParse(DiscountPrice1, out c1))
{ {
_Invoice.ContractPrice = c1; _Invoice.DiscountPrice = c1;
} }
else else
{ {

4
SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.designer.cs

@ -231,13 +231,13 @@ namespace SCP.Views.锦州锦恒.SupplierData
protected global::FineUI.NumberBox txtExtend2; protected global::FineUI.NumberBox txtExtend2;
/// <summary> /// <summary>
/// txtContractPrice1 控件。 /// txtDiscountPrice1 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.NumberBox txtContractPrice1; protected global::FineUI.NumberBox txtDiscountPrice1;
/// <summary> /// <summary>
/// txtBlancePrice1 控件。 /// txtBlancePrice1 控件。

4
SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx

@ -63,7 +63,7 @@
<Items> <Items>
<f:TextBox ID="txtExtend1" runat="server" Label="实际税前金额" Text="0" MaxLength="100" Enabled="false"/> <f:TextBox ID="txtExtend1" runat="server" Label="实际税前金额" Text="0" MaxLength="100" Enabled="false"/>
<f:TextBox ID="txtExtend2" runat="server" Label="实际税额" Text="0" MaxLength="100" Enabled="false"/> <f:TextBox ID="txtExtend2" runat="server" Label="实际税额" Text="0" MaxLength="100" Enabled="false"/>
<f:TextBox ID="txtContractPrice1" runat="server" Label="折扣金额" Text="0" MaxLength="100" Enabled="false"/> <f:TextBox ID="txtDiscountPrice1" runat="server" Label="折扣金额" Text="0" MaxLength="100" Enabled="false"/>
<f:TextBox ID="txtBlancePrice1" runat="server" Label="调整税额" Text="0" MaxLength="100" Enabled="false" Hidden="true"/> <f:TextBox ID="txtBlancePrice1" runat="server" Label="调整税额" Text="0" MaxLength="100" Enabled="false" Hidden="true"/>
<f:TextBox ID="txtRealTotal" runat="server" Label="开票金额" Text="" Readonly="true" Enabled="false" /> <f:TextBox ID="txtRealTotal" runat="server" Label="开票金额" Text="" Readonly="true" Enabled="false" />
</Items> </Items>
@ -92,7 +92,7 @@
</Items> </Items>
</f:GroupPanel> </f:GroupPanel>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" PageSize="1000" BoxFlex="1" CssClass="maingrid" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" PageSize="1000" BoxFlex="1" CssClass="maingrid"
runat="server" DataKeyNames="UID,InvcBillNum,Qty,CanQty,State,Price,ContractPrice,BlancePrice" IsDatabasePaging="True" AllowPaging="True" runat="server" DataKeyNames="UID,InvcBillNum,Qty,CanQty,State,Price,ContractPrice,BlancePrice,DiscountPrice" IsDatabasePaging="True" AllowPaging="True"
EnableRowSelectEvent="True" AutoScroll="True" SortField="PoBillNum" AllowCellEditing="true" ClicksToEdit="1"> EnableRowSelectEvent="True" AutoScroll="True" SortField="PoBillNum" AllowCellEditing="true" ClicksToEdit="1">
<Columns> <Columns>

4
SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx.cs

@ -67,7 +67,7 @@ namespace SCP.Views.锦州锦恒.WarehouseData
txtExpressNumber.Text = _Model.ExpressNum; txtExpressNumber.Text = _Model.ExpressNum;
txtAmount.Text = _Model.Amount.ToString(); txtAmount.Text = _Model.Amount.ToString();
txtTotal.Text = _Model.Total != null ? _Model.Total.ToString() : string.Empty; 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; txtExtend1.Text = _Model.Extend1 != null ? _Model.Extend1.ToString() : string.Empty;
txtExtend2.Text = _Model.Extend2 != null ? _Model.Extend2.ToString() : string.Empty; txtExtend2.Text = _Model.Extend2 != null ? _Model.Extend2.ToString() : string.Empty;
txtRealTotal.Text = _Model.RealTotal != null ? _Model.RealTotal.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"); var txtLineMemo = (System.Web.UI.WebControls.TextBox)row.FindControl("txtLineMemo");
_entity.ContractPrice = ConvertHelper.To<Decimal>(rowDataKeys[6]); _entity.ContractPrice = ConvertHelper.To<Decimal>(rowDataKeys[6]);
_entity.BlancePrice = ConvertHelper.To<Decimal>(rowDataKeys[7]); _entity.BlancePrice = ConvertHelper.To<Decimal>(rowDataKeys[7]);
_entity.DiscountPrice = ConvertHelper.To<Decimal>(rowDataKeys[8]);
_entity.Remark = txtLineMemo.Text; _entity.Remark = txtLineMemo.Text;
//把备注添加到TB_INVOICE、TB_INVOICE_DETAIL //把备注添加到TB_INVOICE、TB_INVOICE_DETAIL
_ls.Add(_entity); _ls.Add(_entity);
@ -266,6 +267,7 @@ namespace SCP.Views.锦州锦恒.WarehouseData
_entity.Price = ConvertHelper.To<Decimal>(rowDataKeys[5]); _entity.Price = ConvertHelper.To<Decimal>(rowDataKeys[5]);
_entity.ContractPrice = ConvertHelper.To<Decimal>(rowDataKeys[6]); _entity.ContractPrice = ConvertHelper.To<Decimal>(rowDataKeys[6]);
_entity.BlancePrice = ConvertHelper.To<Decimal>(rowDataKeys[7]); _entity.BlancePrice = ConvertHelper.To<Decimal>(rowDataKeys[7]);
_entity.DiscountPrice = ConvertHelper.To<Decimal>(rowDataKeys[8]);
var txtLineMemo = (System.Web.UI.WebControls.TextBox)row.FindControl("txtLineMemo"); var txtLineMemo = (System.Web.UI.WebControls.TextBox)row.FindControl("txtLineMemo");
_entity.Remark = txtLineMemo.Text; _entity.Remark = txtLineMemo.Text;

4
SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx.designer.cs

@ -186,13 +186,13 @@ namespace SCP.Views.锦州锦恒.WarehouseData
protected global::FineUI.TextBox txtExtend2; protected global::FineUI.TextBox txtExtend2;
/// <summary> /// <summary>
/// txtContractPrice1 控件。 /// txtDiscountPrice1 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.TextBox txtContractPrice1; protected global::FineUI.TextBox txtDiscountPrice1;
/// <summary> /// <summary>
/// txtBlancePrice1 控件。 /// txtBlancePrice1 控件。

2
SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx

@ -56,7 +56,7 @@
<Items> <Items>
<f:NumberBox ID="txtExtend1" runat="server" Label="实际税前金额" Enabled="false" /> <f:NumberBox ID="txtExtend1" runat="server" Label="实际税前金额" Enabled="false" />
<f:NumberBox ID="txtExtend2" runat="server" Label="实际税额" Enabled="false" /> <f:NumberBox ID="txtExtend2" runat="server" Label="实际税额" Enabled="false" />
<f:NumberBox ID="txtContractPrice1" runat="server" Label="折扣金额" Enabled="false" /> <f:NumberBox ID="txtDiscountPrice1" runat="server" Label="折扣金额" Enabled="false" />
<f:TextBox ID="txtRealTotal" runat="server" Label="开票金额" Text="" Readonly="true" Enabled="false" /> <f:TextBox ID="txtRealTotal" runat="server" Label="开票金额" Text="" Readonly="true" Enabled="false" />
</Items> </Items>

4
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; txtExtend1.Text = _Model.Extend1 != null ? _Model.Extend1.ToString() : string.Empty;
txtExtend2.Text = _Model.Extend2 != null ? _Model.Extend2.ToString() : string.Empty; txtExtend2.Text = _Model.Extend2 != null ? _Model.Extend2.ToString() : string.Empty;
txtContractPrice1.Text = _Model.ContractPrice != null ? _Model.ContractPrice.ToString() : string.Empty; txtDiscountPrice1.Text = _Model.DiscountPrice != null ? _Model.DiscountPrice.ToString() : string.Empty;
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; txtBlancePrice1.Text = _Model.BlancePrice != null ? _Model.BlancePrice.ToString() : string.Empty;
txtAmount.Text = _Model.Amount.ToString(); txtAmount.Text = _Model.Amount.ToString();
txtTotal.Text = _Model.Total != null ? _Model.Total.ToString() : string.Empty; txtTotal.Text = _Model.Total != null ? _Model.Total.ToString() : string.Empty;

4
SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx.designer.cs

@ -168,13 +168,13 @@ namespace SCP.Views.锦州锦恒.WarehouseData
protected global::FineUI.NumberBox txtExtend2; protected global::FineUI.NumberBox txtExtend2;
/// <summary> /// <summary>
/// txtContractPrice1 控件。 /// txtDiscountPrice1 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.NumberBox txtContractPrice1; protected global::FineUI.NumberBox txtDiscountPrice1;
/// <summary> /// <summary>
/// txtRealTotal 控件。 /// txtRealTotal 控件。

10
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_date = _invoice.UpdateTime == null ? _invoice.CreateTime.Value.AddDays(1) : _invoice.UpdateTime.Value;
qadData.xxscm_inv_totamt = _invoice.Amount.Value; qadData.xxscm_inv_totamt = _invoice.Amount.Value;
qadData.xxscm_inv_tottax = _invoice.Total.Value; qadData.xxscm_inv_tottax = _invoice.Total.Value;
qadData.xxscm_inv_totdiscount = _invoice.DiscountPrice == null ? 0 : _invoice.DiscountPrice.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_tottaxvar = _invoice.BlancePrice == null ? 0 : _invoice.BlancePrice.Value;//调整税额
qadData.xxscm_inv_totclaim= _invoice.ContractPrice == null ? 0 : _invoice.ContractPrice.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_extend1 = _invoice.Extend1 == null ? 0 : _invoice.Extend1.Value;//纸质发票税前金额
qadData.xxscm_inv_extend2 = _invoice.Extend2 == null ? 0 : _invoice.Extend2.Value; qadData.xxscm_inv_extend2 = _invoice.Extend2 == null ? 0 : _invoice.Extend2.Value;//纸质发票税额
qadDataList.Add(qadData); qadDataList.Add(qadData);
p.State = (int)BillState.Finish; p.State = (int)BillState.Finish;
p.PutTime = DateTime.Now; p.PutTime = DateTime.Now;

Loading…
Cancel
Save