Browse Source

零件基础添加供应商别名、条码 表添加供应商别名字段。如果别名不为空则供应商名称取别名。委外订单界面筛选优化

master
lvzb 1 year ago
parent
commit
363e6f4abb
  1. 8
      Controller/SCP_BARCODE_CONTROLLER.cs
  2. 10
      Controller/SCP_PO_CONTROLLER.cs
  3. 4
      Controller/SCP_TA_LANGUAGE_CONTROLLER.cs
  4. 2
      Models/ScpEntity/ExcelExportEnttity/SCP_VENDER_PART_EXPORT.cs
  5. 2
      Models/ScpEntity/TA_Appliance.cs
  6. 6
      Models/ScpEntity/TS_BARCODE.cs
  7. 2
      Models/ScpEntity/V_TA_APPLIANCE.cs
  8. 2
      Models/ScpEntity/V_TB_PO.cs
  9. 133
      SCP/Views/BasicData/Appliance.aspx
  10. 24
      SCP/Views/BasicData/Appliance.aspx.cs
  11. 18
      SCP/Views/BasicData/Appliance.aspx.designer.cs
  12. 1
      SCP/Views/BasicData/Appliance_DETAIL.aspx
  13. 13
      SCP/Views/BasicData/Appliance_DETAIL.aspx.cs
  14. 9
      SCP/Views/BasicData/Appliance_DETAIL.aspx.designer.cs
  15. 2
      SCP/Views/PlanData/SCP_PO.aspx
  16. 2
      SCP/Views/PlanData/SCP_PO.aspx.cs
  17. 19
      SCP/Views/富维本特勒/SCP_PO_EXTEND.aspx
  18. 22
      SCP/Views/富维本特勒/SCP_PO_EXTEND.aspx.cs
  19. 21
      SCP/Views/富维本特勒/SCP_PO_EXTEND.aspx.designer.cs
  20. 2
      SCP/Web.config
  21. 4
      UniApiGroup/Controller/OdbcApiQadController.cs

8
Controller/SCP_BARCODE_CONTROLLER.cs

@ -1005,8 +1005,8 @@ namespace CK.SCP.Controller
Extend14 = _part1.Extend2,
Extend15 = str6,//Æ··¬
Extend16 = _part1.Extend1,
ProjectId = p_entity.UpdateUser
ProjectId = p_entity.UpdateUser,
OtherVendName = _Appliance?.OtherVendName
};
if (_part == null)
@ -1197,7 +1197,9 @@ namespace CK.SCP.Controller
Extend14 = _part1.Extend2,
Extend15 = str6,//Æ··¬
Extend16 = _part1.Extend1,
ProjectId = p_entity.UpdateUser
ProjectId = p_entity.UpdateUser,
OtherVendName= _Appliance?.OtherVendName
};

10
Controller/SCP_PO_CONTROLLER.cs

@ -95,6 +95,10 @@ namespace CK.SCP.Controller
{
q = q.Where(p => p.BeginTime >= p_entity.BeginTime);
}
if (p_entity.BeginTime_End != null)
{
q = q.Where(p => p.BeginTime <= p_entity.BeginTime_End);
}
if (p_entity.EndTime != null)
{
q = q.Where(p => p.EndTime >= p_entity.EndTime);
@ -3109,6 +3113,7 @@ namespace CK.SCP.Controller
_entity.Model = p.;
_entity.ReceivingPort = p.;
_entity.VendID = p.;
_entity.OtherVendName = p.;
db.TA_Appliance.Add(_entity);
}
@ -3127,7 +3132,7 @@ namespace CK.SCP.Controller
_partde.Texture = p.;
_partde.ReceivingPort = p.;
_partde.OtherVendName = p.;
db.TA_Appliance.AddOrUpdate(_partde);
}
@ -6913,6 +6918,7 @@ namespace CK.SCP.Controller
if (site == "U32")
{
uni.PutTime = DateTime.Parse(p_PoDetail.EndTime.ToString()); //要求到货日期
uni.Attn = p_dataRow["备注"].ToString();
}
else
{
@ -6936,7 +6942,7 @@ namespace CK.SCP.Controller
uni.Currency = p_PoDetail.Extend3;
uni.Receiver = "I";//订单类型
uni.SubSite = p_AskDetail.Extend1;
uni.Attn = p_dataRow["备注"].ToString();
return uni;
}
private static List<TS_UNI_API> CreateManyTsuniapi(TB_PO p_Po, TB_ASK p_Ask, TB_PO_DETAIL p_PoDetail, TB_ASK_DETAIL p_AskDetail, DataRow p_dataRow, string site, ScpEntities db)

