Browse Source

要货预测修改/锦州发票明细加载优化

master
lvzb 4 years ago
parent
commit
2cc02f4ee1
  1. 4
      Controller/SCP_INVOICE_CONTROLLER.cs
  2. 5
      SCP/Views/PlanData/SCP_PO_PLAN.aspx
  3. 1
      SCP/Views/PlanData/SCP_PO_PLAN.aspx.cs
  4. 15
      SCP/Views/PlanData/SCP_PO_PLAN.aspx.designer.cs

4
Controller/SCP_INVOICE_CONTROLLER.cs

@ -628,7 +628,7 @@ namespace CK.SCP.Controller
} }
if (!string.IsNullOrEmpty(p_entity.InvcBillNum)) if (!string.IsNullOrEmpty(p_entity.InvcBillNum))
{ {
q = q.Where(p => p.InvcBillNum.Contains(p_entity.InvcBillNum)); q = q.Where(p => p.InvcBillNum==(p_entity.InvcBillNum));
} }
if (!string.IsNullOrEmpty(p_entity.PoBillNum)) if (!string.IsNullOrEmpty(p_entity.PoBillNum))
{ {
@ -714,7 +714,7 @@ namespace CK.SCP.Controller
{ {
q = q.Where(p => p.CreateUser.Contains(p_entity.CreateUser)); q = q.Where(p => p.CreateUser.Contains(p_entity.CreateUser));
} }
q = q.Where(p => p.IsRed == p_entity.IsRed); // q = q.Where(p => p.IsRed == p_entity.IsRed);
_ret.State = ReturnStatus.Succeed; _ret.State = ReturnStatus.Succeed;
_ret.Result = q; _ret.Result = q;

5
SCP/Views/PlanData/SCP_PO_PLAN.aspx

@ -20,8 +20,9 @@
</f:Button> </f:Button>
<f:Button ID="btnExecl" runat="server" Text="横向导出" Icon="PageExcel" OnClick="btnExecl_Click" > <f:Button ID="btnExecl" runat="server" Text="横向导出" Icon="PageExcel" OnClick="btnExecl_Click" >
</f:Button> </f:Button>
<f:DropDownList ID="ddl_Vender" runat="server" Label="供应商" EnableEdit="true" ></f:DropDownList> <f:DropDownList ID="ddl_Vender" runat="server" Label="供应商" EnableEdit="true" LabelWidth="50px" ></f:DropDownList>
<f:DatePicker runat="server" Required ="true" DateFormatString="yyyy-MM-dd" Label="交货日期" EmptyText="请选择日期" ID="DP_StartDate" /> <f:DatePicker runat="server" Required ="true" DateFormatString="yyyy-MM-dd" Label="交货日期" EmptyText="请选择日期" ID="DP_StartDate" LabelWidth="60px" />
<f:TextBox runat = "server" Label = "版本号" EmptyText = "请输入版本号" ID = "TXT_VersionNo" LabelWidth="50px" />
<f:Button ID="btnSearch" runat="server" OnClick="btnSearch_Click" Text="快速查找" Icon="Find"> <f:Button ID="btnSearch" runat="server" OnClick="btnSearch_Click" Text="快速查找" Icon="Find">
</f:Button> </f:Button>
<f:Button ID="btnMake" runat="server" OnClick="btnMake_Click" Text="生成看板" Icon="Add"> <f:Button ID="btnMake" runat="server" OnClick="btnMake_Click" Text="生成看板" Icon="Add">

1
SCP/Views/PlanData/SCP_PO_PLAN.aspx.cs

@ -48,6 +48,7 @@ namespace SCP.Views.PlanData
V_TB_PO_PLAN _entity = new V_TB_PO_PLAN(); V_TB_PO_PLAN _entity = new V_TB_PO_PLAN();
_entity.PoBillNum= ddl_Vender.SelectedValue; _entity.PoBillNum= ddl_Vender.SelectedValue;
_entity.EndTime = DP_StartDate.SelectedDate; _entity.EndTime = DP_StartDate.SelectedDate;
_entity.Version = TXT_VersionNo.Text;
if (CurrentUser.RoleList.Contains("供应商")) if (CurrentUser.RoleList.Contains("供应商"))
{ {
if (CurrentUser.RoleList.Contains("计划人员") || CurrentUser.RoleList.Contains("采购人员") || CurrentUser.Name=="admin") if (CurrentUser.RoleList.Contains("计划人员") || CurrentUser.RoleList.Contains("采购人员") || CurrentUser.Name=="admin")

15
SCP/Views/PlanData/SCP_PO_PLAN.aspx.designer.cs

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace SCP.Views.PlanData { namespace SCP.Views.PlanData
{
public partial class SCP_PO_PLAN { public partial class SCP_PO_PLAN
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -75,6 +77,15 @@ namespace SCP.Views.PlanData {
/// </remarks> /// </remarks>
protected global::FineUI.DatePicker DP_StartDate; protected global::FineUI.DatePicker DP_StartDate;
/// <summary>
/// TXT_VersionNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_VersionNo;
/// <summary> /// <summary>
/// btnSearch 控件。 /// btnSearch 控件。
/// </summary> /// </summary>

Loading…
Cancel
Save