SCP
/
SCPFWBTL
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

master
学 赵 4 years ago
parent
f20dd7900b e9afed60bd
commit
ab1344f193
8 changed files with 10 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Models/ScpEntity/V_TB_INVOICE.cs
  2. 1
      Models/ScpEntity/V_TB_RECEIVE_DETAIL.cs
  3. 2
      Models/ScpEntity/V_TB_RECEIVE_LIST.cs
  4. 4
      SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx
  5. 9
      SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.designer.cs
  6. 6
      SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.cs
  7. 2
      SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE.aspx
  8. 2
      SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM.aspx

2
Models/ScpEntity/V_TB_INVOICE.cs
View File

@ -79,8 +79,6 @@ namespace CK.SCP.Models.ScpEntity
public string SubSite { get; set; }
[NotMapped]
public decimal? RealTotal { set; get; }
public decimal? Extend1 { get; set; }

1
Models/ScpEntity/V_TB_RECEIVE_DETAIL.cs
View File

@ -60,6 +60,7 @@ namespace CK.SCP.Models.ScpEntity
[StringLength(50)]
public string LocUnit { get; set; }
public string BillType_DESC { get; set; }
public int BillType { get; set; }
public string ErpRecvBillNum { get; set; }
public decimal? PurCost { set; get; }

2
Models/ScpEntity/V_TB_RECEIVE_LIST.cs
View File

@ -51,6 +51,8 @@ namespace CK.SCP.Models.ScpEntity
[StringLength(50)]
public string LocUnit { get; set; }
public string BillType_DESC { get; set; }
public int BillType { get; set; }
public string State_DESC { get; set; }
public string ProjectId { get; set; }

4
SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx
View File

@ -124,7 +124,7 @@
<f:Grid ID="Grid_V_TB_RECEIVE_LIST" ShowBorder="true" ShowHeader="true" PageSize="100" BoxFlex="1" CssClass="maingrid"
runat="server" DataKeyNames="UID,ProjectId,RecvBillNum,PartCode,PoLine,Qty,Price" IsDatabasePaging="true" AllowPaging="True" SortField="BillType_DESC"
runat="server" DataKeyNames="UID,ProjectId,RecvBillNum,PartCode,PoLine,Qty,Price" IsDatabasePaging="true" AllowPaging="True" SortField="BillType;ShipTime""
AutoScroll="True" OnPageIndexChange="Grid_V_TB_RECEIVE_LIST_PageIndexChange" EnableCheckBoxSelect = "true" OnRowDataBound="Grid_V_TB_RECEIVE_LIST_RowDataBound" >
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
@ -174,7 +174,7 @@
<f:BoundField runat="server" HeaderText="Erp收货单税率" ColumnID="Tax" DataField="Tax" width="50" Hidden="true"/>
<f:BoundField runat="server" HeaderText="要货日期" ColumnID="BeginTime" DataField="BeginTime" Hidden="true"/>
<f:BoundField runat="server" HeaderText="收货时间" ColumnID="CreateTime" DataField="CreateTime" DataFormatString="{0:yyyy-MM-dd}" />
<f:BoundField runat="server" HeaderText="收货时间" ColumnID="CreateTime" DataField="ShipTime" DataFormatString="{0:yyyy-MM-dd}" />
<f:BoundField runat="server" HeaderText="备注" ColumnID="Remark" DataField="Remark" />
</Columns>
</f:Grid>

9
SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.designer.cs
View File

@ -338,15 +338,6 @@ namespace SCP.SupplierData
/// </remarks>
protected global::FineUI.Button btnTax;
/// <summary>
/// Grid_V_TB_RECEIVE_LIST 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.Grid Grid_V_TB_RECEIVE_LIST;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>

6
SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.cs
View File

@ -29,7 +29,7 @@ namespace SCP.Views.锦州锦恒.SupplierData
TranslatorAgents(FormRow_3);
TranslatorAgents(FormRow_4);
BindData();
GetInvoice();
//GetInvoice();
SetRoleRule();
}
@ -536,7 +536,7 @@ namespace SCP.Views.锦州锦恒.SupplierData
Alert.Show(p_msg);
BindData();
GetInvoice();
// GetInvoice();
}
else
{
@ -581,7 +581,7 @@ namespace SCP.Views.锦州锦恒.SupplierData
if (ret.State == ReturnStatus.Succeed)
{
BindData();
GetInvoice();
// GetInvoice();
}
}

2
SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE.aspx
View File

@ -103,7 +103,7 @@
<f:BoundField runat="server" HeaderText="税后金额" ColumnID="" DataField="Total" 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="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="RealTotal" DataFormatString = "{0:F}"/>
<f:BoundField runat="server" HeaderText="备注" ColumnID="" DataField="Remark" />

2
SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_CONFIRM.aspx
View File

@ -104,7 +104,7 @@
<f:BoundField runat="server" HeaderText="税后金额" ColumnID="" DataField="Total" 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="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="RealTotal" DataFormatString = "{0:F}"/>
<f:BoundField runat="server" HeaderText="备注" ColumnID="" DataField="Remark" />

Write Preview
Loading…
Cancel
Save