4
Controller/SCP_TA_LANGUAGE_CONTROLLER.cs

@ -418,7 +418,7 @@ namespace CK.SCP.Controller
applianc.SufanLand = p_entitys.SufanLand;
applianc.BoxType = p_entitys.BoxType;
applianc.PostEngineering = p_entitys.PostEngineering;
applianc.OtherVendName = p_entitys.OtherVendName;
db.TA_Appliance.AddOrUpdate(applianc);
}
else
@ -432,7 +432,7 @@ namespace CK.SCP.Controller
appliance.SufanLand = p_entitys.SufanLand;
appliance.BoxType = p_entitys.BoxType;
appliance.PostEngineering = p_entitys.PostEngineering;
appliance.OtherVendName = p_entitys.OtherVendName;
db.TA_Appliance.AddOrUpdate(appliance);
}

2
Models/ScpEntity/ExcelExportEnttity/SCP_VENDER_PART_EXPORT.cs

@ -8,7 +8,7 @@ namespace CK.SCP.Models.ScpEntity.ExcelExportEnttity
{
public class SCP_VENDER_PART_EXPORT
{
public string { get; set; }
public string { get; set; }
public string { get; set; }
public string { get; set; }

2
Models/ScpEntity/TA_Appliance.cs

@ -23,6 +23,8 @@ namespace CK.SCP.Models.ScpEntity
public string Texture { get; set; }
public string ReceivingPort { get; set; }
public string VendID { get; set; }
//供应商别名
public string OtherVendName { get; set; }
}
}

6
Models/ScpEntity/TS_BARCODE.cs

@ -86,9 +86,9 @@ namespace CK.SCP.Models.ScpEntity
public string Extend3 { get; set; }
[DisplayName("供应商名称")]
public string VendName => ScpCache.GetVendName(VendId,Site);
public string VendName => string.IsNullOrEmpty(OtherVendName)? ScpCache.GetVendName(VendId,Site): OtherVendName;
[DisplayName("¹©Ó¦É̱ðÃû")]
public string OtherVendName { get; set; }
[DisplayName("零件名称")]

2
Models/ScpEntity/V_TA_APPLIANCE.cs

@ -25,5 +25,7 @@ namespace CK.SCP.Models.ScpEntity
public string VendID { get; set; }
public string VendName { get; set; }
public string OtherVendName { get; set; }
}
}

2
Models/ScpEntity/V_TB_PO.cs

@ -64,6 +64,8 @@ namespace CK.SCP.Models.ScpEntity
public DateTime? EndTime_End { get; set; }
[NotMapped]///订货结束日期
public DateTime? BeginTime_End { get; set; }
}

133
SCP/Views/BasicData/Appliance.aspx

