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

北汽 供应商涉及状态的中英文翻译

master
qian 12 months ago
parent
2e1add2495
commit
da60ca0edb
18 changed files with 212 additions and 180 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. 6
      北京北汽/SCP/Views/BasicData/Price.aspx.cs
  2. 4
      北京北汽/SCP/Views/PlanData/ASN_STATE.aspx
  3. 10
      北京北汽/SCP/Views/PlanData/ASN_STATE.aspx.cs
  4. 7
      北京北汽/SCP/Views/SupplierData/SCP_ARRIVE.aspx.cs
  5. 8
      北京北汽/SCP/Views/SupplierData/SCP_ARRIVE_DETAIL.aspx.cs
  6. 4
      北京北汽/SCP/Views/SupplierData/SCP_ASK.aspx.cs
  7. 8
      北京北汽/SCP/Views/SupplierData/SCP_ASK_DETAIL.aspx.cs
  8. 2
      北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx
  9. 12
      北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx.cs
  10. 6
      北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx.designer.cs
  11. 8
      北京北汽/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.cs
  12. 2
      北京北汽/SCP/Views/SupplierData/SCP_ASN_DETAIL.aspx
  13. 17
      北京北汽/SCP/Views/SupplierData/SCP_ASN_DETAIL.aspx.cs
  14. 8
      北京北汽/SCP/Views/SupplierData/SCP_INVOICE.aspx
  15. 8
      北京北汽/SCP/Views/SupplierData/SCP_INVOICE.aspx.cs
  16. 24
      北京北汽/SCP/Views/SupplierData/SCP_INVOICE.aspx.designer.cs
  17. 4
      北京北汽/SCP/Views/SupplierData/SCP_INVOICE_EDIT.aspx.cs
  18. 6
      北京北汽/SCP/Views/SupplierData/SCP_PALLET_CREATE.aspx.cs

6
北京北汽/SCP/Views/BasicData/Price.aspx.cs
View File

@ -769,6 +769,12 @@ namespace SCP.BasicData
{
highlightRows.Text += e.RowIndex.ToString() + ",";
}
object[] rowDataKeys = Grid1.DataKeys[e.RowIndex];
if (rowDataKeys != null)
{
e.Values[1] = GetResourceKey(itm.Extend1);
}
}
}
}

4
北京北汽/SCP/Views/PlanData/ASN_STATE.aspx
View File

@ -1,4 +1,4 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SCP_ASN.aspx.cs" Inherits="SCP.Views.PlanData.ASN_STATE" %>
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ASN_STATE.aspx.cs" Inherits="SCP.Views.PlanData.ASN_STATE" %>
<!DOCTYPE html>
@ -36,7 +36,7 @@
<f:Grid ID="Grid_V_TB_ASN" ShowBorder="true" ShowHeader="true" PageSize="20" BoxFlex="1" CssClass="maingrid"
runat="server" DataKeyNames="UID,AsnBillNum,AskBillNum,PoBillNum,VendId,State,Remark,ShipTime,ShipUser,ReceiveTime,ReceiveUser,ErpBillNum,ModType,Contacter,Buyer,BuyerPhone,VendName,Site,State_DESC,ModType_DESC,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,GUID"
IsDatabasePaging="true" AllowPaging="true" SortDirection="DESC" SortField="ShipTime"
IsDatabasePaging="true" AllowPaging="true" SortDirection="DESC" SortField="ShipTime" OnRowDataBound="Grid_V_TB_ASN_RowDataBound"
AutoScroll="True" EnableRowDoubleClickEvent="True" >

10
北京北汽/SCP/Views/PlanData/ASN_STATE.aspx.cs
View File

@ -119,5 +119,15 @@ namespace SCP.Views.PlanData
{
BindASN();
}
protected void Grid_V_TB_PRICE_RowDataBound(object sender, GridRowEventArgs e)
{
var itm = e.DataItem as V_TB_ASN;
object[] rowDataKeys = Grid_V_TB_ASN.DataKeys[e.RowIndex];
if (rowDataKeys != null)
{
e.Values[1] = GetResourceKey(itm.State_DESC);
}
}
}
}

7
北京北汽/SCP/Views/SupplierData/SCP_ARRIVE.aspx.cs
View File

