Browse Source

中英文翻译 衍生问题 收货地点

master
qian 11 months ago
parent
commit
e16727a05d
  1. 5
      北京北汽/SCP/SCP.csproj
  2. 189
      北京北汽/SCP/Views/PlanData/SCP_ASK.aspx
  3. 7
      北京北汽/SCP/Views/PlanData/SCP_ASK.aspx.cs

5
北京北汽/SCP/SCP.csproj

@ -50,6 +50,7 @@
<ItemGroup>
<Reference Include="ChangKeTec.Utils">
<HintPath>C:\Users\asus\Desktop\ChangKeTec.Utils.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
@ -70,6 +71,10 @@
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="Interop.grsvr6Lib">
<HintPath>..\..\..\..\Interop.grsvr6Lib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
</Reference>

189
北京北汽/SCP/Views/PlanData/SCP_ASK.aspx

@ -4,15 +4,15 @@
<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:Panel ID="Panel1" runat="server" Title="" Layout="VBox" BoxConfigAlign="Stretch" BoxConfigPosition="Start" >
<f:Panel ID="Panel1" runat="server" Title="" Layout="VBox" BoxConfigAlign="Stretch" BoxConfigPosition="Start">
<Items>
<f:Form runat="server">
<Toolbars>
@ -20,21 +20,21 @@
<Items>
<f:ToolbarSeparator runat="server" />
<f:Button ID="button3" runat="server" EnablePostBack="false" Text="刷新" Icon="Add" OnClientClick="location.reload();">
</f:Button>
</f:Button>
<f:ToolbarSeparator runat="server" />
<f:Button ID="btnCopy" runat="server" Text="复制看板" Icon="Find" OnClick="btnCopy_Click" OnClientClick="if(!confirm('是否要复制订单,只能复制合同看板不能复制离散订单?'))return false;">
<f:Button ID="btnCopy" runat="server" Text="复制看板" Icon="Find" OnClick="btnCopy_Click" OnClientClick="if(!confirm('是否要复制订单,只能复制合同看板不能复制离散订单?'))return false;">
</f:Button>
<f:Button ID="btnOutput" runat="server" Text="导出" Icon="PageExcel" OnClick="btnOutput_Click" >
<f:Button ID="btnOutput" runat="server" Text="导出" Icon="PageExcel" OnClick="btnOutput_Click">
</f:Button>
<f:Button ID="btnDetail" runat="server" Text="明细" Icon="Find" OnClick="btnDetail_Click">
</f:Button>
<f:ToolbarSeparator runat="server" />
<f:Button ID="BtnPublish" runat="server" EnablePostBack="True" Text="采购经理审核" Hidden="true" Icon="Add" OnClick="BtnPublish_Click" OnClientClick="if(!confirm('是否要批量审核?'))return false;">
<f:ToolbarSeparator runat="server" />
<f:Button ID="BtnPublish" runat="server" EnablePostBack="True" Text="采购经理审核" Hidden="true" Icon="Add" OnClick="BtnPublish_Click" OnClientClick="if(!confirm('是否要批量审核?'))return false;">
</f:Button>
<f:Button ID="BtnAduit" runat="server" EnablePostBack="True" Text="打印审核单" Icon="Printer" OnClick="BtnAduit_Click" OnClientClick="if(!confirm('是否要批量审核?'))return false;">
<f:Button ID="BtnAduit" runat="server" EnablePostBack="True" Text="打印审核单" Icon="Printer" OnClick="BtnAduit_Click" OnClientClick="if(!confirm('是否要批量审核?'))return false;">
</f:Button>
<f:Button ID="BtnAduitExcel" runat="server" EnablePostBack="True" Text="打印审核Execl" Icon="Printer" OnClick="BtnAduitExcel_Click" OnClientClick="if(!confirm('是否要批量审核?'))return false;">
<f:Button ID="BtnAduitExcel" runat="server" EnablePostBack="True" Text="打印审核Execl" Icon="Printer" OnClick="BtnAduitExcel_Click" OnClientClick="if(!confirm('是否要批量审核?'))return false;">
</f:Button>
@ -42,92 +42,87 @@
</f:Button>
<f:Button ID="btnCreateAsk" runat="server" Text="创建要货看板" Icon="Add" OnClick="btnCreateAsk_Click">
</f:Button>
<%-- <f:ToolbarSeparator runat="server" />
<%-- <f:ToolbarSeparator runat="server" />
<%--<f:Button ID="btnEdit" runat="server" Text="修改" Icon="PageExcel" >
</f:Button>--%>
<f:Button ID="btnShow" runat="server" Icon="Find" Text="查询面板" OnClick="btnShow_Click">
</f:Button>
<f:ToolbarSeparator runat="server" />
<f:DropDownList runat="server" ID="DDL_Site" Label="送货地址" Hidden="true">
<f:ListItem Text="重庆市渝北区石香路5号(重庆厂内)" Value="重庆市渝北区石香路5号(重庆厂内)" />
<f:ListItem Text="合肥市包河区卧云路68号宝供物流再包装基地" Value="合肥市包河区卧云路68号宝供物流再包装基地"/>
<f:ListItem Text="重庆市渝北区石香路(重庆外库)" Value="重庆市渝北区石香路(重庆外库)" />
<f:ListItem Text="成都市龙泉驿区经开区车城大道668号" Value="成都市龙泉驿区经开区车城大道668号" />
</f:DropDownList>
<f:FileUpload runat="server" ID="FileUp" EmptyText="请选择要货单据" Required="true" Width="200" ButtonIcon="Add" ShowRedStar="true" > </f:FileUpload>
<f:Button ID="btnInput" runat="server" Text="导入" Icon="PageExcel" OnClick="btnInput_Click" >
</f:Button>
<f:Button ID="Button6" runat="server" Text="全部" Icon="Reload" OnClick="Button6_Click" >
</f:Button>
<f:Button ID="Button1" runat="server" Text="新建" Icon="Reload" OnClick="Button1_Click" >
</f:Button>
<f:Button ID="Button2" runat="server" Text="发布" Icon="Reload" OnClick="Button2_Click" >
</f:Button>
<f:Button ID="Button4" runat="server" Text="已确认" Icon="Reload" OnClick="Button4_Click" >
</f:Button>
<f:Button ID="Button5" runat="server" Text="已发货" Icon="Reload" OnClick="Button5_Click" >
</f:Button>
<f:Button ID="Button7" runat="server" Text="已到货" Icon="Reload" OnClick="Button7_Click" Hidden="true">
</f:Button>
<f:TextBox ID="txt_Planner" runat="server" ></f:TextBox>
<f:Button ID="btn_planner" runat="server" Text="查询采购人员" Icon="Find" OnClick="btn_planner_Click" >
</f:Button>
<f:Button ID="btnShow" runat="server" Icon="Find" Text="查询面板" OnClick="btnShow_Click">
</f:Button>
<f:ToolbarSeparator runat="server" />
<f:DropDownList runat="server" ID="DDL_Site" Label="送货地址" Hidden="true" DataTextField="Address" DataValueField="Address" />
<f:FileUpload runat="server" ID="FileUp" EmptyText="请选择要货单据" Required="true" Width="200" ButtonIcon="Add" ShowRedStar="true"></f:FileUpload>
<f:Button ID="btnInput" runat="server" Text="导入" Icon="PageExcel" OnClick="btnInput_Click">
</f:Button>
<f:Button ID="Button6" runat="server" Text="全部" Icon="Reload" OnClick="Button6_Click">
</f:Button>
<f:Button ID="Button1" runat="server" Text="新建" Icon="Reload" OnClick="Button1_Click">
</f:Button>
<f:Button ID="Button2" runat="server" Text="发布" Icon="Reload" OnClick="Button2_Click">
</f:Button>
<f:Button ID="Button4" runat="server" Text="已确认" Icon="Reload" OnClick="Button4_Click">
</f:Button>
<f:Button ID="Button5" runat="server" Text="已发货" Icon="Reload" OnClick="Button5_Click">
</f:Button>
<f:Button ID="Button7" runat="server" Text="已到货" Icon="Reload" OnClick="Button7_Click" Hidden="true">
</f:Button>
<f:TextBox ID="txt_Planner" runat="server"></f:TextBox>
<f:Button ID="btn_planner" runat="server" Text="查询采购人员" Icon="Find" OnClick="btn_planner_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
<f:GroupPanel runat="server" ID="gp1" Hidden="true" Layout="HBox" >
<f:GroupPanel runat="server" ID="gp1" Hidden="true" Layout="HBox">
<Items>
<f:Form runat="server" >
<f:Form runat="server">
<Rows>
<f:FormRow runat="server">
<Items>
<f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo" />
<f:TextBox runat = "server" Label = "看板编号" EmptyText = "" ID = "TXT_AskBill" />
<f:DropDownList ID="ddl_Vender" runat="server" Label="供应商" EnableEdit="true" ></f:DropDownList>
<f:TextBox runat = "server" Label = "地点" EmptyText = "" ID = "TXT_Site_Desc" />
<f:TextBox runat="server" Label="订单编号" EmptyText="" ID="TXT_BillNo" />
<f:TextBox runat="server" Label="看板编号" EmptyText="" ID="TXT_AskBill" />
<f:DropDownList ID="ddl_Vender" runat="server" Label="供应商" EnableEdit="true"></f:DropDownList>
<f:TextBox runat="server" Label="地点" EmptyText="" ID="TXT_Site_Desc" />
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
<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" EmptyText="请选择日期" Label="至" ID="Date_EndDate" />
<f:DropDownList runat="server" ID="DDL_State" Label="状态">
<f:ListItem Text="-" Value=""/>
<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" EmptyText="请选择日期" Label="至" ID="Date_EndDate" />
<f:DropDownList runat="server" ID="DDL_State" Label="状态">
<f:ListItem Text="-" Value="" />
<f:ListItem Text="新建" Value="0" />
<f:ListItem Text="发布" Value="1" />
<f:ListItem Text="已确认" Value="2" />
<f:ListItem Text="已发货" Value="3" />
<%-- <f:ListItem Text="已收货" Value="4" />
<%-- <f:ListItem Text="已收货" Value="4" />
<f:ListItem Text="已完成" Value="5" />--%>
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%">
<Items>
<f:TextBox ID= "TXT_Buyer" runat="server" Label = "采购员" ></f:TextBox>
<f:TextBox ID = "TXT_BuyerPhone" runat="server" Label = "采购员电话" ></f:TextBox>
<f:TextBox ID = "TXT_Remark" runat="server" Label = "备注" />
</Items>
</f:FormRow>
<Items>
<f:TextBox ID="TXT_Buyer" runat="server" Label="采购员"></f:TextBox>
<f:TextBox ID="TXT_BuyerPhone" runat="server" Label="采购员电话"></f:TextBox>
<f:TextBox ID="TXT_Remark" runat="server" Label="备注" />
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
<f:Button runat="server" Text="关闭" ID="BtnClose" OnClick="BtnClose_Click"></f:Button>
<f:Button ID="BtnSearch" runat="server" OnClick="BtnSearch_Click" Text="快速查找">
</f:Button>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<f:FormRow runat="server">
<Items>
<f:TextBox runat="server" Required ="true" Label="零件编号" EmptyText="查询请填写零件编号" ID="TXT_PartCode" ></f:TextBox>
<f:Button ID="BtnSearchDetail" runat="server" OnClick="BtnSearchDetail_Click" Text="快速查找订单明细" >
<f:TextBox runat="server" Required="true" Label="零件编号" EmptyText="查询请填写零件编号" ID="TXT_PartCode"></f:TextBox>
<f:Button ID="BtnSearchDetail" runat="server" OnClick="BtnSearchDetail_Click" Text="快速查找订单明细">
</f:Button>
</Items>
</f:FormRow>
@ -137,15 +132,15 @@
</Items>
</f:GroupPanel>
<f:Grid ID = "Grid_V_TB_ASK" EnableCollapse = "true" ShowBorder = "true" ShowHeader = "true" runat ="server" EnableCheckBoxSelect="true"
DataKeyNames = "UID,PoBillNum,AskBillNum,VendId,Site,Buyer,BuyerPhone,State,Remark,VendName,State_DESC,ModType_DESC,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,GUID,ModType"
AllowSorting="true"
OnRowDataBound="Grid_V_TB_ASK_RowDataBound"
CssClass="maingrid" EnableRowDoubleClickEvent="True" OnSort="Grid_V_TB_ASK_Sort" SortField="State"
IsDatabasePaging="True" AllowPaging="True" OnRowDoubleClick="Grid_V_TB_ASK_RowDoubleClick"
AutoScroll="True" SortDirection="ASC" OnPageIndexChange="Grid_V_TB_ASK_PageIndexChange"
BoxFlex="1" >
<PageItems>
<f:Grid ID="Grid_V_TB_ASK" EnableCollapse="true" ShowBorder="true" ShowHeader="true" runat="server" EnableCheckBoxSelect="true"
DataKeyNames="UID,PoBillNum,AskBillNum,VendId,Site,Buyer,BuyerPhone,State,Remark,VendName,State_DESC,ModType_DESC,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,GUID,ModType"
AllowSorting="true"
OnRowDataBound="Grid_V_TB_ASK_RowDataBound"
CssClass="maingrid" EnableRowDoubleClickEvent="True" OnSort="Grid_V_TB_ASK_Sort" SortField="State"
IsDatabasePaging="True" AllowPaging="True" OnRowDoubleClick="Grid_V_TB_ASK_RowDoubleClick"
AutoScroll="True" SortDirection="ASC" OnPageIndexChange="Grid_V_TB_ASK_PageIndexChange"
BoxFlex="1">
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数:">
@ -156,36 +151,36 @@
<f:ListItem Text="100" Value="100" />
<f:ListItem Text="200" Value="200" />
</f:DropDownList>
</PageItems>
</PageItems>
<Columns>
<f:TemplateField HeaderText="状态" Width="70px" ColumnID="State_DESC1">
<f:TemplateField HeaderText="状态" Width="70px" ColumnID="State_DESC1">
<ItemTemplate>
<asp:label ID="State_DESC" runat="server" Width="65px" Text='<%# Eval("State_DESC") %>' ></asp:label>
</ItemTemplate>
</f:TemplateField>
<f:BoundField Width = "80px" DataField = "ModType_DESC" DataFormatString = "{0}" HeaderText = "单据类型" />
<f:BoundField Width = "100px" DataField = "AskBillNum" DataFormatString = "{0}" HeaderText = "要货看板编号" SortField="AskBillNum" />
<f:BoundField Width = "100px" DataField = "PoBillNum" DataFormatString = "{0}" HeaderText = "订单号" />
<%-- <f:BoundField Width = "100px" DataField = "ErpBillNum" DataFormatString = "{0}" HeaderText ="ERP订单号" />--%>
<f:BoundField Width = "100px" DataField = "VendName" DataFormatString = "{0}" HeaderText = "供应商" />
<f:BoundField Width = "100px" DataField = "VendId" DataFormatString = "{0}" HeaderText = "供应商编码" SortField="VendId"/>
<%--<f:BoundField Width = "100px" DataField = "Contacter" DataFormatString = "{0}" HeaderText = "发布人" />--%>
<f:BoundField Width = "100px" ColumnID="BeginTime" DataField = "BeginTime" DataFormatString = "{0:yyyy-MM-dd}" HeaderText = "订货日期" SortField="BeginTime"/>
<f:BoundField Width = "100px" ColumnID="EndTime" DataField = "EndTime" DataFormatString = "{0:yyyy-MM-dd}" HeaderText = "结束日期" SortField="EndTime" Hidden="true"/>
<f:BoundField Width ="100px" DataField = "Total" DataFormatString = "{0:N0}" HeaderText = "总价" Hidden="true"/>
<f:BoundField Width = "100px" DataField = "Site_Desc" DataFormatString = "{0}" HeaderText = "地点" />
<f:BoundField Width = "100px" DataField = "Buyer" DataFormatString = "{0}" HeaderText = "采购员" />
<f:BoundField Width = "100px" DataField = "BuyerPhone" DataFormatString = "{0}" HeaderText = "采购员电话" />
<f:BoundField Width = "100px" DataField = "Remark" DataFormatString = "{0}" HeaderText = "备注" />
<f:BoundField Width = "150px" DataField = "Extend1" DataFormatString = "{0}" HeaderText = "到货地点" />
<asp:Label ID="State_DESC" runat="server" Width="65px" Text='<%# Eval("State_DESC") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:BoundField Width="80px" DataField="ModType_DESC" DataFormatString="{0}" HeaderText="单据类型" />
<f:BoundField Width="100px" DataField="AskBillNum" DataFormatString="{0}" HeaderText="要货看板编号" SortField="AskBillNum" />
<f:BoundField Width="100px" DataField="PoBillNum" DataFormatString="{0}" HeaderText="订单号" />
<%-- <f:BoundField Width = "100px" DataField = "ErpBillNum" DataFormatString = "{0}" HeaderText ="ERP订单号" />--%>
<f:BoundField Width="100px" DataField="VendName" DataFormatString="{0}" HeaderText="供应商" />
<f:BoundField Width="100px" DataField="VendId" DataFormatString="{0}" HeaderText="供应商编码" SortField="VendId" />
<%--<f:BoundField Width = "100px" DataField = "Contacter" DataFormatString = "{0}" HeaderText = "发布人" />--%>
<f:BoundField Width="100px" ColumnID="BeginTime" DataField="BeginTime" DataFormatString="{0:yyyy-MM-dd}" HeaderText="订货日期" SortField="BeginTime" />
<f:BoundField Width="100px" ColumnID="EndTime" DataField="EndTime" DataFormatString="{0:yyyy-MM-dd}" HeaderText="结束日期" SortField="EndTime" Hidden="true" />
<f:BoundField Width="100px" DataField="Total" DataFormatString="{0:N0}" HeaderText="总价" Hidden="true" />
<f:BoundField Width="100px" DataField="Site_Desc" DataFormatString="{0}" HeaderText="地点" />
<f:BoundField Width="100px" DataField="Buyer" DataFormatString="{0}" HeaderText="采购员" />
<f:BoundField Width="100px" DataField="BuyerPhone" DataFormatString="{0}" HeaderText="采购员电话" />
<f:BoundField Width="100px" DataField="Remark" DataFormatString="{0}" HeaderText="备注" />
<f:BoundField Width="150px" DataField="Extend1" DataFormatString="{0}" HeaderText="到货地点" />
</Columns>
</f:Grid>
</Items>
</f:Panel>
<f:Window runat="server" ID="Window1" Hidden="True" Height="600px" Width="1024px" AutoScroll="True"
WindowPosition="Center" IsModal="true" Title="明细详情" Target="Parent" EnableIFrame="true" OnClose="Window1_Close" CloseAction="HidePostBack"
WindowPosition="Center" IsModal="true" Title="明细详情" Target="Parent" EnableIFrame="true" OnClose="Window1_Close" CloseAction="HidePostBack"
IFrameUrl="about:blank" />
<f:Window ID="WindowUpload" runat="server" Hidden="True" OnClose="WindowUpload_Close"
WindowPosition="Center" IsModal="true" Title="Popup Window 1" Target="Parent" EnableIFrame="true"

7
北京北汽/SCP/Views/PlanData/SCP_ASK.aspx.cs

@ -37,8 +37,15 @@ namespace SCP.PlanData
LoadData();
BindVender(ddl_Vender);
SetRoleRule();
BindDDL_Site();
}
}
private void BindDDL_Site()
{
var _ls = ScpCache.ADRESSList;
DDL_Site.DataSource = _ls;
DDL_Site.DataBind();
}
public void LoadData()
{

Loading…
Cancel
Save