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
Unified 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. 55
      北京北汽/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() + ","; 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> <!DOCTYPE html>
@ -36,7 +36,7 @@
<f:Grid ID="Grid_V_TB_ASN" ShowBorder="true" ShowHeader="true" PageSize="20" BoxFlex="1" CssClass="maingrid" <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" 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" > AutoScroll="True" EnableRowDoubleClickEvent="True" >

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

@ -119,5 +119,15 @@ namespace SCP.Views.PlanData
{ {
BindASN(); 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) 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) 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) if (ret.State == ReturnStatus.Succeed)
{ {
var _rec = ret.Result.FirstOrDefault(); var _rec = ret.Result.FirstOrDefault();
txtState.Text = _rec.State_DESC; txtState.Text = GetResourceKey( _rec.State_DESC);
txtBillNo.Text = _rec.ArrvBillNum; txtBillNo.Text = _rec.ArrvBillNum;
txtReceiveTime.Text = Convert.ToDateTime(_rec.ShipTime).ToString("yyyy-MM-dd"); txtReceiveTime.Text = Convert.ToDateTime(_rec.ShipTime).ToString("yyyy-MM-dd");
txtShipBillNo.Text = _rec.AsnBillNum; txtShipBillNo.Text = _rec.AsnBillNum;
txtPlanBillNo.Text = _rec.PoBillNum; txtPlanBillNo.Text = _rec.PoBillNum;
txtUserName.Text = _rec.OperName; txtUserName.Text = _rec.OperName;
txtSupplierName.Text = _rec.VendName; txtSupplierName.Text = GetResourceKey(_rec.VendName);
txtMemo.Text = _rec.Remark; txtMemo.Text = GetResourceKey( _rec.Remark);
txtDeliveryAddress.Text = _rec.Site_Desc; 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) protected void Grid_V_TB_ASK_RowDataBound(object sender, GridRowEventArgs e)
{ {
var itm = e.DataItem as V_TB_ASK; 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) 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.Text = "发货未完";
_label.ForeColor = Color.Red; _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(); var _result = _ret.Result.FirstOrDefault();
Session["Ask"] = _result; Session["Ask"] = _result;
this.TXT_PoBillNum.Text = _result.PoBillNum; this.TXT_PoBillNum.Text = _result.PoBillNum;
this.TXT_Site.Text = _result.Site_Desc; this.TXT_Site.Text = GetResourceKey(_result.Site_Desc);
this.TXT_State_DESC.Text = _result.State_DESC; this.TXT_State_DESC.Text = GetResourceKey( _result.State_DESC);
TXT_ModType.Text = _result.ModType.ToString(); TXT_ModType.Text = _result.ModType.ToString();
this.TXT_VendName.Text = _result.VendName; this.TXT_VendName.Text = GetResourceKey(_result.VendName);
this.txtRemark.Text = _result.Remark; this.txtRemark.Text = GetResourceKey(_result.Remark);
DP_BeginTime.SelectedDate = _result.BeginTime; 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" <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" 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"
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> <PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server"> <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator> </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))); 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> /// <summary>
/// form1 控件。 /// form1 控件。

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

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

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

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

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

@ -46,8 +46,9 @@ namespace SCP.SupplierData
{ {
V_TB_ASN_DETAIL _entity = new V_TB_ASN_DETAIL(); V_TB_ASN_DETAIL _entity = new V_TB_ASN_DETAIL();
_entity.UserInAddress = CurrentUser.FactoryList; _entity.UserInAddress = CurrentUser.FactoryList;
_entity.AsnBillNum= Request["AsnBillNum"]; _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) if (_ret.State == ReturnStatus.Succeed)
{ {
p_action(_ret.Result); p_action(_ret.Result);
@ -60,7 +61,7 @@ namespace SCP.SupplierData
V_TB_ASN _entity = new V_TB_ASN(); V_TB_ASN _entity = new V_TB_ASN();
_entity.AsnBillNum = Request["AsnBillNum"]; _entity.AsnBillNum = Request["AsnBillNum"];
_entity.UserInVendIds = CurrentUser.VenderList; _entity.UserInVendIds = CurrentUser.VenderList;
_entity.UserInAddress= CurrentUser.FactoryList; _entity.UserInAddress = CurrentUser.FactoryList;
SCP_ASN_CONTROLLER.Get_V_TB_ASN_List(_entity, (_ret) => SCP_ASN_CONTROLLER.Get_V_TB_ASN_List(_entity, (_ret) =>
{ {
if (_ret.State == ReturnStatus.Succeed) if (_ret.State == ReturnStatus.Succeed)
@ -76,7 +77,7 @@ namespace SCP.SupplierData
TXT_VendName.Text = _result.VendName; TXT_VendName.Text = _result.VendName;
DP_ReceiveTime.SelectedDate = _result.ReceiveTime; DP_ReceiveTime.SelectedDate = _result.ReceiveTime;
DP_ShipTime.SelectedDate = _result.ShipTime; DP_ShipTime.SelectedDate = _result.ShipTime;
TXT_StateDesc.Text = _result.State_DESC; TXT_StateDesc.Text = GetResourceKey(_result.State_DESC);
if (_result.State == (int)AsnState.Ship) if (_result.State == (int)AsnState.Ship)
{ {
string la = GetCurrentLanguage(); string la = GetCurrentLanguage();
@ -99,7 +100,8 @@ namespace SCP.SupplierData
btnException2.Hidden = true; 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.State == ReturnStatus.Succeed)
{ {
if (retobj.Result.Count() > 0) if (retobj.Result.Count() > 0)
@ -118,7 +120,7 @@ namespace SCP.SupplierData
public void BindDetail() public void BindDetail()
{ {
string la = GetCurrentLanguage(); string la = GetCurrentLanguage();
if (la =="CH") if (la == "CH")
{ {
Button1.Hidden = true; Button1.Hidden = true;
btnCance2.Hidden = true; btnCance2.Hidden = true;
@ -128,7 +130,8 @@ namespace SCP.SupplierData
btnSend.Hidden = true; btnSend.Hidden = true;
btnCancel.Hidden = true; btnCancel.Hidden = true;
} }
SearchV_TB_ASN_DETAILData((ret) => { SearchV_TB_ASN_DETAILData((ret) =>
{
Grid_V_TB_ASN_DETAIL.RecordCount = ret.Count(); Grid_V_TB_ASN_DETAIL.RecordCount = ret.Count();
var list = SortAndPage<V_TB_ASN_DETAIL>(ret, Grid_V_TB_ASN_DETAIL); var list = SortAndPage<V_TB_ASN_DETAIL>(ret, Grid_V_TB_ASN_DETAIL);
Grid_V_TB_ASN_DETAIL.DataSource = list; Grid_V_TB_ASN_DETAIL.DataSource = list;
@ -220,7 +223,7 @@ namespace SCP.SupplierData
protected void btnEdit_Click(object sender, EventArgs e) protected void btnEdit_Click(object sender, EventArgs e)
{ {
var _asn=Session["Asn"] as V_TB_ASN; var _asn = Session["Asn"] as V_TB_ASN;
if (_asn == null) if (_asn == null)
{ {
Alert.Show(GetResourceKey("发货订单信息不能为空!")); Alert.Show(GetResourceKey("发货订单信息不能为空!"));
@ -264,7 +267,7 @@ namespace SCP.SupplierData
System.Web.UI.WebControls.TextBox TXT_PackQty = (System.Web.UI.WebControls.TextBox)row.FindControl("TXT_PackQty"); System.Web.UI.WebControls.TextBox TXT_PackQty = (System.Web.UI.WebControls.TextBox)row.FindControl("TXT_PackQty");
System.Web.UI.WebControls.TextBox TXT_Qty = (System.Web.UI.WebControls.TextBox)row.FindControl("TXT_Qty"); System.Web.UI.WebControls.TextBox TXT_Qty = (System.Web.UI.WebControls.TextBox)row.FindControl("TXT_Qty");
System.Web.UI.WebControls.TextBox TXT_ProduceDate = (System.Web.UI.WebControls.TextBox)row.FindControl("TXT_ProduceDate"); System.Web.UI.WebControls.TextBox TXT_ProduceDate = (System.Web.UI.WebControls.TextBox)row.FindControl("TXT_ProduceDate");
_entity.VendBatch= TXT_VenBatch.Text; _entity.VendBatch = TXT_VenBatch.Text;
if (string.IsNullOrEmpty(TXT_ProduceDate.Text)) if (string.IsNullOrEmpty(TXT_ProduceDate.Text))
@ -274,7 +277,7 @@ namespace SCP.SupplierData
} }
else else
{ {
_entity.ProduceDate =DateTime.Parse(TXT_ProduceDate.Text); _entity.ProduceDate = DateTime.Parse(TXT_ProduceDate.Text);
} }
_list.Add(_entity); _list.Add(_entity);
} }
@ -335,7 +338,7 @@ namespace SCP.SupplierData
_entity.ProduceDate = ConvertHelper.To<DateTime>(rowDataKeys[27]); _entity.ProduceDate = ConvertHelper.To<DateTime>(rowDataKeys[27]);
_entity.Batch = rowDataKeys[28] as string; _entity.Batch = rowDataKeys[28] as string;
_entity.VendId = rowDataKeys[29] as string; _entity.VendId = rowDataKeys[29] as string;
_entity.Guid=ConvertHelper.To<Guid>(rowDataKeys[29]); _entity.Guid = ConvertHelper.To<Guid>(rowDataKeys[29]);
_list.Add(_entity); _list.Add(_entity);
} }
@ -360,7 +363,7 @@ namespace SCP.SupplierData
} }
else else
{ {
var result=SCP_BARCODE_CONTROLLER.Get_TB_PRINT_COUNT_List(new TB_PRINT_COUNT() { BillNo=_asn.AsnBillNum }); var result = SCP_BARCODE_CONTROLLER.Get_TB_PRINT_COUNT_List(new TB_PRINT_COUNT() { BillNo = _asn.AsnBillNum });
if (result.State == ReturnStatus.Succeed) if (result.State == ReturnStatus.Succeed)
{ {
//if (result.Result.Count(p => p.PrintType == (int)PrintType.ASN) == 0) //if (result.Result.Count(p => p.PrintType == (int)PrintType.ASN) == 0)
@ -376,7 +379,7 @@ namespace SCP.SupplierData
} }
var check = SCP_ASN_CONTROLLER.Get_TS_UNI_API(_asn); var check = SCP_ASN_CONTROLLER.Get_TS_UNI_API(_asn);
if(check.State == ReturnStatus.Failed) if (check.State == ReturnStatus.Failed)
{ {
Alert.Show(_asn.AsnBillNum + GetResourceKey("请勿重复提交数据！")); Alert.Show(_asn.AsnBillNum + GetResourceKey("请勿重复提交数据！"));
return; return;
@ -415,7 +418,7 @@ namespace SCP.SupplierData
if (Session["Asn"] != null) if (Session["Asn"] != null)
{ {
var _ask = Session["Asn"] as V_TB_ASN; var _ask = Session["Asn"] as V_TB_ASN;
var ret = SCP_ASN_CONTROLLER.Save_TB_ASN_STATE(new List<string>() { _ask.AsnBillNum },p_state); var ret = SCP_ASN_CONTROLLER.Save_TB_ASN_STATE(new List<string>() { _ask.AsnBillNum }, p_state);
if (ret.State == ReturnStatus.Succeed) if (ret.State == ReturnStatus.Succeed)
{ {
Alert.Show(GetResourceKey(p_msg)); Alert.Show(GetResourceKey(p_msg));
@ -448,10 +451,10 @@ namespace SCP.SupplierData
protected void CreateBarCode_Click(object sender, EventArgs e) protected void CreateBarCode_Click(object sender, EventArgs e)
{ {
btnCreateBarCode.Enabled = false; btnCreateBarCode.Enabled = false;
var _list=GetSelectedList(); var _list = GetSelectedList();
if (_list.Count > 0) if (_list.Count > 0)
{ {
var ret=SCP_ASN_CONTROLLER.Save_TB_CREATE_BARCODE(_list); var ret = SCP_ASN_CONTROLLER.Save_TB_CREATE_BARCODE(_list);
if (ret.State == ReturnStatus.Succeed) if (ret.State == ReturnStatus.Succeed)
{ {
Alert.Show(GetResourceKey("条码创建成功!")); Alert.Show(GetResourceKey("条码创建成功!"));
@ -518,20 +521,20 @@ namespace SCP.SupplierData
PageContext.RegisterStartupScript(str); PageContext.RegisterStartupScript(str);
} }
SCP_BARCODE_CONTROLLER.Save_TB_PRINT_COUNT(new TB_PRINT_COUNT() { BillNo = AsnBillNum, PrintType = (int)PrintType.ASN}); SCP_BARCODE_CONTROLLER.Save_TB_PRINT_COUNT(new TB_PRINT_COUNT() { BillNo = AsnBillNum, PrintType = (int)PrintType.ASN });
} }
protected void btnSelectedBarCode_Click(object sender, EventArgs e) protected void btnSelectedBarCode_Click(object sender, EventArgs e)
{ {
string AsnBillNum = Request["AsnBillNum"]; string AsnBillNum = Request["AsnBillNum"];
var bacode= SCP_BARCODE_CONTROLLER.GetBacode(AsnBillNum); var bacode = SCP_BARCODE_CONTROLLER.GetBacode(AsnBillNum);
if (bacode.Count() == 0) if (bacode.Count() == 0)
{ {
Alert.Show(AsnBillNum + GetResourceKey("标签未创建！")); Alert.Show(AsnBillNum + GetResourceKey("标签未创建！"));
return; return;
} }
var SubSite = SCP_BARCODE_CONTROLLER.GetBillNum(AsnBillNum); var SubSite = SCP_BARCODE_CONTROLLER.GetBillNum(AsnBillNum);
if (!string.IsNullOrEmpty(AsnBillNum)&&SubSite.Site=="CQBMPT") if (!string.IsNullOrEmpty(AsnBillNum) && SubSite.Site == "CQBMPT")
{ {
var str = string.Format("window.open(\"../../Handlers/GenerateReport.ashx?report=Material_CQ&data=101&type=pdf&filename=标签.pdf&AsnBillNum={0}&open=\")", AsnBillNum); var str = string.Format("window.open(\"../../Handlers/GenerateReport.ashx?report=Material_CQ&data=101&type=pdf&filename=标签.pdf&AsnBillNum={0}&open=\")", AsnBillNum);
PageContext.RegisterStartupScript(str); PageContext.RegisterStartupScript(str);
@ -550,7 +553,8 @@ namespace SCP.SupplierData
#region 计算托盘数量和发货数量是否相等 #region 计算托盘数量和发货数量是否相等
SearchV_TB_ASN_DETAILData((ret) => { SearchV_TB_ASN_DETAILData((ret) =>
{
var _asn = Session["Asn"] as V_TB_ASN; var _asn = Session["Asn"] as V_TB_ASN;
if (_asn == null) if (_asn == null)
@ -560,12 +564,13 @@ namespace SCP.SupplierData
} }
var _ls=SCP_ASN_CONTROLLER.Get_CAN_PALLET_QTY(ret.ToList()); var _ls = SCP_ASN_CONTROLLER.Get_CAN_PALLET_QTY(ret.ToList());
var _errList = new List<string>(); var _errList = new List<string>();
_ls.ForEach(p => { _ls.ForEach(p =>
if(p.CanQty>0) {
if (p.CanQty > 0)
{ {
_errList.Add(string.Format("编号:{0}名称:{1},托盘数量总和小于发货单数量",p.PartCode,(p.PartDesc1+p.PartDesc2))); _errList.Add(string.Format("编号:{0}名称:{1},托盘数量总和小于发货单数量", p.PartCode, (p.PartDesc1 + p.PartDesc2)));
} }
}); });
if (_errList.Count > 0) if (_errList.Count > 0)
@ -681,7 +686,7 @@ namespace SCP.SupplierData
} }
else else
{ {
Alert.Show(GetResourceKey( string.Join("\n\r", ret.MessageList.ToArray()))); Alert.Show(GetResourceKey(string.Join("\n\r", ret.MessageList.ToArray())));
} }
} }
} }

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

@ -38,21 +38,21 @@
<Items> <Items>
<f:Form runat="server"> <f:Form runat="server">
<Rows> <Rows>
<f:FormRow runat="server" ID="FormRow_1"> <%--<f:FormRow runat="server" ID="FormRow_1">
<Items> <Items>
<f:CheckBoxList runat="server" ID="ckb" Label="状态"> <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="1" />
<f:CheckItem Text="采购审核退回" Value="2" /> <f:CheckItem Text="采购审核退回" Value="2" />
<f:CheckItem Text="采购审核通过" Value="3" /> <f:CheckItem Text="采购审核通过" Value="3" />
<f:CheckItem Text="发票寄出" Value="4" /> <f:CheckItem Text="发票寄出" Value="4" />
<f:CheckItem Text="财务退回" Value="5" /> <f:CheckItem Text="财务退回" Value="5" />
<f:CheckItem Text="财务收票" Value="6" /> <f:CheckItem Text="财务收票" Value="6" />
<f:CheckItem Text="发票作废" Value="-1" />--%> <f:CheckItem Text="发票作废" Value="-1" />
</f:CheckBoxList> </f:CheckBoxList>
</Items> </Items>
</f:FormRow> </f:FormRow>--%>
<f:FormRow runat="server" ID="FormRow_2"> <f:FormRow runat="server" ID="FormRow_2">
<Items> <Items>

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

@ -21,7 +21,6 @@ namespace SCP.Views.SupplierData
{ {
TranslatorAgents(Toolbar1); TranslatorAgents(Toolbar1);
TranslatorAgent(Grid_V_TB_INVOICE); TranslatorAgent(Grid_V_TB_INVOICE);
TranslatorAgents(FormRow_1);
TranslatorAgents(FormRow_2); TranslatorAgents(FormRow_2);
TranslatorAgents(FormRow_3); TranslatorAgents(FormRow_3);
TranslatorAgents(FormRow_4); TranslatorAgents(FormRow_4);
@ -188,6 +187,13 @@ namespace SCP.Views.SupplierData
catch 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) 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> /// <summary>
/// form1 控件。 /// form1 控件。
@ -111,24 +113,6 @@ namespace SCP.Views.SupplierData {
/// </remarks> /// </remarks>
protected global::FineUI.GroupPanel gp1; 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> /// <summary>
/// FormRow_2 控件。 /// FormRow_2 控件。
/// </summary> /// </summary>

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

@ -144,10 +144,10 @@ namespace SCP.Views.SupplierData
{ {
var _Model = _ls[0]; var _Model = _ls[0];
Session["Invoice"] = _Model; Session["Invoice"] = _Model;
txtState.Text = _Model.State_DESC; txtState.Text = GetResourceKey(_Model.State_DESC);
txtBillNo.Text = _Model.InvcBillNum; txtBillNo.Text = _Model.InvcBillNum;
txtBillTime.Text = Convert.ToDateTime(_Model.CreateTime).ToString("yyyy-MM-dd"); txtBillTime.Text = Convert.ToDateTime(_Model.CreateTime).ToString("yyyy-MM-dd");
txtSupplierName.Text = _Model.VendName; txtSupplierName.Text = GetResourceKey(_Model.VendName);
txtInvoiceNumber.Text = _Model.InvoiceNum; txtInvoiceNumber.Text = _Model.InvoiceNum;
txtExpressNumber.Text = _Model.ExpressNum; 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; Session["Asn"] = _result;
this.TXT_AskBillNum.Text = _result.AskBillNum; this.TXT_AskBillNum.Text = _result.AskBillNum;
this.TXT_State.Text = _result.State.ToString(); this.TXT_State.Text = _result.State.ToString();
this.TXT_Site.Text = _result.Site_Desc; this.TXT_Site.Text = GetResourceKey(_result.Site_Desc);
this.TXT_State_Desc.Text = _result.State_DESC; this.TXT_State_Desc.Text = GetResourceKey(_result.State_DESC);
this.TXT_VendName.Text = _result.VendName; this.TXT_VendName.Text = GetResourceKey(_result.VendName);
//this.TXT_Remark.Text = _result.Remark; //this.TXT_Remark.Text = _result.Remark;
//DP_ShipTime.SelectedDate = DateTime.Now; //DP_ShipTime.SelectedDate = DateTime.Now;
//DDL_PORT.DataSource = ScpCache.PortList.Where(p => CurrentUser.FactoryList.Contains(p.FACTORY_ID)); //DDL_PORT.DataSource = ScpCache.PortList.Where(p => CurrentUser.FactoryList.Contains(p.FACTORY_ID));

Write Preview
Loading…
Cancel
Save