@ -1,4 +1,5 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Appliance.aspx.cs" Inherits="SCP.Views.BasicData.Appliance" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
@ -9,78 +10,78 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Title="" AutoScroll="True" Layout="VBox">
<Items>
<f:Toolbar ID="Toolbar1" runat="server">
<Items>
<f:TextBox ID="txtPartCode" runat="server" Label="零件号码" Text="">
</f:TextBox>
<f:TextBox ID="TextBox1" runat="server" Label="供应商代码" Text="">
</f:TextBox>
<f:Button ID="btnSearch" runat="server" Text="快速查找" OnClick="btnSearch_Click" Icon="SystemSearch">
</f:Button>
<f:Button ID="Button3" runat="server" EnablePostBack="false" Text="刷新" Icon="Reload" OnClientClick="location.reload();">
</f:Button>
<f:Button ID="Insert" runat="server" Text="新建" Icon="Add" OnClick="Button2_Click" >
</f:Button>
<f:Button ID="Delete" runat="server" Text="删除" Icon="Delete" OnClick="Buttondelete_Click" OnClientClick="if(!confirm('是否要将数据删除'))return false;" >
</f:Button>
<f:Button ID="Update" runat="server" Text="修改" Icon="BasketEdit" OnClick="Button4_Click"
>
</f:Button>
<f:ToolbarSeparator runat="server" />
<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="btnOutput" runat="server" Text="导出" OnClick="btnOutput_OnClick" Icon="PageExcel">
</f:Button>
</Items>
</f:Toolbar>
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Title="" AutoScroll="True" Layout="VBox">
<Items>
<f:Toolbar ID="Toolbar1" runat="server">
<Items>
<f:Grid ID="Grid1" runat="server" BoxFlex="1"
ShowHeader="False" DataKeyNames = " UID,PartNumber,Texture,ReceivingPort,PartDesc1,Model,PackNumber,ReciteNumber, SufanLand,BoxType,PostEngineering,VendID"
<f:TextBox ID="txtPartCode" runat="server" Label="零件号码" Text="">
</f:TextBox>
<f:TextBox ID="TextBox1" runat="server" Label="供应商代码" Text="">
</f:TextBox>
<f:Button ID="btnSearch" runat="server" Text="快速查找" OnClick="btnSearch_Click" Icon="SystemSearch">
</f:Button>
<f:Button ID="Button3" runat="server" EnablePostBack="false" Text="刷新" Icon="Reload" OnClientClick="location.reload();">
</f:Button>
<f:Button ID="Insert" runat="server" Text="新建" Icon="Add" OnClick="Button2_Click" EnablePostBack="True">
</f:Button>
<f:Button ID="Delete" runat="server" Text="删除" Icon="Delete" OnClick="Buttondelete_Click" OnClientClick="if(!confirm('是否要将数据删除'))return false;">
</f:Button>
<f:Button ID="Update" runat="server" Text="修改" Icon="BasketEdit" OnClick="Button4_Click" EnablePostBack="True">
</f:Button>
<f:ToolbarSeparator runat="server" />
<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="btnOutput" runat="server" Text="导出" OnClick="btnOutput_OnClick" Icon="PageExcel">
</f:Button>
<f:LinkButton ID="linkbutton" runat="server" Text="模板下载" OnClick="LinkButton_Click" ></f:LinkButton>
</Items>
</f:Toolbar>
AllowPaging="True" PageSize="50" OnPageIndexChange="Grid1_OnPageIndexChange"
ShowBorder="False"
AllowSorting="true" IsDatabasePaging="true" SortField="PartCode" EnableCheckBoxSelect="true">
<PageItems>
<f:Grid ID="Grid1" runat="server" BoxFlex="1"
ShowHeader="False" DataKeyNames=" UID,PartNumber,Texture,ReceivingPort,PartDesc1,Model,PackNumber,ReciteNumber, SufanLand,BoxType,PostEngineering,VendID,OtherVendName"
AllowPaging="True" PageSize="50" OnPageIndexChange="Grid1_OnPageIndexChange"
ShowBorder="False"
AllowSorting="true" IsDatabasePaging="true" SortField="PartCode" EnableCheckBoxSelect="true">
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数:">
</f:ToolbarText>
<f:DropDownList ID="ddlGridPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlGridPageSize_SelectedIndexChanged"
runat="server">
<f:ListItem Text="100" Value="100" />
<f:ListItem Text="200" Value="200" />
<f:ListItem Text="500" Value="500" />
<f:ListItem Text="1000" Value="1000" />
<f:ListItem Text="5000" Value="5000" />
<f:ListItem Text="10000" Value="10000" />
<f:ListItem Text="500" Value="500" />
<f:ListItem Text="1000" Value="1000" />
<f:ListItem Text="5000" Value="5000" />
<f:ListItem Text="10000" Value="10000" />
</f:DropDownList>
</PageItems>
<Columns>
<f:BoundField SortField="UID" DataField="UID" ColumnID="UID" Width="100px" Hidden="true"/>
<f:BoundField SortField="PartNumber" DataField="PartNumber" HeaderText="零件号码" ColumnID="PartNumber" Width="100px" />
<f:BoundField SortField="Texture" DataField="Texture" HeaderText="材质" ColumnID="Texture" Width="100px" />
<f:BoundField SortField="ReceivingPort" DataField="ReceivingPort" HeaderText="收货口" ColumnID="ReceivingPort" width="80" />
<f:BoundField SortField="PartDesc1" DataField="PartDesc1" HeaderText="零件描述" ColumnID="PartDesc1" Width="100px" />
<f:BoundField SortField="Appliancenumber" DataField="Appliancenumber" HeaderText="器具型号" ColumnID="Appliancenumber" Width="200px" Hidden="true" />
<f:BoundField SortField="Model" DataField="Model" HeaderText="车型" ColumnID="Model" Width="100px"/>
<f:BoundField SortField="PackNumber" DataField="PackNumber" HeaderText="标包数" ColumnID="PackNumber" Width="100px"/>
<f:BoundField SortField="ReciteNumber" DataField="ReciteNumber" HeaderText="背番号" ColumnID="ReciteNumber" Width="100px"/>
<f:BoundField SortField="SufanLand" DataField="SufanLand" HeaderText="所番地" ColumnID="SufanLand" Width="100px"/>
<f:BoundField SortField="BoxType" DataField="BoxType" HeaderText="箱种" ColumnID="BoxType" Width="100px"/>
<f:BoundField SortField="PostEngineering" DataField="PostEngineering" HeaderText="后工程" ColumnID="PostEngineering" Width="100px"/>
<f:BoundField SortField="VendID" DataField="VendID" HeaderText="供应商代码" ColumnID="VendID" Width="100px"/>
</Columns>
</f:Grid>
</Items>
</f:Panel>
<%--<f:Window ID="Window1" runat="server" Popup="false"
</PageItems>
<Columns>
<f:BoundField SortField="UID" DataField="UID" ColumnID="UID" Width="100px" Hidden="true" />
<f:BoundField SortField="PartNumber" DataField="PartNumber" HeaderText="零件号码" ColumnID="PartNumber" Width="100px" />
<f:BoundField SortField="Texture" DataField="Texture" HeaderText="材质" ColumnID="Texture" Width="100px" />
<f:BoundField SortField="ReceivingPort" DataField="ReceivingPort" HeaderText="收货口" ColumnID="ReceivingPort" Width="80" />
<f:BoundField SortField="PartDesc1" DataField="PartDesc1" HeaderText="零件描述" ColumnID="PartDesc1" Width="100px" />
<f:BoundField SortField="Appliancenumber" DataField="Appliancenumber" HeaderText="器具型号" ColumnID="Appliancenumber" Width="200px" Hidden="true" />
<f:BoundField SortField="Model" DataField="Model" HeaderText="车型" ColumnID="Model" Width="100px" />
<f:BoundField SortField="PackNumber" DataField="PackNumber" HeaderText="标包数" ColumnID="PackNumber" Width="100px" />
<f:BoundField SortField="ReciteNumber" DataField="ReciteNumber" HeaderText="背番号" ColumnID="ReciteNumber" Width="100px" />
<f:BoundField SortField="SufanLand" DataField="SufanLand" HeaderText="所番地" ColumnID="SufanLand" Width="100px" />
<f:BoundField SortField="BoxType" DataField="BoxType" HeaderText="箱种" ColumnID="BoxType" Width="100px" />
<f:BoundField SortField="PostEngineering" DataField="PostEngineering" HeaderText="后工程" ColumnID="PostEngineering" Width="100px" />
<f:BoundField SortField="VendID" DataField="VendID" HeaderText="供应商代码" ColumnID="VendID" Width="100px" />
<f:BoundField SortField="OtherVendName" DataField="OtherVendName" HeaderText="供应商别名" ColumnID="OtherVendName" Width="100px" ID="OtherVendName" Hidden="true" />
</Columns>
</f:Grid>
</Items>
</f:Panel>
<%--<f:Window ID="Window1" runat="server" Popup="false"
WindowPosition="Center" IsModal="true" Title="Popup Window 1" Target="Parent" EnableIFrame="true"
IFrameUrl="about:blank" Height="300px" Width="700px">
</f:Window>
@ -88,7 +89,7 @@
WindowPosition="Center" IsModal="true" Title="Popup Window 1" Target="Parent" EnableIFrame="true"
IFrameUrl="about:blank" Height="200px" Width="400px" OnClose="WindowUpload_Close" >
</f:Window>--%>
<script type="text/javascript">
<script type="text/javascript">
function onReady() {
var grid1 = Ext.getCmp('<%=Grid1.ClientID%>');
@ -98,12 +99,12 @@
$(window).bind("load resize", function () {
onReady();
});
</script>
</script>
</form>
<f:Window runat="server" ID="Window1" Hidden="True" AutoScroll="false" Width="800px" Height="450px" CloseAction="HidePostBack"
WindowPosition="Center" IsModal="true" Title="零件明细" Target="Parent" EnableIFrame="true"
IFrameUrl="about:blank" />
<f:Window runat="server" ID="Window1" Hidden="True" AutoScroll="false" Width="800px" Height="450px" CloseAction="HidePostBack"
WindowPosition="Center" IsModal="true" Title="零件明细" Target="Parent" EnableIFrame="true" OnClose="Window1_Close"
IFrameUrl="about:blank" />
</body>
</html>

24
SCP/Views/BasicData/Appliance.aspx.cs

@ -21,6 +21,10 @@ namespace SCP.Views.BasicData
if (!IsPostBack)
{
BindData();
if(CurrentUser.FactoryList[0]== "U32")
{
OtherVendName.Hidden = false;
}
}
}
//
@ -94,6 +98,7 @@ namespace SCP.Views.BasicData
{ "BoxType", "箱种" },
{ "PostEngineering", "后工程" },
{ "VendID", "供应商代码" },
{ "OtherVendName", "供应商别名" },
};
string url = EntityListToExcel2003(cellheader, ret.ToList(), "零件基础信息");
});
@ -140,10 +145,11 @@ namespace SCP.Views.BasicData
string SufanLand = rowDataKeys[8] as string;
string BoxType = rowDataKeys[9] as string;
string PostEngineering = rowDataKeys[10] as string;
string VendID = rowDataKeys[11] as string;
string url = String.Format("../BasicData/Appliance_DETAIL.aspx?PartNumber={0}&&Texture={1}&&ReceivingPort={2}&&PartDesc1={3}&&Model={4}&&PackNumber={5}&&ReciteNumber={6}&&SufanLand={7}&&BoxType={8}&&PostEngineering={9}&&VendID={10}"
string VendID = rowDataKeys[11] as string;
string OtherVendName = rowDataKeys[12] as string;
string url = String.Format("../BasicData/Appliance_DETAIL.aspx?PartNumber={0}&&Texture={1}&&ReceivingPort={2}&&PartDesc1={3}&&Model={4}&&PackNumber={5}&&ReciteNumber={6}&&SufanLand={7}&&BoxType={8}&&PostEngineering={9}&&VendID={10}&&OtherVendName={11}"
, PartNumber, Texture
, ReceivingPort, PartDesc1, Model, PackNumber, ReciteNumber, SufanLand, BoxType, PostEngineering, VendID);
, ReceivingPort, PartDesc1, Model, PackNumber, ReciteNumber, SufanLand, BoxType, PostEngineering, VendID, OtherVendName);
PageContext.RegisterStartupScript(Window1.GetShowReference(url));
}
}
@ -184,11 +190,15 @@ namespace SCP.Views.BasicData
Alert.Show(string.Join("<br>", ret.MessageList));
}
}
//protected void Grid1_OnSort(object sender, GridSortEventArgs e)
//{
//}
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
BindData();
}
protected void LinkButton_Click(object sender, EventArgs e)
{
Alert.Show($"<a href=\'/uploadfiles/{".xlsx"}\'>{".xlsx"}</a>", "请点击文件名下载", MessageBoxIcon.Information);
}
}

