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
lvzb 4 years ago
parent
9de8676f6c 13bd049659
commit
ea4488b797
5 changed files with 112 additions and 152 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. 202
      SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx
  2. 18
      SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs
  3. 38
      SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs
  4. 2
      SCP/Views/重庆北汽模塑/PlanData/SCP_ASK.aspx
  5. 4
      SCP/default.aspx

202
SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx
View File

@ -4,99 +4,93 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager runat="server" AutoSizePanelID="Panel1" />
<f:PageManager runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Title="" AutoScroll="True">
<Items>
<f:Form runat="server">
<Toolbars>
<f:Toolbar ID="Toolbar1" runat="server">
<Items>
<f:Form runat="server">
<Toolbars>
<f:Toolbar ID="Toolbar1" runat="server">
<Items>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:Button ID="btnRefresh" runat="server" Text="刷新" EnablePostBack="True" Icon="Reload" OnClientClick="location.reload();">
</f:Button>
<f:Button ID="btnOutput" runat="server" Text="导出" OnClick="btnOutput_Click" Icon="PageExcel">
</f:Button>
<f:TextBox ID="txt_Planner" runat="server" Hidden="true" Text="计划员姓名"></f:TextBox>
<f:Button ID="btn_planner" runat="server" Text="查询计划员" Hidden="true" Icon="Find" OnClick="btn_planner_Click" ></f:Button>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:Button ID="btnRefresh" runat="server" Text="刷新" EnablePostBack="True" Icon="Reload" OnClientClick="location.reload();">
</f:Button>
<f:Button ID="btnOutput" runat="server" Text="导出" OnClick="btnOutput_Click" Icon="PageExcel">
</f:Button>
<f:TextBox ID="txt_Planner" runat="server" Hidden="true" Text="计划员姓名"></f:TextBox>
<f:Button ID="btn_planner" runat="server" Text="查询计划员" Hidden="true" Icon="Find" OnClick="btn_planner_Click"></f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
<f:Form BodyPadding="10px" Height="130px" ID="extForm1"
runat="server" Title="" ShowHeader="false" >
<Rows>
<f:FormRow ColumnWidths="33% 33% 33%" ID="FormRow_1" runat="server">
<Items>
<f:DatePicker runat="server" Label="计划开始日期" ID="TextBillTime1"></f:DatePicker>
<f:DatePicker runat="server" Label="至" ID="TextBillTime2"></f:DatePicker>
<f:DatePicker runat="server" Label="计划到货日期" ID="dp_EndTimeStart"></f:DatePicker>
<f:DatePicker runat="server" Label="至" ID="dp_EndTimeEnd"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="33% 33% 33%" ID="FormRow_2" runat="server">
<Items>
<f:TextBox runat="server" Label="订单号" ID="TextBillNo">
</f:TextBox>
<f:TextBox runat="server" Label="要货单据号" ID="TextBoxAskNo">
</f:TextBox>
<f:TextBox runat="server" Label="零件号" ID="TextPartCode">
</f:TextBox>
<f:TextBox runat="server" Label="零件名称" ID="TextPartName">
</f:TextBox>
<f:TextBox runat="server" Label="子网站" ID="TextSubSite" Hidden="true">
</f:TextBox>
<f:TextBox runat="server" Label="子网站" ID="TextExtend1" Hidden="true">
</f:TextBox>
<f:TextBox runat="server" Label="子网站" ID="TextExtend2" Hidden="true">
</f:TextBox>
<f:TextBox runat="server" Label="子网站" ID="TextExtend3" Hidden="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="25% 25% 25% 25%" ID="FormRow_3" runat="server">
<Items>
<f:TextBox runat="server" Label="供应商编码" ID="TextVendId">
</f:TextBox>
<f:Button runat="server" ID="btnQuery" Text="查询" OnClick="btnSearch_Click"></f:Button>
<f:Form BodyPadding="10px" Height="130px" ID="extForm1"
runat="server" Title="" ShowHeader="false">
<Rows>
<f:FormRow ColumnWidths="33% 33% 33%" ID="FormRow_1" runat="server">
<Items>
<f:DatePicker runat="server" Label="计划开始日期" ID="TextBillTime1"></f:DatePicker>
<f:DatePicker runat="server" Label="至" ID="TextBillTime2"></f:DatePicker>
<f:DatePicker runat="server" Label="计划到货日期" ID="dp_EndTimeStart"></f:DatePicker>
<f:DatePicker runat="server" Label="至" ID="dp_EndTimeEnd"></f:DatePicker>
<%-- <f:DropDownList ID="ddl_DayState" runat="server" Label="发货预警">
<f:ListItem Text="全部" Value="-1" Selected="true"/>
<f:ListItem Text="已超期" Value="0" />
<f:ListItem Text="1天" Value="1" />
<f:ListItem Text="2天" Value="2" />
<f:ListItem Text="3天" Value="3" />
<f:ListItem Text="4天" Value="4" />
<f:ListItem Text="5天" Value="5" />
<f:ListItem Text="6天" Value="6" />
<f:ListItem Text="7天" Value="7" />
<f:ListItem Text="8天" Value="8" />
<f:ListItem Text="9天" Value="9" />
<f:ListItem Text="10天" Value="10" />
</f:DropDownList>--%>
<f:RadioButtonList ID="rb_SendState" Label="发货状态" runat="server">
<f:RadioItem Text="全部" Value="0" />
<f:RadioItem Text="未发货" Value="1" Selected="true"/>
<f:RadioItem Text="已发货" Value="2" />
</f:RadioButtonList>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Grid ID="GridINCOM" ShowBorder="true" ShowHeader="true" PageSize="100" BoxFlex="1" CssClass="maingrid"
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="33% 33% 33%" ID="FormRow_2" runat="server">
<Items>
<f:TextBox runat="server" Label="订单号" ID="TextBillNo">
</f:TextBox>
<f:TextBox runat="server" Label="要货单据号" ID="TextBoxAskNo">
</f:TextBox>
<f:TextBox runat="server" Label="零件号" ID="TextPartCode">
</f:TextBox>
<f:TextBox runat="server" Label="零件名称" ID="TextPartName">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="33% 33% 33%" ID="FormRow_3" runat="server">
<Items>
<f:TextBox runat="server" Label="供应商编码" ID="TextVendId">
</f:TextBox>
<f:DropDownList ID="ddl_DayState" runat="server" Label="发货预警">
<f:ListItem Text="全部" Value="-1" Selected="true" />
<f:ListItem Text="已超期" Value="0" />
<f:ListItem Text="1天" Value="1" />
<f:ListItem Text="2天" Value="2" />
<f:ListItem Text="3天" Value="3" />
<f:ListItem Text="4天" Value="4" />
<f:ListItem Text="5天" Value="5" />
<f:ListItem Text="6天" Value="6" />
<f:ListItem Text="7天" Value="7" />
<f:ListItem Text="8天" Value="8" />
<f:ListItem Text="9天" Value="9" />
<f:ListItem Text="10天" Value="10" />
</f:DropDownList>
<f:RadioButtonList ID="rb_SendState" Label="发货状态" runat="server">
<f:RadioItem Text="全部" Value="0" />
<f:RadioItem Text="未发货" Value="1" Selected="true" />
<f:RadioItem Text="已发货" Value="2" />
</f:RadioButtonList>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="33% 33% 33%" ID="FormRow1" runat="server">
<Items>
<f:Button runat="server" ID="btnQuery" Text="查询" OnClick="btnSearch_Click"></f:Button>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Grid ID="GridINCOM" ShowBorder="true" ShowHeader="true" PageSize="100" BoxFlex="1" CssClass="maingrid"
runat="server" DataKeyNames="PoBillNum,AskBillNum,PartCode,PartDesc1,PoLine,AskQty,Qty,Number,ValidityDays,SubSite,Extend1,Extend2,Extend3"
IsDatabasePaging="true" AllowPaging="true" SortField="BeginTime" SortDirection="DESC" OnPageIndexChange="Grid_V_TB_INCOMPLETE_ASK_PageIndexChange"
AutoScroll="True" EnableRowDoubleClickEvent="True" >
<PageItems>
IsDatabasePaging="true" AllowPaging="true" SortField="BeginTime" SortDirection="DESC" OnPageIndexChange="Grid_V_TB_INCOMPLETE_ASK_PageIndexChange"
AutoScroll="True" EnableRowDoubleClickEvent="True">
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
@ -106,39 +100,39 @@
<f:ListItem Text="100" Value="100" />
<f:ListItem Text="200" Value="200" />
</f:DropDownList>
</PageItems>
<Columns>
</PageItems>
<Columns>
<f:BoundField runat="server" HeaderText="订单号" ColumnID="" DataField="PoBillNum" />
<f:BoundField runat="server" HeaderText="订单号" ColumnID="" DataField="VendId" />
<f:BoundField runat="server" HeaderText="要货单号" ColumnID="" DataField="AskBillNum" />
<f:BoundField runat="server" HeaderText="订单号" ColumnID="" DataField="VendId" />
<f:BoundField runat="server" HeaderText="要货单号" ColumnID="" DataField="AskBillNum" />
<f:BoundField runat="server" HeaderText="零件编号" ColumnID="" DataField="PartCode" />
<f:BoundField runat="server" HeaderText="零件名称" ColumnID="" DataField="PartDesc1" />
<f:BoundField runat="server" HeaderText="订单行号" ColumnID="" DataField="PoLine" />
<f:BoundField runat="server" HeaderText="订单行号" ColumnID="" DataField="PoLine" />
<f:BoundField runat="server" HeaderText="要货数量" ColumnID="" DataField="AskQty" />
<f:BoundField runat="server" HeaderText="发货数量" ColumnID="" DataField="Qty" />
<%-- <f:BoundField runat="server" HeaderText="减产数量" ColumnID="" DataField="ReduceQty" />--%>
<%-- <f:BoundField runat="server" HeaderText="减产数量" ColumnID="" DataField="ReduceQty" />--%>
<f:BoundField runat="server" HeaderText="未发货数量" ColumnID="" DataField="Number" />
<f:BoundField runat="server" HeaderText="计划员" ColumnID="" DataField="Buyer" />
<f:BoundField runat="server" HeaderText="计划员" ColumnID="" DataField="Buyer" />
<f:BoundField Width = "100px" DataField = "BeginTime" DataFormatString = "{0:yyyy-MM-dd}" HeaderText = "订货日期" />
<f:BoundField Width = "100px" DataField = "EndTime" DataFormatString = "{0:yyyy-MM-dd}" HeaderText = "到货日期" />
<f:BoundField Width = "100px" DataField = "ShipTime" DataFormatString = "{0:yyyy-MM-dd}" HeaderText = "最后发货日期" />
<f:BoundField Width="100px" DataField="BeginTime" DataFormatString="{0:yyyy-MM-dd}" HeaderText="订货日期" />
<f:BoundField Width="100px" DataField="EndTime" DataFormatString="{0:yyyy-MM-dd}" HeaderText="到货日期" />
<f:BoundField Width="100px" DataField="ShipTime" DataFormatString="{0:yyyy-MM-dd}" HeaderText="最后发货日期" />
<f:BoundField Width="100px" DataField="ValidityDays" HeaderText="距到货日期（天）" />
<f:BoundField Width="100px" DataField="SubSite" HeaderText="子网站" />
<f:BoundField Width="100px" DataField="Extend1" HeaderText="子网站" Hidden="true" />
<f:BoundField Width="100px" DataField="Extend2" HeaderText="子网站" Hidden="true" />
<f:BoundField Width="100px" DataField="Extend3" HeaderText="子网站" Hidden="true" />
<f:BoundField Width = "100px" DataField = "ValidityDays" HeaderText = "距到货日期（天）" />
<f:BoundField Width = "100px" DataField = "SubSite" HeaderText = "子网站" />
<f:BoundField Width = "100px" DataField = "Extend1" HeaderText = "子网站" Hidden="true"/>
<f:BoundField Width = "100px" DataField = "Extend2" HeaderText = "子网站" Hidden="true"/>
<f:BoundField Width = "100px" DataField = "Extend3" HeaderText = "子网站" Hidden="true" />
</Columns>
</f:Grid>
</Items>
</f:Panel>
</Items>
</f:Panel>
</form>
</body>
</html>