@ -133,7 +133,14 @@ namespace SCP.Views.SupplierData
}
protected void Grid_V_TB_ARRIVE_RowDataBound(object sender, GridRowEventArgs e)
{
var itm = e.DataItem as V_TB_ARRIVE;
object[] rowDataKeys = Grid_V_TB_ARRIVE.DataKeys[e.RowIndex];
if (rowDataKeys != null)
{
e.Values[0] = GetResourceKey(itm.State_DESC);
}
}
protected void Grid_V_TB_ARRIVE_Sort(object sender, GridSortEventArgs e)
{

8
北京北汽/SCP/Views/SupplierData/SCP_ARRIVE_DETAIL.aspx.cs
View File

@ -41,15 +41,15 @@ namespace SCP.Views.SupplierData
if (ret.State == ReturnStatus.Succeed)
{
var _rec = ret.Result.FirstOrDefault();
txtState.Text = _rec.State_DESC;
txtState.Text = GetResourceKey( _rec.State_DESC);
txtBillNo.Text = _rec.ArrvBillNum;
txtReceiveTime.Text = Convert.ToDateTime(_rec.ShipTime).ToString("yyyy-MM-dd");
txtShipBillNo.Text = _rec.AsnBillNum;
txtPlanBillNo.Text = _rec.PoBillNum;
txtUserName.Text = _rec.OperName;
txtSupplierName.Text = _rec.VendName;
txtMemo.Text = _rec.Remark;
txtDeliveryAddress.Text = _rec.Site_Desc;
txtSupplierName.Text = GetResourceKey(_rec.VendName);
txtMemo.Text = GetResourceKey( _rec.Remark);
txtDeliveryAddress.Text = GetResourceKey( _rec.Site_Desc);
}
});
}

4
北京北汽/SCP/Views/SupplierData/SCP_ASK.aspx.cs
View File

@ -295,13 +295,13 @@ namespace SCP.Views.SupplierData
protected void Grid_V_TB_ASK_RowDataBound(object sender, GridRowEventArgs e)
{
var itm = e.DataItem as V_TB_ASK;
System.Web.UI.WebControls.Label _label = (System.Web.UI.WebControls.Label)Grid_V_TB_ASK.Rows[e.RowIndex].FindControl("State_DESC");
if (itm.IsComplete==false)
{
System.Web.UI.WebControls.Label _label = (System.Web.UI.WebControls.Label)Grid_V_TB_ASK.Rows[e.RowIndex].FindControl("State_DESC");
// _label.Text = "发货未完";
_label.ForeColor = Color.Red;
}
_label.Text = GetResourceKey(itm.State_DESC);
}

8
北京北汽/SCP/Views/SupplierData/SCP_ASK_DETAIL.aspx.cs
View File

@ -83,11 +83,11 @@ namespace SCP.SupplierData
var _result = _ret.Result.FirstOrDefault();
Session["Ask"] = _result;
this.TXT_PoBillNum.Text = _result.PoBillNum;
this.TXT_Site.Text = _result.Site_Desc;
this.TXT_State_DESC.Text = _result.State_DESC;
this.TXT_Site.Text = GetResourceKey(_result.Site_Desc);
this.TXT_State_DESC.Text = GetResourceKey( _result.State_DESC);
TXT_ModType.Text = _result.ModType.ToString();
this.TXT_VendName.Text = _result.VendName;
this.txtRemark.Text = _result.Remark;
this.TXT_VendName.Text = GetResourceKey(_result.VendName);
this.txtRemark.Text = GetResourceKey(_result.Remark);
DP_BeginTime.SelectedDate = _result.BeginTime;
}

2
北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx
View File

@ -89,7 +89,7 @@
<f:Grid ID="Grid_V_TB_ASN" ShowBorder="true" ShowHeader="true" PageSize="20" BoxFlex="1" CssClass="maingrid"
runat="server" DataKeyNames="UID,AsnBillNum,AskBillNum,PoBillNum,VendId,State,Remark,ShipTime,ShipUser,ReceiveTime,ReceiveUser,ErpBillNum,ModType,Contacter,Buyer,BuyerPhone,VendName,Site,State_DESC,ModType_DESC,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,GUID"
IsDatabasePaging="true" AllowPaging="true" SortDirection="DESC" SortField="ShipTime"
AutoScroll="True" EnableRowDoubleClickEvent="True" OnRowDoubleClick="Grid_V_TB_ASN_RowDoubleClick" OnPageIndexChange="Grid_V_TB_ASN_PageIndexChange">
AutoScroll="True" EnableRowDoubleClickEvent="True" OnRowDoubleClick="Grid_V_TB_ASN_RowDoubleClick" OnPageIndexChange="Grid_V_TB_ASN_PageIndexChange" OnRowDataBound ="Grid_V_TB_ASN_RowDataBound" >
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>

12
北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx.cs
View File

@ -173,5 +173,17 @@ namespace SCP.SupplierData
PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("../SupplierData/SCP_PALLET.aspx?AsnBillNum={0}", AsnBillNum)));
}
protected void Grid_V_TB_ASN_RowDataBound(object sender, GridRowEventArgs e)
{
var itm = e.DataItem as V_TB_ASN;
object[] rowDataKeys = Grid_V_TB_ASN.DataKeys[e.RowIndex];
if (rowDataKeys != null)
{
e.Values[0] = GetResourceKey(itm.State_DESC);
}
}
}
}