18
SCP/Views/BasicData/Appliance.aspx.designer.cs

@ -149,6 +149,15 @@ namespace SCP.Views.BasicData
/// </remarks>
protected global::FineUI.Button btnOutput;
/// <summary>
/// linkbutton 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.LinkButton linkbutton;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -185,6 +194,15 @@ namespace SCP.Views.BasicData
/// </remarks>
protected global::FineUI.DropDownList ddlGridPageSize;
/// <summary>
/// OtherVendName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.BoundField OtherVendName;
/// <summary>
/// Window1 控件。
/// </summary>

1
SCP/Views/BasicData/Appliance_DETAIL.aspx

@ -35,6 +35,7 @@
<f:TextBox runat = "server" Label = "箱种" EmptyText = "" ID = "TextBox3" />
<f:TextBox runat = "server" Label = "后工程" EmptyText = "" ID = "TextBox5" />
<f:TextBox runat = "server" Label = "供应商代码" EmptyText = "" ID = "TextBox6" />
<f:TextBox runat = "server" Label = "供应商别名" EmptyText = "" ID = "TXT_OtherVendName" Hidden="true" />
</Items>
</f:Form>
</Items>

13
SCP/Views/BasicData/Appliance_DETAIL.aspx.cs

@ -19,7 +19,7 @@ using FineUI;
namespace SCP.Views.BasicData
{
public partial class Appliance_DETAIL : System.Web.UI.Page
public partial class Appliance_DETAIL : PageBase
{
protected void Page_Load(object sender, EventArgs e)
{
@ -27,6 +27,11 @@ namespace SCP.Views.BasicData
{
Bind();
if (CurrentUser.FactoryList[0] == "U32")
{
TXT_OtherVendName.Hidden = false;
}
}
}
private void Bind()
@ -52,6 +57,7 @@ namespace SCP.Views.BasicData
_entity.BoxType = Request["BoxType"];
_entity.PostEngineering = Request["PostEngineering"];
_entity.VendID = Request["VendID"];
_entity.OtherVendName = Request["OtherVendName"];
TXT_PART.Text = _entity.PartNumber;
TXT_DESC.Text = _entity.Texture;
TXT_EN.Text = _entity.ReceivingPort;
@ -63,6 +69,7 @@ namespace SCP.Views.BasicData
TextBox3.Text = _entity.BoxType;
TextBox5.Text = _entity.PostEngineering;
TextBox6.Text = _entity.VendID;
TXT_OtherVendName.Text = _entity.OtherVendName;
}
}
@ -80,6 +87,7 @@ namespace SCP.Views.BasicData
_entity.BoxType = TextBox3.Text;
_entity.PostEngineering = TextBox5.Text;
_entity.VendID = TextBox6.Text;
_entity.OtherVendName = TXT_OtherVendName.Text;
var ret = SCP_TA_LANGUAGE_CONTROLLER.Get_TA_LANGUAGE_List1(new TA_Appliance { });
if (ret.State == ReturnStatus.Succeed)
{
@ -99,7 +107,8 @@ namespace SCP.Views.BasicData
if (ret1.State == ReturnStatus.Succeed)
{
Alert.Show("保存成功");
Alert.Show("保存成功");
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
}

9
SCP/Views/BasicData/Appliance_DETAIL.aspx.designer.cs

@ -157,5 +157,14 @@ namespace SCP.Views.BasicData
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TextBox6;
/// <summary>
/// TXT_OtherVendName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_OtherVendName;
}
}