18
SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs
View File

@ -90,22 +90,6 @@ namespace SCP.PlanData
{
_entity.PartDesc1 = TextPartName.Text;
}
if (TextSubSite.Text != null)
{
_entity.SubSite = TextSubSite.Text;
}
if (TextExtend1.Text != null)
{
_entity.Extend1 = TextExtend1.Text;
}
if (TextExtend2.Text != null)
{
_entity.Extend2 = TextExtend2.Text;
}
if (TextExtend3.Text != null)
{
_entity.Extend3 = TextExtend3.Text;
}
if (!string.IsNullOrEmpty(CurrentUser.Name))
{
if (CurrentUser.Name != "admin")
@ -137,7 +121,7 @@ namespace SCP.PlanData
}
}
_entity.SendState = int.Parse(rb_SendState.SelectedValue);
//_entity.DayState = int.Parse(ddl_DayState.SelectedValue);
_entity.DayState = int.Parse(ddl_DayState.SelectedValue);
_entity.IsDeleted = false;
_entity.UserInAddress = CurrentUser.FactoryList;
_entity.UserInVendIds = CurrentUser.VenderList;

38
SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs
View File

@ -186,58 +186,49 @@ namespace SCP.PlanData
protected global::FineUI.TextBox TextPartName;
/// <summary>
/// TextSubSite 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TextSubSite;
/// <summary>
/// TextExtend1 控件。
/// FormRow_3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TextExtend1;
protected global::FineUI.FormRow FormRow_3;
/// <summary>
/// TextExtend2 控件。
/// TextVendId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TextExtend2;
protected global::FineUI.TextBox TextVendId;
/// <summary>
/// TextExtend3 控件。
/// ddl_DayState 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TextExtend3;
protected global::FineUI.DropDownList ddl_DayState;
/// <summary>
/// FormRow_3 控件。
/// rb_SendState 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.FormRow FormRow_3;
protected global::FineUI.RadioButtonList rb_SendState;
/// <summary>
/// TextVendId 控件。
/// FormRow1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TextVendId;
protected global::FineUI.FormRow FormRow1;
/// <summary>
/// btnQuery 控件。
@ -248,15 +239,6 @@ namespace SCP.PlanData
/// </remarks>
protected global::FineUI.Button btnQuery;
/// <summary>
/// rb_SendState 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.RadioButtonList rb_SendState;
/// <summary>
/// GridINCOM 控件。
/// </summary>

2
SCP/Views/重庆北汽模塑/PlanData/SCP_ASK.aspx
View File

@ -30,7 +30,7 @@
<f:Button ID="btnDetail" runat="server" Text="明细" Icon="Find" OnClick="btnDetail_Click">
</f:Button>
<f:ToolbarSeparator runat="server" />
<f:Button ID="btnCreateAsk" runat="server" Text="创建要货看板" Icon="Add" OnClick="btnCreateAsk_Click">
<f:Button ID="btnCreateAsk" runat="server" Text="创建要货看板" Icon="Add" OnClick="btnCreateAsk_Click" Hidden="true">
</f:Button>
<%-- <f:ToolbarSeparator runat="server" />

4
SCP/default.aspx
View File

@ -111,10 +111,10 @@
for (var i = 0; obj.options.length; i++)
{
if ('JZ1' == obj.options[i].value) {
if ('CQBMPT' == obj.options[i].value) {
obj.options[i].selected = true;
_factory = document.getElementById(_factoryValue);
_factory.value = 'JZ1';
_factory.value = 'CQBMPT';
}
}
}

Write Preview
Loading…
Cancel
Save