6
北京北汽/SCP/Views/SupplierData/SCP_ASN.aspx.designer.cs
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace SCP.SupplierData {
namespace SCP.SupplierData
{
public partial class SCP_ASN {
public partial class SCP_ASN
{
/// <summary>
/// form1 控件。

8
北京北汽/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.cs
View File

@ -78,10 +78,10 @@ namespace SCP.SupplierData
Session["Ask"] = _result;
this.TXT_AskBillNum.Text = _result.AskBillNum;
this.TXT_State.Text = _result.State.ToString();
this.TXT_Site.Text = _result.Site_Desc;
this.TXT_State_Desc.Text = _result.State_DESC;
this.TXT_VendName.Text = _result.VendName;
this.TXT_Remark.Text = _result.Remark;
this.TXT_Site.Text = GetResourceKey(_result.Site_Desc);
this.TXT_State_Desc.Text = GetResourceKey(_result.State_DESC);
this.TXT_VendName.Text = GetResourceKey(_result.VendName);
this.TXT_Remark.Text = GetResourceKey(_result.Remark);
DP_ShipTime.SelectedDate = DateTime.Now;
DDL_PORT.DataSource = ScpCache.PortList.Where(p => CurrentUser.FactoryList.Contains(p.FACTORY_ID));
DDL_PORT.DataBind();

2
北京北汽/SCP/Views/SupplierData/SCP_ASN_DETAIL.aspx
View File

@ -90,7 +90,7 @@
IsDatabasePaging="True" AllowPaging="True"
EnableRowSelectEvent="True" AutoScroll="True"
SortField="PartCode" SortDirection="DESC"
OnPageIndexChange="Grid_V_TB_ASN_DETAIL_PageIndexChange"
OnRowDataBound="Grid_V_TB_ASN_DETAIL_OnRowDataBound"
>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">

17
北京北汽/SCP/Views/SupplierData/SCP_ASN_DETAIL.aspx.cs
View File

@ -47,7 +47,8 @@ namespace SCP.SupplierData
V_TB_ASN_DETAIL _entity = new V_TB_ASN_DETAIL();
_entity.UserInAddress = CurrentUser.FactoryList;
_entity.AsnBillNum = Request["AsnBillNum"];
SCP_ASN_CONTROLLER.Get_V_TB_ASN_DETAIL_List(_entity, (_ret) => {
SCP_ASN_CONTROLLER.Get_V_TB_ASN_DETAIL_List(_entity, (_ret) =>
{
if (_ret.State == ReturnStatus.Succeed)
{
p_action(_ret.Result);
@ -76,7 +77,7 @@ namespace SCP.SupplierData
TXT_VendName.Text = _result.VendName;
DP_ReceiveTime.SelectedDate = _result.ReceiveTime;
DP_ShipTime.SelectedDate = _result.ShipTime;
TXT_StateDesc.Text = _result.State_DESC;
TXT_StateDesc.Text = GetResourceKey(_result.State_DESC);
if (_result.State == (int)AsnState.Ship)
{
string la = GetCurrentLanguage();
@ -99,7 +100,8 @@ namespace SCP.SupplierData
btnException2.Hidden = true;
}
}
SCP_BARCODE_CONTROLLER.Get_TS_BARCODE_List(new TS_BARCODE() { BillNum= TXT_AsnBillNum.Text.Trim() }, retobj => {
SCP_BARCODE_CONTROLLER.Get_TS_BARCODE_List(new TS_BARCODE() { BillNum = TXT_AsnBillNum.Text.Trim() }, retobj =>
{
if (retobj.State == ReturnStatus.Succeed)
{
if (retobj.Result.Count() > 0)
@ -128,7 +130,8 @@ namespace SCP.SupplierData
btnSend.Hidden = true;
btnCancel.Hidden = true;
}
SearchV_TB_ASN_DETAILData((ret) => {
SearchV_TB_ASN_DETAILData((ret) =>
{
Grid_V_TB_ASN_DETAIL.RecordCount = ret.Count();
var list = SortAndPage<V_TB_ASN_DETAIL>(ret, Grid_V_TB_ASN_DETAIL);
Grid_V_TB_ASN_DETAIL.DataSource = list;
@ -550,7 +553,8 @@ namespace SCP.SupplierData
#region 计算托盘数量和发货数量是否相等
SearchV_TB_ASN_DETAILData((ret) => {
SearchV_TB_ASN_DETAILData((ret) =>
{
var _asn = Session["Asn"] as V_TB_ASN;
if (_asn == null)
@ -562,7 +566,8 @@ namespace SCP.SupplierData
var _ls = SCP_ASN_CONTROLLER.Get_CAN_PALLET_QTY(ret.ToList());
var _errList = new List<string>();
_ls.ForEach(p => {
_ls.ForEach(p =>
{
if (p.CanQty > 0)
{
_errList.Add(string.Format("编号:{0}名称:{1},托盘数量总和小于发货单数量", p.PartCode, (p.PartDesc1 + p.PartDesc2)));

8
北京北汽/SCP/Views/SupplierData/SCP_INVOICE.aspx
View File

@ -38,21 +38,21 @@
<Items>
<f:Form runat="server">
<Rows>
<f:FormRow runat="server" ID="FormRow_1">
<%--<f:FormRow runat="server" ID="FormRow_1">
<Items>
<f:CheckBoxList runat="server" ID="ckb" Label="状态">
<%--<f:CheckItem Text="新建" Value="0" Selected="True" />
<f:CheckItem Text="新建" Value="0" Selected="True" />
<f:CheckItem Text="供应商申请" Value="1" />
<f:CheckItem Text="采购审核退回" Value="2" />
<f:CheckItem Text="采购审核通过" Value="3" />
<f:CheckItem Text="发票寄出" Value="4" />
<f:CheckItem Text="财务退回" Value="5" />
<f:CheckItem Text="财务收票" Value="6" />
<f:CheckItem Text="发票作废" Value="-1" />--%>
<f:CheckItem Text="发票作废" Value="-1" />
</f:CheckBoxList>
</Items>
</f:FormRow>
</f:FormRow>--%>
<f:FormRow runat="server" ID="FormRow_2">
<Items>

8
北京北汽/SCP/Views/SupplierData/SCP_INVOICE.aspx.cs
View File

@ -21,7 +21,6 @@ namespace SCP.Views.SupplierData
{
TranslatorAgents(Toolbar1);
TranslatorAgent(Grid_V_TB_INVOICE);
TranslatorAgents(FormRow_1);
TranslatorAgents(FormRow_2);
TranslatorAgents(FormRow_3);
TranslatorAgents(FormRow_4);
@ -188,6 +187,13 @@ namespace SCP.Views.SupplierData
catch
{ }
}
var itm = e.DataItem as V_TB_INVOICE;
object[] rowDataKeys = Grid_V_TB_INVOICE.DataKeys[e.RowIndex];
if (rowDataKeys != null)
{
e.Values[0] = GetResourceKey(itm.State_DESC);
}
}
protected void BTN_INV_Click(object sender, EventArgs e)

24
北京北汽/SCP/Views/SupplierData/SCP_INVOICE.aspx.designer.cs
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace SCP.Views.SupplierData {
namespace SCP.Views.SupplierData
{
public partial class SCP_INVOICE {
public partial class SCP_INVOICE
{
/// <summary>
/// form1 控件。
@ -111,24 +113,6 @@ namespace SCP.Views.SupplierData {
/// </remarks>
protected global::FineUI.GroupPanel gp1;
/// <summary>
/// FormRow_1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.FormRow FormRow_1;
/// <summary>
/// ckb 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.CheckBoxList ckb;
/// <summary>
/// FormRow_2 控件。
/// </summary>

4
北京北汽/SCP/Views/SupplierData/SCP_INVOICE_EDIT.aspx.cs
View File

@ -144,10 +144,10 @@ namespace SCP.Views.SupplierData
{
var _Model = _ls[0];
Session["Invoice"] = _Model;
txtState.Text = _Model.State_DESC;
txtState.Text = GetResourceKey(_Model.State_DESC);
txtBillNo.Text = _Model.InvcBillNum;
txtBillTime.Text = Convert.ToDateTime(_Model.CreateTime).ToString("yyyy-MM-dd");
txtSupplierName.Text = _Model.VendName;
txtSupplierName.Text = GetResourceKey(_Model.VendName);
txtInvoiceNumber.Text = _Model.InvoiceNum;
txtExpressNumber.Text = _Model.ExpressNum;

6
北京北汽/SCP/Views/SupplierData/SCP_PALLET_CREATE.aspx.cs
View File

@ -64,9 +64,9 @@ namespace SCP.SupplierData
Session["Asn"] = _result;
this.TXT_AskBillNum.Text = _result.AskBillNum;
this.TXT_State.Text = _result.State.ToString();
this.TXT_Site.Text = _result.Site_Desc;
this.TXT_State_Desc.Text = _result.State_DESC;
this.TXT_VendName.Text = _result.VendName;
this.TXT_Site.Text = GetResourceKey(_result.Site_Desc);
this.TXT_State_Desc.Text = GetResourceKey(_result.State_DESC);
this.TXT_VendName.Text = GetResourceKey(_result.VendName);
//this.TXT_Remark.Text = _result.Remark;
//DP_ShipTime.SelectedDate = DateTime.Now;
//DDL_PORT.DataSource = ScpCache.PortList.Where(p => CurrentUser.FactoryList.Contains(p.FACTORY_ID));

Write Preview
Loading…
Cancel
Save