2
SCP/Views/PlanData/SCP_PO.aspx

@ -74,7 +74,7 @@
<f:TextBox runat = "server" Label ="供应商" EmptyText = "" ID="ddlVender" />
<f:TextBox runat = "server" Label = "项目编码" EmptyText = "" ID = "TXT_ProjectId" />
<f:TextBox runat="server" Required ="true" Label="物料号码" ID="TXT_PartCode" />
<f:TextBox runat="server" Label="物料号码" EmptyText = "" ID="TXT_PartCode" />
</Items>
</f:FormRow>

2
SCP/Views/PlanData/SCP_PO.aspx.cs

@ -68,7 +68,7 @@ namespace SCP.PlanData
}
if (DP_EndDate.SelectedDate != null)
{
_entity.BeginTime = DP_EndDate.SelectedDate;
_entity.BeginTime_End = DP_EndDate.SelectedDate;
}
if (!string.IsNullOrEmpty(DDL_State.SelectedValue))
{

19
SCP/Views/富维本特勒/SCP_PO_EXTEND.aspx

@ -70,7 +70,13 @@
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3" Hidden="true" />
<f:DropDownList ID="ddl_Vender" runat="server" Label="供应商" EnableEdit="true" Hidden="true" ></f:DropDownList>
<f:TextBox runat = "server" Label = "项目编码" EmptyText = "" ID = "TXT_ProjectId" />
<f:DatePicker runat="server" Required ="true" DateFormatString="yyyy-MM-dd" Label="要求到货日期" EmptyText="请选择日期" ID="DatePicker1" />
<f:TextBox runat="server" Label="物料号码" EmptyText = "" ID="TXT_PartCode" />
<f:DropDownList runat="server" ID="DDL_State" Label="状态">
<f:ListItem Text="-" Value=""/>
<f:ListItem Text="关闭" Value="0" />
<f:ListItem Text="开放" Value="1" />
</f:DropDownList>
</Items>
</f:FormRow>
@ -78,13 +84,10 @@
<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" Label="至" EmptyText="请选择日期" ID="DP_EndDate" />
<f:DropDownList runat="server" ID="DDL_State" Label="状态">
<f:ListItem Text="-" Value=""/>
<f:ListItem Text="关闭" Value="0" />
<f:ListItem Text="开放" Value="1" />
</f:DropDownList>
<f:TextBox runat="server" Required ="true" Label="零件编号" EmptyText="查询请填写零件编号" ID="TXT_PartCode" Hidden="true"/>
<f:DatePicker runat="server" Required ="true" DateFormatString="yyyy-MM-dd" Label="要求到货日期" EmptyText="请选择日期" ID="DP_BeginTime" />
<f:DatePicker runat="server" Required ="true" DateFormatString="yyyy-MM-dd" Label="至" EmptyText="请选择日期" ID="DP_BeginTime_End" />
</Items>
</f:FormRow>
<f:FormRow runat="server" ColumnWidths="33% 33% 33%">

22
SCP/Views/富维本特勒/SCP_PO_EXTEND.aspx.cs

@ -61,17 +61,25 @@ namespace SCP.Views.富维本特勒
DropDownList1.DataBind();
V_TB_PO _entity = new V_TB_PO();
_entity.IsDeleted = false;
if (this.DP_StartDate.SelectedDate != null)
if (!string.IsNullOrEmpty(DDL_State.SelectedValue))
{
_entity.BeginTime = DP_StartDate.SelectedDate;
_entity.State = int.Parse(DDL_State.SelectedValue);
}
if (DP_EndDate.SelectedDate != null)
if (this.DP_BeginTime.SelectedDate != null)
{
_entity.BeginTime = DP_EndDate.SelectedDate;
_entity.BeginTime = DP_BeginTime.SelectedDate;
}
if (!string.IsNullOrEmpty(DDL_State.SelectedValue))
if (DP_BeginTime_End.SelectedDate != null)
{
_entity.State = int.Parse(DDL_State.SelectedValue);
_entity.BeginTime_End = DP_BeginTime_End.SelectedDate;
}
if (DP_StartDate.SelectedDate != null)
{
_entity.EndTime = DP_StartDate.SelectedDate;
}
if (DP_EndDate.SelectedDate != null)
{
_entity.EndTime_End = DP_EndDate.SelectedDate;
}
_entity.VendId = ddl_Vender.SelectedValue;
_entity.PoBillNum = TXT_BillNo.Text;
@ -81,7 +89,6 @@ namespace SCP.Views.富维本特勒
_entity.ModType = ConvertHelper.To<int>(rblist.SelectedValue);
}
_entity.IsDeleted = false;
_entity.UserInVendIds = CurrentUser.VenderList;
_entity.UserInAddress = CurrentUser.FactoryList;
@ -91,7 +98,6 @@ namespace SCP.Views.富维本特勒
_entity.Extend1 = TXT_Extend1.Text;
_entity.Extend2 = TXT_Extend2.Text;
_entity.Extend3 = TXT_Extend3.Text;
_entity.EndTime = DatePicker1.SelectedDate;
_entity.ModType = (int)BillFwModType.Non_Contract;
SCP_PO_CONTROLLER.Get_V_TB_PO_List(_entity, (_ret) => {
if (_ret.State == ReturnStatus.Succeed)

21
SCP/Views/富维本特勒/SCP_PO_EXTEND.aspx.designer.cs

@ -213,13 +213,22 @@ namespace SCP.Views.富维本特勒
protected global::FineUI.TextBox TXT_ProjectId;
/// <summary>
/// DatePicker1 控件。
/// TXT_PartCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.DatePicker DatePicker1;
protected global::FineUI.TextBox TXT_PartCode;
/// <summary>
/// DDL_State 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.DropDownList DDL_State;
/// <summary>
/// DP_StartDate 控件。
@ -240,22 +249,22 @@ namespace SCP.Views.富维本特勒
protected global::FineUI.DatePicker DP_EndDate;
/// <summary>
/// DDL_State 控件。
/// DP_BeginTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.DropDownList DDL_State;
protected global::FineUI.DatePicker DP_BeginTime;
/// <summary>
/// TXT_PartCode 控件。
/// DP_BeginTime_End 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TXT_PartCode;
protected global::FineUI.DatePicker DP_BeginTime_End;
/// <summary>
/// BtnClose 控件。

2
SCP/Web.config

@ -88,7 +88,7 @@
<httpRuntime executionTimeout="120" maxRequestLength="204800" useFullyQualifiedRedirectUrl="false" minFreeThreads="8" minLocalRequestFreeThreads="4" appRequestQueueLimit="100" enableVersionHeader="false"/>
<customErrors mode="Off"/>
<authentication mode="Forms">
<forms name=".APPBOX_FORMS_AUTH" loginUrl="~/default_CYJ.aspx" timeout="3" defaultUrl="~/main.aspx" protection="All" path="/"/>
<forms name=".APPBOX_FORMS_AUTH" loginUrl="~/default.aspx" timeout="3" defaultUrl="~/main.aspx" protection="All" path="/"/>
</authentication>
<authorization>
<deny users="?"/>

4
UniApiGroup/Controller/OdbcApiQadController.cs

@ -851,7 +851,7 @@ namespace CK.SCP.GrupUniApi.Controller
BeginTime = qadPoNbr.createdDate == null ? DateTime.Now : (DateTime)qadPoNbr.createdDate,//创建日期
EndTime = qadPoNbr.itemDeliveryDate,//收货结束时间
Buyer = qadPoNbr.CREATEDBY,
BuyerPhone = "17304315968",
BuyerPhone = qadPoNbr.phone,
};
wmsPoList.Add(wmsPo);
@ -878,7 +878,7 @@ namespace CK.SCP.GrupUniApi.Controller
BeginTime = qadPoNbr.createdDate == null ? DateTime.Now : (DateTime)qadPoNbr.createdDate,//创建日期
EndTime = qadPoNbr.itemDeliveryDate,//收货结束时间
Buyer = qadPoNbr.CREATEDBY,
BuyerPhone = "17304315968",
BuyerPhone = qadPoNbr.phone,
ErpBillNum = qadPoNbr.purDocNO,//订单号
SubSite = "W21",
};

Loading…
Cancel
Save