Browse Source

锦州合并

master
lvzb 4 years ago
parent
commit
48f4f0c7bd
  1. 16
      Controller/SCP_ASK_CONTROLLER.cs
  2. 2
      Controller/SCP_PO_CONTROLLER.cs
  3. 3
      Models/ScpEntity/TB_ASK_DETAIL.cs
  4. 4
      Models/ScpEntity/V_TB_INCOMPLETE_ASK.cs
  5. 12
      SCP.sln
  6. 36
      SCP/Admin/online.aspx.designer.cs
  7. 2
      SCP/Admin/profile.aspx
  8. 8
      SCP/Views/BasicData/Part.aspx
  9. 4
      SCP/Views/BasicData/SCP_FACTORY.aspx
  10. 8
      SCP/Views/BasicData/SCP_INFO.aspx
  11. 4
      SCP/Views/BasicData/SCP_LANGUAGE.aspx
  12. 6
      SCP/Views/BasicData/SCP_RECIVE_PORT.aspx
  13. 4
      SCP/Views/BasicData/SCP_VenderUser.aspx
  14. 4
      SCP/Views/BasicData/Supplier.aspx
  15. 11
      SCP/Views/PlanData/SCP_ASK.aspx
  16. 9
      SCP/Views/PlanData/SCP_ASK.aspx.cs
  17. 4
      SCP/Views/PlanData/SCP_ASK.aspx.designer.cs
  18. 4
      SCP/Views/PlanData/SCP_ASN_DETAIL_View.aspx
  19. 22
      SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx
  20. 20
      SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs
  21. 36
      SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs
  22. 4
      SCP/Views/PlanData/SCP_PART_LIFE.aspx
  23. 2
      SCP/Views/PlanData/SCP_PART_LIFE.aspx.cs
  24. 3
      SCP/Views/PlanData/SCP_PO.aspx
  25. 7
      SCP/Views/PlanData/SCP_PO.aspx.cs
  26. 4
      SCP/Views/PlanData/SCP_PO.aspx.designer.cs
  27. 5
      SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx
  28. 2
      SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs
  29. 5
      SCP/Views/PlanData/SCP_PO_DETAIL_OUT.aspx
  30. 21
      SCP/Views/PlanData/SCP_PO_EXTEND.aspx
  31. 10
      SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs
  32. 4
      SCP/Views/PlanData/SCP_PO_EXTEND.aspx.designer.cs
  33. 2
      SCP/Views/PlanData/SCP_PO_PLAN_EXTEND.aspx
  34. 9
      SCP/Views/SupplierData/SCP_ASK.aspx
  35. 5
      SCP/Views/SupplierData/SCP_ASK.aspx.cs
  36. 4
      SCP/Views/SupplierData/SCP_ASK.aspx.designer.cs
  37. 13
      SCP/Views/SupplierData/SCP_ASN.aspx
  38. 5
      SCP/Views/SupplierData/SCP_ASN.aspx.cs
  39. 4
      SCP/Views/SupplierData/SCP_ASN.aspx.designer.cs
  40. 2
      SCP/Views/SupplierData/SCP_ASN_DETAIL.aspx.cs
  41. 2
      SCP/Views/SupplierData/SCP_CLAIM.aspx
  42. 1
      SCP/Views/SupplierData/SCP_CLAIM.aspx.cs
  43. 4
      SCP/Views/SupplierData/SCP_INVOICE.aspx
  44. 2
      SCP/Views/SupplierData/SCP_QUALITY.aspx
  45. 6
      SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx
  46. 6
      SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs
  47. 4
      SCP/Views/WarehouseData/SCP_INVOICE.aspx
  48. 2
      SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx
  49. 2
      SCP/Views/沈阳金杯/SupplierData/SCP_RECEIVE_LIST.aspx
  50. 18
      UniApiGroup/Controller/OdbcApiQadController.cs
  51. 1
      UniApiGroup/Controller/OdbcApiScpController.cs
  52. 9
      UniApiGroup/Controller/OdbcApiWmsController.cs

16
Controller/SCP_ASK_CONTROLLER.cs

@ -406,6 +406,22 @@ namespace CK.SCP.Controller
{ {
q = q.Where(p => p.AskQty == p.ReduceQty + p.Qty); q = q.Where(p => p.AskQty == p.ReduceQty + p.Qty);
} }
if (!string.IsNullOrEmpty(p_entity.SubSite))
{
q = q.Where(p => p.SubSite == p_entity.SubSite);
}
if (!string.IsNullOrEmpty(p_entity.Extend1))
{
q = q.Where(p => p.Extend1 == p_entity.Extend1);
}
if (!string.IsNullOrEmpty(p_entity.Extend2))
{
q = q.Where(p => p.Extend2 == p_entity.Extend2);
}
if (!string.IsNullOrEmpty(p_entity.Extend3))
{
q = q.Where(p => p.Extend3 == p_entity.Extend3);
}
q = q.Where(p => p.IsDeleted == p_entity.IsDeleted); q = q.Where(p => p.IsDeleted == p_entity.IsDeleted);
_ret.State = ReturnStatus.Succeed; _ret.State = ReturnStatus.Succeed;
_ret.Result = q; _ret.Result = q;

2
Controller/SCP_PO_CONTROLLER.cs

@ -244,7 +244,7 @@ namespace CK.SCP.Controller
if (_detail.PoBillNum == itm.PoBillNum && _detail.PoLine == itm.PoLine && _detail.PartCode == itm.PartCode) if (_detail.PoBillNum == itm.PoBillNum && _detail.PoLine == itm.PoLine && _detail.PartCode == itm.PartCode)
{ {
_detail.ReceivedQty = itm.ReceiveSum; _detail.ReceivedQty = itm.ReceiveSum;
} }
}); });

3
Models/ScpEntity/TB_ASK_DETAIL.cs

@ -48,6 +48,9 @@ namespace CK.SCP.Models.ScpEntity
public decimal? ReduceQty { get; set; } public decimal? ReduceQty { get; set; }
public string Site { get; set; }
public string Extend1 { get; set; } public string Extend1 { get; set; }
public string Extend2 { get; set; } public string Extend2 { get; set; }
public string Extend3 { get; set; } public string Extend3 { get; set; }

4
Models/ScpEntity/V_TB_INCOMPLETE_ASK.cs

@ -58,5 +58,9 @@
[NotMapped] [NotMapped]
public DateTime? EndTimeStart { get; set; } public DateTime? EndTimeStart { get; set; }
public String SubSite { get; set; }
public String Extend1 { get; set; }
public String Extend2 { get; set; }
public String Extend3 { get; set; }
} }
} }

12
SCP.sln

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 16
VisualStudioVersion = 16.0.29424.173 VisualStudioVersion = 16.0.30225.117
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SCP", "SCP\SCP.csproj", "{B5ECC9CB-5122-458B-A8B4-B1D3B679E40D}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SCP", "SCP\SCP.csproj", "{B5ECC9CB-5122-458B-A8B4-B1D3B679E40D}"
EndProject EndProject
@ -31,18 +31,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "数据库脚本", "数据
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "库存查询脚本", "库存查询脚本", "{8D2819CE-1334-4EFE-A50F-E23BC8DDD71D}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "库存查询脚本", "库存查询脚本", "{8D2819CE-1334-4EFE-A50F-E23BC8DDD71D}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
..\..\Desktop\SCP项目\VIEW_PRODUCT_DETAIL.sql = ..\..\Desktop\SCP项目\VIEW_PRODUCT_DETAIL.sql ..\Users\asus\Desktop\20200820唐明亮.sql = ..\Users\asus\Desktop\20200820唐明亮.sql
..\..\Desktop\SCP项目\Wms数据库设置.ini = ..\..\Desktop\SCP项目\Wms数据库设置.ini ..\Desktop\SCP项目\VIEW_PRODUCT_DETAIL.sql = ..\Desktop\SCP项目\VIEW_PRODUCT_DETAIL.sql
..\Desktop\SCP项目\Wms数据库设置.ini = ..\Desktop\SCP项目\Wms数据库设置.ini
..\..\..\Desktop\常熟定时更新程序.txt = ..\..\..\Desktop\常熟定时更新程序.txt
EndProjectSection EndProjectSection
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "权限库备份", "权限库备份", "{137B27CF-8F56-49BB-9705-060995312716}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "权限库备份", "权限库备份", "{137B27CF-8F56-49BB-9705-060995312716}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
..\..\Desktop\权限系统.sql = ..\..\Desktop\权限系统.sql ..\Desktop\权限系统.sql = ..\Desktop\权限系统.sql
EndProjectSection EndProjectSection
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SCP库备份", "SCP库备份", "{636001CD-8969-4077-9A44-E681C4ADF8BD}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SCP库备份", "SCP库备份", "{636001CD-8969-4077-9A44-E681C4ADF8BD}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
..\..\Desktop\SCP系统脚本.sql = ..\..\Desktop\SCP系统脚本.sql ..\Desktop\SCP系统脚本.sql = ..\Desktop\SCP系统脚本.sql
EndProjectSection EndProjectSection
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CK.SCP.GrupUniApi", "UniApiGroup\CK.SCP.GrupUniApi.csproj", "{6A22F275-D490-46B3-B183-35408BF106C4}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CK.SCP.GrupUniApi", "UniApiGroup\CK.SCP.GrupUniApi.csproj", "{6A22F275-D490-46B3-B183-35408BF106C4}"

36
SCP/Admin/online.aspx.designer.cs

@ -2,16 +2,18 @@
// <自动生成> // <自动生成>
// 此代码由工具生成。 // 此代码由工具生成。
// //
// 对此文件的更改可能导致不正确的行为,并且如果 // 对此文件的更改可能导致不正确的行为,如果
// 重新生成代码,这些更改将会丢失。 // 重新生成代码,则所做更改将丢失。
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace SCP.admin { namespace SCP.admin
{
public partial class online {
public partial class online
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
/// </summary> /// </summary>
@ -20,7 +22,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1; protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary> /// <summary>
/// PageManager1 控件。 /// PageManager1 控件。
/// </summary> /// </summary>
@ -29,7 +31,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.PageManager PageManager1; protected global::FineUI.PageManager PageManager1;
/// <summary> /// <summary>
/// Panel1 控件。 /// Panel1 控件。
/// </summary> /// </summary>
@ -38,7 +40,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.Panel Panel1; protected global::FineUI.Panel Panel1;
/// <summary> /// <summary>
/// Form2 控件。 /// Form2 控件。
/// </summary> /// </summary>
@ -47,7 +49,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.Form Form2; protected global::FineUI.Form Form2;
/// <summary> /// <summary>
/// FormRow1 控件。 /// FormRow1 控件。
/// </summary> /// </summary>
@ -56,7 +58,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.FormRow FormRow1; protected global::FineUI.FormRow FormRow1;
/// <summary> /// <summary>
/// ttbSearchMessage 控件。 /// ttbSearchMessage 控件。
/// </summary> /// </summary>
@ -65,7 +67,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.TwinTriggerBox ttbSearchMessage; protected global::FineUI.TwinTriggerBox ttbSearchMessage;
/// <summary> /// <summary>
/// Grid1 控件。 /// Grid1 控件。
/// </summary> /// </summary>
@ -74,7 +76,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.Grid Grid1; protected global::FineUI.Grid Grid1;
/// <summary> /// <summary>
/// ToolbarSeparator3 控件。 /// ToolbarSeparator3 控件。
/// </summary> /// </summary>
@ -83,7 +85,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.ToolbarSeparator ToolbarSeparator3; protected global::FineUI.ToolbarSeparator ToolbarSeparator3;
/// <summary> /// <summary>
/// ToolbarText1 控件。 /// ToolbarText1 控件。
/// </summary> /// </summary>
@ -92,7 +94,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.ToolbarText ToolbarText1; protected global::FineUI.ToolbarText ToolbarText1;
/// <summary> /// <summary>
/// ddlGridPageSize 控件。 /// ddlGridPageSize 控件。
/// </summary> /// </summary>
@ -101,7 +103,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.DropDownList ddlGridPageSize; protected global::FineUI.DropDownList ddlGridPageSize;
/// <summary> /// <summary>
/// Window1 控件。 /// Window1 控件。
/// </summary> /// </summary>

2
SCP/Admin/profile.aspx

@ -25,7 +25,7 @@
<f:TextBox ID="tbxConfirmNewPassword" TextMode="Password" runat="server" Label="确认新密码" <f:TextBox ID="tbxConfirmNewPassword" TextMode="Password" runat="server" Label="确认新密码"
Required="true" ShowRedStar="true"> Required="true" ShowRedStar="true">
</f:TextBox> </f:TextBox>
<f:Button ID="btnSave" runat="server" Icon="SystemSave" OnClick="btnSave_OnClick" <f:Button ID="btnSave" runat="server" Icon="BasketEdit" OnClick="btnSave_OnClick"
ValidateForms="SimpleForm1" ValidateTarget="Top" Text="修改密码"> ValidateForms="SimpleForm1" ValidateTarget="Top" Text="修改密码">
</f:Button> </f:Button>

8
SCP/Views/BasicData/Part.aspx

@ -16,13 +16,13 @@
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" runat="server"> <f:Toolbar ID="Toolbar2" runat="server">
<Items> <Items>
<f:Button ID="Button3" runat="server" EnablePostBack="True" Text="刷新" Icon="Add"> <f:Button ID="Button3" runat="server" EnablePostBack="True" Text="刷新" Icon="Reload">
</f:Button> </f:Button>
<f:Button ID="Button2" runat="server" EnablePostBack="True" Text="导出" Icon="Add" OnClick="Button2_OnClick"> <f:Button ID="Button2" runat="server" EnablePostBack="True" Text="导出" Icon="PageExcel" OnClick="Button2_OnClick">
</f:Button> </f:Button>
<f:Button ID="btnSave" runat="server" EnablePostBack="True" Text="保存信息" Icon="Add" OnClick="btnSave_Click"> <f:Button ID="btnSave" runat="server" EnablePostBack="True" Text="保存信息" Icon="SystemSave" OnClick="btnSave_Click">
</f:Button> </f:Button>
<f:Button ID="btnShow" runat="server" Text="显示查询面板" OnClick="btnShow_OnClick"> <f:Button ID="btnShow" runat="server" Text="显示查询面板" Icon="Find" OnClick="btnShow_OnClick">
</f:Button> </f:Button>
<f:ToolbarSeparator runat="server" /> <f:ToolbarSeparator runat="server" />
<f:FileUpload runat="server" ID="FileUp" EmptyText="请选择要货单据" Required="true" Width="200" ButtonIcon="Add" ShowRedStar="true" > </f:FileUpload> <f:FileUpload runat="server" ID="FileUp" EmptyText="请选择要货单据" Required="true" Width="200" ButtonIcon="Add" ShowRedStar="true" > </f:FileUpload>

4
SCP/Views/BasicData/SCP_FACTORY.aspx

@ -23,9 +23,9 @@
<f:Button ID="Btn_Add" runat="server" EnablePostBack="True" Text="添加" Icon="Add" OnClick="Btn_Add_Click"> <f:Button ID="Btn_Add" runat="server" EnablePostBack="True" Text="添加" Icon="Add" OnClick="Btn_Add_Click">
</f:Button> </f:Button>
<f:Button ID="Btn_Delete" runat="server" Text="删除" OnClick="Btn_Delete_Click"> <f:Button ID="Btn_Delete" runat="server" Text="删除" Icon="Delete" OnClick="Btn_Delete_Click">
</f:Button> </f:Button>
<f:Button ID="Btn_Edit" runat="server" Text="编辑" OnClick="Btn_Edit_Click"> <f:Button ID="Btn_Edit" runat="server" Text="编辑" Icon="BasketEdit" OnClick="Btn_Edit_Click">
</f:Button> </f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> <f:ToolbarFill ID="ToolbarFill1" runat="server">

8
SCP/Views/BasicData/SCP_INFO.aspx

@ -19,15 +19,15 @@
<f:Toolbar ID="Toolbar2" runat="server"> <f:Toolbar ID="Toolbar2" runat="server">
<Items> <Items>
<f:ToolbarSeparator runat="server" /> <f:ToolbarSeparator runat="server" />
<f:Button ID="Button3" runat="server" EnablePostBack="True" Text="刷新" Icon="Add" OnClientClick="location.reload();"> <f:Button ID="Button3" runat="server" EnablePostBack="True" Text="刷新" Icon="Reload" OnClientClick="location.reload();">
</f:Button> </f:Button>
<f:Button ID="btnadd" runat="server" EnablePostBack="True" Text="新增" Icon="Add"> <f:Button ID="btnadd" runat="server" EnablePostBack="True" Text="新增" Icon="Add">
</f:Button> </f:Button>
<f:Button ID="btnEdit" runat="server" EnablePostBack="True" Text="修改" Icon="Add" OnClick="btnEdit_OnClick"> <f:Button ID="btnEdit" runat="server" EnablePostBack="True" Text="修改" Icon="BasketEdit" OnClick="btnEdit_OnClick">
</f:Button> </f:Button>
<f:Button ID="btnDelete" runat="server" EnablePostBack="True" Text="删除" Icon="Add" OnClick="btnDelete_OnClick"> <f:Button ID="btnDelete" runat="server" EnablePostBack="True" Text="删除" Icon="Delete" OnClick="btnDelete_OnClick">
</f:Button> </f:Button>
<f:Button ID="btnShow" runat="server" Text="显示查询面板" OnClick="btnShow_OnClick"> <f:Button ID="btnShow" runat="server" Text="显示查询面板" Icon="Find" OnClick="btnShow_OnClick">
</f:Button> </f:Button>
</Items> </Items>
</f:Toolbar> </f:Toolbar>

4
SCP/Views/BasicData/SCP_LANGUAGE.aspx

@ -21,9 +21,9 @@
<Items> <Items>
<f:Button ID="Btn_Add" runat="server" EnablePostBack="True" Text="新建" Icon="Add" OnClick="Btn_Add_Click"> <f:Button ID="Btn_Add" runat="server" EnablePostBack="True" Text="新建" Icon="Add" OnClick="Btn_Add_Click">
</f:Button> </f:Button>
<f:Button ID="Btn_Save" runat="server" EnablePostBack="True" Text="保存" Icon="Add" OnClick="Btn_Save_Click"> <f:Button ID="Btn_Save" runat="server" EnablePostBack="True" Text="保存" Icon="SystemSave" OnClick="Btn_Save_Click">
</f:Button> </f:Button>
<f:Button ID="Btn_Delete" runat="server" Text="删除" OnClick="Btn_Delete_Click"> <f:Button ID="Btn_Delete" runat="server" Text="删除" Icon="Delete" OnClick="Btn_Delete_Click">
</f:Button> </f:Button>
</Items> </Items>
</f:Toolbar> </f:Toolbar>

6
SCP/Views/BasicData/SCP_RECIVE_PORT.aspx

@ -18,10 +18,10 @@
<Items> <Items>
<f:Button ID="BtnRefersh" runat="server" EnablePostBack="True" Text="刷新" Icon="Reload"> <f:Button ID="BtnRefersh" runat="server" EnablePostBack="True" Text="刷新" Icon="Reload">
</f:Button> </f:Button>
<f:Button ID="BtnOutPut" runat="server" EnablePostBack="True" Text="导出" Icon="Add" OnClick="BtnOutPut_OnClick"> <f:Button ID="BtnOutPut" runat="server" EnablePostBack="True" Text="导出" Icon="PageExcel" OnClick="BtnOutPut_OnClick">
</f:Button> </f:Button>
<f:Button runat="server" ID="btnNew" Text="新建收货口" OnClick="btnNew_Click"></f:Button> <f:Button runat="server" ID="btnNew" Text="新建收货口" Icon="Add" OnClick="btnNew_Click"></f:Button>
<f:Button runat="server" ID="btnSave" Text="保存收货口" OnClick="btnSave_Click"></f:Button> <f:Button runat="server" ID="btnSave" Text="保存收货口" Icon="SystemSave" OnClick="btnSave_Click"></f:Button>
<%-- <f:Button ID="btnShow" runat="server" Text="显示查询面板" OnClick="btnShow_OnClick"> <%-- <f:Button ID="btnShow" runat="server" Text="显示查询面板" OnClick="btnShow_OnClick">
</f:Button>--%> </f:Button>--%>
</Items> </Items>

4
SCP/Views/BasicData/SCP_VenderUser.aspx

@ -66,9 +66,9 @@
<f:Toolbar ID="Toolbar2" runat="server"> <f:Toolbar ID="Toolbar2" runat="server">
<Items> <Items>
<f:DropDownList ID="ddl_Vender" runat="server" Label="供应商" Width="400" EnableEdit="true"></f:DropDownList> <f:DropDownList ID="ddl_Vender" runat="server" Label="供应商" Width="400" EnableEdit="true"></f:DropDownList>
<f:Button ID="btnSearch" runat="server" Text="查找" OnClick="btnSearch_Click" Icon="SystemSearch"> <f:Button ID="btnSearch" runat="server" Text="查找" OnClick="btnSearch_Click" Icon="Zoom">
</f:Button> </f:Button>
<f:Button ID="btnReset" runat="server" Text="重置" OnClick="btnReset_Click" Icon="SystemSearch"> <f:Button ID="btnReset" runat="server" Text="重置" OnClick="btnReset_Click" Icon="Reload">
</f:Button> </f:Button>
</Items> </Items>
</f:Toolbar> </f:Toolbar>

4
SCP/Views/BasicData/Supplier.aspx

@ -18,9 +18,9 @@
<Items> <Items>
<f:Button ID="BtnRefersh" runat="server" EnablePostBack="True" Text="刷新" Icon="Reload"> <f:Button ID="BtnRefersh" runat="server" EnablePostBack="True" Text="刷新" Icon="Reload">
</f:Button> </f:Button>
<f:Button ID="BtnOutPut" runat="server" EnablePostBack="True" Text="导出" Icon="Add" OnClick="BtnOutPut_OnClick"> <f:Button ID="BtnOutPut" runat="server" EnablePostBack="True" Text="导出" Icon="PageExcel" OnClick="BtnOutPut_OnClick">
</f:Button> </f:Button>
<f:Button ID="btnShow" runat="server" Text="显示查询面板" OnClick="btnShow_OnClick"> <f:Button ID="btnShow" runat="server" Text="显示查询面板" Icon="Find" OnClick="btnShow_OnClick">
</f:Button> </f:Button>
<f:ToolbarSeparator runat="server" /> <f:ToolbarSeparator runat="server" />
<f:FileUpload runat="server" ID="FileUp" EmptyText="请选择要货单据" Required="true" Width="200" ButtonIcon="Add" ShowRedStar="true" > </f:FileUpload> <f:FileUpload runat="server" ID="FileUp" EmptyText="请选择要货单据" Required="true" Width="200" ButtonIcon="Add" ShowRedStar="true" > </f:FileUpload>

11
SCP/Views/PlanData/SCP_ASK.aspx

@ -19,13 +19,13 @@
<f:Toolbar ID="Toolbar2" runat="server"> <f:Toolbar ID="Toolbar2" runat="server">
<Items> <Items>
<f:ToolbarSeparator runat="server" /> <f:ToolbarSeparator runat="server" />
<f:Button ID="button3" runat="server" EnablePostBack="false" Text="刷新" Icon="Add" OnClientClick="location.reload();"> <f:Button ID="button3" runat="server" EnablePostBack="false" Text="刷新" Icon="Reload" OnClientClick="location.reload();">
</f:Button> </f:Button>
<f:ToolbarSeparator runat="server" /> <f:ToolbarSeparator runat="server" />
<f:Button ID="btnDelete" runat="server" Text="删除看板" Icon="Delete" OnClick="btnDelete_Click" > <f:Button ID="btnDelete" runat="server" Text="删除看板" Icon="Delete" OnClick="btnDelete_Click" >
</f:Button> </f:Button>
<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="PageCopy" OnClick="btnCopy_Click" OnClientClick="if(!confirm('是否要复制订单,只能复制合同看板不能复制离散订单?'))return false;">
</f:Button> </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>
@ -35,7 +35,7 @@
<f:Button ID="btnCreateAsk" runat="server" Text="创建要货看板" Icon="Add" OnClick="btnCreateAsk_Click"> <f:Button ID="btnCreateAsk" runat="server" Text="创建要货看板" Icon="Add" OnClick="btnCreateAsk_Click">
</f:Button> </f:Button>
<f:Button ID="btnShow" runat="server" Icon="Find" Text="查询面板" OnClick="btnShow_Click"> <f:Button ID="btnShow" runat="server" Icon=" Zoom" Text="查询面板" OnClick="btnShow_Click">
</f:Button> </f:Button>
<f:ToolbarSeparator runat="server" /> <f:ToolbarSeparator runat="server" />
<f:FileUpload runat="server" ID="FileUp" EmptyText="请选择要货单据" Required="true" Width="200" ButtonIcon="Add" ShowRedStar="true" > </f:FileUpload> <f:FileUpload runat="server" ID="FileUp" EmptyText="请选择要货单据" Required="true" Width="200" ButtonIcon="Add" ShowRedStar="true" > </f:FileUpload>
@ -67,7 +67,9 @@
<f:FormRow runat="server"> <f:FormRow runat="server">
<Items> <Items>
<f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo" /> <f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite" Hidden="true" /> <f:DropDownList runat="server" ID="DropDownList1" Label="地点" DataTextField="FactoryName" DataValueField=" ErpDomain">
</f:DropDownList>
<%-- <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite" Hidden="true" />--%>
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1" Hidden="true" /> <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2" Hidden="true" /> <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3" Hidden="true" /> <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3" Hidden="true" />
@ -115,6 +117,7 @@
<f:Grid ID = "Grid_V_TB_ASK" EnableCollapse = "true" ShowBorder = "true" ShowHeader = "true" runat ="server" EnableCheckBoxSelect="true" EnableTextSelection="true" <f:Grid ID = "Grid_V_TB_ASK" EnableCollapse = "true" ShowBorder = "true" ShowHeader = "true" runat ="server" EnableCheckBoxSelect="true" EnableTextSelection="true"
DataKeyNames = "UID,PoBillNum,AskBillNum,VendId,Site,Buyer,BuyerPhone,State,Remark,VendName,State_DESC,ModType_DESC,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,GUID,ModType" 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" BoxFlex="1" AllowSorting="true" BoxFlex="1"
PageSize="100"
OnRowDataBound="Grid_V_TB_ASK_RowDataBound" OnRowDataBound="Grid_V_TB_ASK_RowDataBound"
CssClass="maingrid" EnableRowDoubleClickEvent="True" OnSort="Grid_V_TB_ASK_Sort" SortField="State" CssClass="maingrid" EnableRowDoubleClickEvent="True" OnSort="Grid_V_TB_ASK_Sort" SortField="State"
IsDatabasePaging="True" AllowPaging="True" OnRowDoubleClick="Grid_V_TB_ASK_RowDoubleClick" IsDatabasePaging="True" AllowPaging="True" OnRowDoubleClick="Grid_V_TB_ASK_RowDoubleClick"

9
SCP/Views/PlanData/SCP_ASK.aspx.cs

@ -23,6 +23,7 @@ using System.IO;
using CK.SCP.Models.ScpEntity.ExcelImportEntity; using CK.SCP.Models.ScpEntity.ExcelImportEntity;
using CK.SCP.Models.ScpEntity.ExcelExportEnttity; using CK.SCP.Models.ScpEntity.ExcelExportEnttity;
using System.Drawing; using System.Drawing;
using System.Linq.Dynamic;
namespace SCP.PlanData namespace SCP.PlanData
{ {
@ -55,11 +56,12 @@ namespace SCP.PlanData
var column2= Grid_V_TB_ASK.FindColumn("EndTime"); var column2= Grid_V_TB_ASK.FindColumn("EndTime");
column2.HeaderText = "需求日期"; column2.HeaderText = "需求日期";
column2.Hidden = false; column2.Hidden = false;
} }
} }
if (CurrentUser.Name == "admin" || CurrentUser.RoleList.Contains("分厂管理员")) if (CurrentUser.Name == "admin" || CurrentUser.RoleList.Contains("分厂管理员"))
{ {
btnDelete.Hidden = false; btnDelete.Hidden = false;
} }
BindAsk(); BindAsk();
@ -78,6 +80,9 @@ namespace SCP.PlanData
public void SearchV_TB_ASKData(Action<IQueryable<V_TB_ASK>> p_action) public void SearchV_TB_ASKData(Action<IQueryable<V_TB_ASK>> p_action)
{ {
var ls = SCPDB.TB_FACTORY.Where(p => p.ErpDomain == CurrentUser.UsedDomain).ToList();
DropDownList1.DataSource = ls;
DropDownList1.DataBind();
V_TB_ASK _entity = new V_TB_ASK(); V_TB_ASK _entity = new V_TB_ASK();
_entity.IsDeleted = false; _entity.IsDeleted = false;
_entity.PoBillNum = TXT_BillNo.Text; _entity.PoBillNum = TXT_BillNo.Text;
@ -85,7 +90,7 @@ namespace SCP.PlanData
_entity.State_DESC = TXT_Site_Desc.Text; _entity.State_DESC = TXT_Site_Desc.Text;
_entity.AskBillNum = TXT_AskBill.Text; _entity.AskBillNum = TXT_AskBill.Text;
_entity.ErpBillNum = TXT_ProjectId.Text; _entity.ErpBillNum = TXT_ProjectId.Text;
_entity.SubSite = TXT_SubSite.Text; _entity.SubSite = DropDownList1.SelectedValue;
_entity.Extend1 = TXT_Extend1.Text; _entity.Extend1 = TXT_Extend1.Text;
_entity.Extend2 = TXT_Extend2.Text; _entity.Extend2 = TXT_Extend2.Text;
_entity.Extend3 = TXT_Extend3.Text; _entity.Extend3 = TXT_Extend3.Text;

4
SCP/Views/PlanData/SCP_ASK.aspx.designer.cs

@ -204,13 +204,13 @@ namespace SCP.PlanData
protected global::FineUI.TextBox TXT_BillNo; protected global::FineUI.TextBox TXT_BillNo;
/// <summary> /// <summary>
/// TXT_SubSite 控件。 /// DropDownList1 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TXT_SubSite; protected global::FineUI.DropDownList DropDownList1;
/// <summary> /// <summary>
/// TXT_Extend1 控件。 /// TXT_Extend1 控件。

4
SCP/Views/PlanData/SCP_ASN_DETAIL_View.aspx

@ -62,7 +62,7 @@
</Items> </Items>
</f:Form> </f:Form>
<f:Grid ID="Grid_V_TB_ASN_DETAIL" ShowBorder="true" ShowHeader="true" PageSize="15" BoxFlex="1" CssClass="maingrid" <f:Grid ID="Grid_V_TB_ASN_DETAIL" ShowBorder="true" ShowHeader="true" PageSize="20" BoxFlex="1" CssClass="maingrid"
runat="server" DataKeyNames="UID,PoBillNum,PoLine,PartCode,PoUnit,LocUnit,Price,Currency,PackQty,UnConv,DockCode,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,PartDesc1,CurrencyDesc,Site,VendName,PartDesc2,AsnBillNum,Qty,VendBatch,ProduceDate,Batch,VendId,AskBillNum,CanQty,Guid,ReceivedPort" runat="server" DataKeyNames="UID,PoBillNum,PoLine,PartCode,PoUnit,LocUnit,Price,Currency,PackQty,UnConv,DockCode,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,PartDesc1,CurrencyDesc,Site,VendName,PartDesc2,AsnBillNum,Qty,VendBatch,ProduceDate,Batch,VendId,AskBillNum,CanQty,Guid,ReceivedPort"
IsDatabasePaging="True" AllowPaging="True" IsDatabasePaging="True" AllowPaging="True"
EnableRowSelectEvent="True" AutoScroll="True" EnableRowSelectEvent="True" AutoScroll="True"
@ -76,7 +76,7 @@
</f:ToolbarText> </f:ToolbarText>
<f:DropDownList ID="ddlGridPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlGridPageSize_SelectedIndexChanged" <f:DropDownList ID="ddlGridPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlGridPageSize_SelectedIndexChanged"
runat="server"> runat="server">
<f:ListItem Text="20" Value="10" /> <f:ListItem Text="20" Value="20" />
<f:ListItem Text="40" Value="40" /> <f:ListItem Text="40" Value="40" />
<f:ListItem Text="80" Value="80" /> <f:ListItem Text="80" Value="80" />
<f:ListItem Text="100" Value="100" /> <f:ListItem Text="100" Value="100" />

22
SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx

@ -52,14 +52,14 @@
</f:TextBox> </f:TextBox>
<f:TextBox runat="server" Label="零件名称" ID="TextPartName"> <f:TextBox runat="server" Label="零件名称" ID="TextPartName">
</f:TextBox> </f:TextBox>
<%-- <f:TextBox runat="server" Label="子网站" ID="SubSite"> <f:TextBox runat="server" Label="子网站" ID="TextSubSite" Hidden="true">
</f:TextBox> </f:TextBox>
<f:TextBox runat="server" Label="子网站" ID="Extend1"> <f:TextBox runat="server" Label="子网站" ID="TextExtend1" Hidden="true">
</f:TextBox> </f:TextBox>
<f:TextBox runat="server" Label="子网站" ID="Extend2"> <f:TextBox runat="server" Label="子网站" ID="TextExtend2" Hidden="true">
</f:TextBox>
<f:TextBox runat="server" Label="子网站" ID="TextExtend3" Hidden="true">
</f:TextBox> </f:TextBox>
<f:TextBox runat="server" Label="子网站" ID="Extend3">
</f:TextBox> --%>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow ColumnWidths="25% 25% 25% 25%" ID="FormRow_3" runat="server"> <f:FormRow ColumnWidths="25% 25% 25% 25%" ID="FormRow_3" runat="server">
@ -91,7 +91,7 @@
</Rows> </Rows>
</f:Form> </f:Form>
<f:Grid ID="GridINCOM" ShowBorder="true" ShowHeader="true" PageSize="100" BoxFlex="1" CssClass="maingrid" <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" 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" IsDatabasePaging="true" AllowPaging="true" SortField="BeginTime" SortDirection="DESC" OnPageIndexChange="Grid_V_TB_INCOMPLETE_ASK_PageIndexChange"
AutoScroll="True" EnableRowDoubleClickEvent="True" > AutoScroll="True" EnableRowDoubleClickEvent="True" >
<PageItems> <PageItems>
@ -122,11 +122,11 @@
<f:BoundField Width = "100px" DataField = "ShipTime" 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 = "ValidityDays" HeaderText = "距到货日期(天)" />
<%-- <f:BoundField Width = "100px" DataField = "SubSite" HeaderText = "子网站" /> <f:BoundField Width = "100px" DataField = "SubSite" HeaderText = "子网站" />
<f:BoundField Width = "100px" DataField = "Extend1" HeaderText = "子网站" /> <f:BoundField Width = "100px" DataField = "Extend1" HeaderText = "子网站" Hidden="true"/>
<f:BoundField Width = "100px" DataField = "Extend2" HeaderText = "子网站" /> <f:BoundField Width = "100px" DataField = "Extend2" HeaderText = "子网站" Hidden="true"/>
<f:BoundField Width = "100px" DataField = "Extend3" HeaderText = "子网站" /> <f:BoundField Width = "100px" DataField = "Extend3" HeaderText = "子网站" Hidden="true" />
--%>
</Columns> </Columns>
</f:Grid> </f:Grid>
</Items> </Items>

20
SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs

@ -86,6 +86,22 @@ namespace SCP.PlanData
{ {
_entity.PartDesc1 = TextPartName.Text; _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 (!string.IsNullOrEmpty(CurrentUser.Name))
{ {
if (CurrentUser.Name != "admin") if (CurrentUser.Name != "admin")
@ -199,6 +215,10 @@ namespace SCP.PlanData
{ "EndTime", "到货日期" }, { "EndTime", "到货日期" },
{ "Buyer", "计划员" }, { "Buyer", "计划员" },
{ "ValidityDays", "距到货日期(天)" }, { "ValidityDays", "距到货日期(天)" },
{"SubSite","" },
{"Extend1","" },
{"Extend2","" },
{"Extend3","" },
}; };
string url = EntityListToExcel2003(cellheader, ret.Result.ToList(), "未完成订单明细"); string url = EntityListToExcel2003(cellheader, ret.Result.ToList(), "未完成订单明细");
} }

36
SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs

@ -185,6 +185,42 @@ namespace SCP.PlanData
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TextPartName; protected global::FineUI.TextBox TextPartName;
/// <summary>
/// TextSubSite 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TextSubSite;
/// <summary>
/// TextExtend1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TextExtend1;
/// <summary>
/// TextExtend2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TextExtend2;
/// <summary>
/// TextExtend3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.TextBox TextExtend3;
/// <summary> /// <summary>
/// FormRow_3 控件。 /// FormRow_3 控件。
/// </summary> /// </summary>

4
SCP/Views/PlanData/SCP_PART_LIFE.aspx

@ -32,7 +32,7 @@
<f:FormRow runat="server" ColumnWidths="33% 33% 33%"> <f:FormRow runat="server" ColumnWidths="33% 33% 33%">
<Items> <Items>
<f:TextBox runat = "server" Label = "计划员" EmptyText = "" ID = "TXT_Buyer" /> <f:TextBox runat = "server" Label = "计划员" EmptyText = "" ID = "TXT_Buyer" />
<f:Button ID="btnSearch" runat="server" Text="查询" Icon="SystemSearch" OnClick="btnSearch_Click" > <f:Button ID="btnSearch" runat="server" Text="查询" Icon=" Zoom" OnClick="btnSearch_Click" >
</f:Button> </f:Button>
</Items> </Items>
</f:FormRow> </f:FormRow>
@ -45,7 +45,7 @@
DataKeyNames = "UID,PoBillNum,PoLine,PartCode,PlanQty,ShippedQty,ReceivedQty,RejectQty,BeginTime,EndTime,PoUnit,LocUnit,Price,Currency,PackQty,UnConv,DockCode,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,PartDesc1,CurrencyDesc,ErpBillNum,ModType,Contacter,Site,Buyer,BuyerPhone,VendName,PartDesc2,TempQty,PublishQty" DataKeyNames = "UID,PoBillNum,PoLine,PartCode,PlanQty,ShippedQty,ReceivedQty,RejectQty,BeginTime,EndTime,PoUnit,LocUnit,Price,Currency,PackQty,UnConv,DockCode,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,PartDesc1,CurrencyDesc,ErpBillNum,ModType,Contacter,Site,Buyer,BuyerPhone,VendName,PartDesc2,TempQty,PublishQty"
SortField="PoBillNum" SortField="PoBillNum"
AllowPaging="True" EnableRowDoubleClickEvent="true" AllowPaging="True" EnableRowDoubleClickEvent="true"
IsDatabasePaging="true" PageSize="200" OnPageIndexChange="Grid_V_TB_PO_DETAIL_PageIndexChange" OnRowSelect="Grid_V_TB_PO_DETAIL_RowSelect" OnRowDoubleClick="Grid_V_TB_PO_DETAIL_RowDoubleClick" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid_V_TB_PO_DETAIL_PageIndexChange" OnRowSelect="Grid_V_TB_PO_DETAIL_RowSelect" OnRowDoubleClick="Grid_V_TB_PO_DETAIL_RowDoubleClick"
> >
<PageItems> <PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server"> <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">

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

@ -68,6 +68,7 @@ namespace SCP.Views.PlanData
protected void Grid_V_TB_PO_DETAIL_PageIndexChange(object sender, GridPageEventArgs e) protected void Grid_V_TB_PO_DETAIL_PageIndexChange(object sender, GridPageEventArgs e)
{ {
BindData(); BindData();
} }
@ -88,6 +89,7 @@ namespace SCP.Views.PlanData
protected void ddlGridPageSize_SelectedIndexChanged(object sender, EventArgs e) protected void ddlGridPageSize_SelectedIndexChanged(object sender, EventArgs e)
{ {
Grid_V_TB_PO_DETAIL.PageSize = Convert.ToInt32(ddlGridPageSize.SelectedValue);
BindData(); BindData();
} }

3
SCP/Views/PlanData/SCP_PO.aspx

@ -63,7 +63,8 @@
<f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%"> <f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%">
<Items> <Items>
<f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo" /> <f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite" Hidden="true"/> <f:DropDownList runat="server" ID="DropDownList1" Label="地点" DataTextField="FactoryName" DataValueField=" ErpDomain">
</f:DropDownList>
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1" Hidden="true" /> <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2" Hidden="true"/> <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2" Hidden="true"/>
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3" Hidden="true" /> <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3" Hidden="true" />

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

@ -48,7 +48,10 @@ namespace SCP.PlanData
} }
public void SearchV_TB_PO(Action<IQueryable<V_TB_PO>> p_action) public void SearchV_TB_PO(Action<IQueryable<V_TB_PO>> p_action)
{ {
var ls = SCPDB.TB_FACTORY.Where(p => p.ErpDomain == CurrentUser.UsedDomain).ToList();
DropDownList1.DataSource = ls;
DropDownList1.DataBind();
V_TB_PO _entity = new V_TB_PO(); V_TB_PO _entity = new V_TB_PO();
_entity.IsDeleted = false; _entity.IsDeleted = false;
@ -80,7 +83,7 @@ namespace SCP.PlanData
_entity.UserInAddress = CurrentUser.FactoryList; _entity.UserInAddress = CurrentUser.FactoryList;
_entity.UserInVendIds = CurrentUser.VenderList; _entity.UserInVendIds = CurrentUser.VenderList;
_entity.PartCode = TXT_PartCode.Text; _entity.PartCode = TXT_PartCode.Text;
_entity.SubSite = TXT_SubSite.Text; _entity.SubSite = DropDownList1.SelectedValue;
_entity.Extend1 = TXT_Extend1.Text; _entity.Extend1 = TXT_Extend1.Text;
_entity.Extend2 = TXT_Extend2.Text; _entity.Extend2 = TXT_Extend2.Text;
_entity.Extend3 = TXT_Extend3.Text; _entity.Extend3 = TXT_Extend3.Text;

4
SCP/Views/PlanData/SCP_PO.aspx.designer.cs

@ -150,13 +150,13 @@ namespace SCP.PlanData
protected global::FineUI.TextBox TXT_BillNo; protected global::FineUI.TextBox TXT_BillNo;
/// <summary> /// <summary>
/// TXT_SubSite 控件。 /// DropDownList1 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TXT_SubSite; protected global::FineUI.DropDownList DropDownList1;
/// <summary> /// <summary>
/// TXT_Extend1 控件。 /// TXT_Extend1 控件。

5
SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx

@ -43,7 +43,8 @@
</f:FormRow> </f:FormRow>
<f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%"> <f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%">
<Items> <Items>
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1" Hidden="true" /> <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2" Hidden="true" /> <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3" Hidden="true" /> <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3" Hidden="true" />
@ -56,7 +57,7 @@
<f:TextBox runat = "server" Label = "发往地点" EmptyText = "" ID = "TXT_Site" /> <f:TextBox runat = "server" Label = "发往地点" EmptyText = "" ID = "TXT_Site" />
<%-- <f:DropDownList ID="DDL_PORT" DataTextField="PORT_DESCRIPTION" DataValueField="PORT_NO" Required="true" runat="server" Label="收货口"> <%-- <f:DropDownList ID="DDL_PORT" DataTextField="PORT_DESCRIPTION" DataValueField="PORT_NO" Required="true" runat="server" Label="收货口">
</f:DropDownList>--%> </f:DropDownList>--%>
<f:TextBox ID="txtRemark" runat="server" Label="备注" Text=""> <f:TextBox ID="txtRemark" runat="server" Label="备注" Text="">

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

@ -156,7 +156,7 @@ namespace SCP.PlanData
protected void btnRelease_Click(object sender, EventArgs e) protected void btnRelease_Click(object sender, EventArgs e)
{ {
var qadOrder = Session["order"] as V_TB_PO; var qadOrder = Session["order"] as V_TB_PO;
qadOrder.SubSite = TXT_SubSite.Text; qadOrder.SubSite =TXT_SubSite.Text;
qadOrder.Extend1 = TXT_Extend1.Text; qadOrder.Extend1 = TXT_Extend1.Text;
qadOrder.Extend2 = TXT_Extend2.Text; qadOrder.Extend2 = TXT_Extend2.Text;
qadOrder.Extend3 = TXT_Extend3.Text; qadOrder.Extend3 = TXT_Extend3.Text;

5
SCP/Views/PlanData/SCP_PO_DETAIL_OUT.aspx

@ -59,7 +59,7 @@
SortField="PoLine" SortField="PoLine"
BoxFlex="1" BoxFlex="1"
AllowPaging="True" AllowPaging="True"
IsDatabasePaging="true" PageSize="50" OnPageIndexChange="Grid_V_TB_PO_DETAIL_PageIndexChange"> IsDatabasePaging="true" PageSize="500" OnPageIndexChange="Grid_V_TB_PO_DETAIL_PageIndexChange">
<PageItems> <PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server"> <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator> </f:ToolbarSeparator>
@ -67,8 +67,7 @@
</f:ToolbarText> </f:ToolbarText>
<f:DropDownList ID="ddlGridPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlGridPageSize_SelectedIndexChanged" <f:DropDownList ID="ddlGridPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlGridPageSize_SelectedIndexChanged"
runat="server"> runat="server">
<f:ListItem Text="50" Value="50" />
<f:ListItem Text="100" Value="100" />
<f:ListItem Text="500" Value="500" /> <f:ListItem Text="500" Value="500" />
<f:ListItem Text="1000" Value="1000" /> <f:ListItem Text="1000" Value="1000" />
</f:DropDownList> </f:DropDownList>

21
SCP/Views/PlanData/SCP_PO_EXTEND.aspx

@ -52,9 +52,8 @@
</f:Button> </f:Button>
<f:ToolbarSeparator runat="server" /> <f:ToolbarSeparator runat="server" />
<f:Button ID="BTN_CREATE" runat="server" EnablePostBack="True" Text="创建看板" Icon="Add" OnClick="BTN_CREATE_Click" > <f:Button ID="BTN_CREATE" runat="server" EnablePostBack="True" Text="创建看板" Icon="Add" OnClick="BTN_CREATE_Click" >
</f:Button> </f:Button>
<f:Button ID="btnShow" runat="server" Text="显示查询面板" Icon="Find" OnClick="btnShow_Click">
<f:Button ID="btnShow" runat="server" Text="显示查询面板" OnClick="btnShow_Click">
</f:Button> </f:Button>
<f:Button ID="btnModeType1" runat="server" Text="日程单" Icon="Reload" OnClick="btnModeType1_Click" > <f:Button ID="btnModeType1" runat="server" Text="日程单" Icon="Reload" OnClick="btnModeType1_Click" >
</f:Button> </f:Button>
@ -73,12 +72,14 @@
<f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%"> <f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%">
<Items> <Items>
<f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo" /> <f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_SubSite" /> <f:DropDownList runat="server" ID="DropDownList1" Label="地点" DataTextField="FactoryName" DataValueField=" ErpDomain">
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend1" /> </f:DropDownList>
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend2" /> <%-- <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_SubSite" />--%>
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend3" /> <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend1" Hidden="true" />
<f:TextBox runat = "server" Label = "供应商编码" EmptyText = "" ID = "TXT_Vendid" /> <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend2" Hidden="true" />
<f:TextBox runat = "server" Label = "供应商名称" EmptyText = "" ID = "TXT_VendName" /> <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TxT_Extend3" Hidden="true" />
<f:TextBox runat = "server" Label = "供应商编码" EmptyText = "" ID = "TXT_Vendid" />
<f:TextBox runat = "server" Label = "供应商名称" EmptyText = "" ID = "TXT_VendName" />
<f:TextBox runat = "server" Label = "项目编码" EmptyText = "" ID = "TXT_ProjectId" /> <f:TextBox runat = "server" Label = "项目编码" EmptyText = "" ID = "TXT_ProjectId" />
</Items> </Items>
</f:FormRow> </f:FormRow>
@ -105,7 +106,7 @@
</f:FormRow> </f:FormRow>
</Rows> </Rows>
</f:Form> </f:Form>
<f:Grid ID = "Grid_V_TB_PO" ColumnWidth="45%" EnableCollapse = "true" ShowBorder = "true" ShowHeader = "true" runat ="server" EnableCheckBoxSelect = "true" DataKeyNames = "UID,PoBillNum,ErpBillNum,VendId,ModType,Contacter,Site,Buyer,BuyerPhone,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,VendName,State_DESC,ModType_DESC" <f:Grid ID = "Grid_V_TB_PO" ColumnWidth="45%" PageSize="50" EnableCollapse = "true" ShowBorder = "true" ShowHeader = "true" runat ="server" EnableCheckBoxSelect = "true" DataKeyNames = "UID,PoBillNum,ErpBillNum,VendId,ModType,Contacter,Site,Buyer,BuyerPhone,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,VendName,State_DESC,ModType_DESC"
CssClass="maingrid" EnableRowDoubleClickEvent="True" OnSort="Grid_V_TB_PO_Sort" SortField="BeginTime" CssClass="maingrid" EnableRowDoubleClickEvent="True" OnSort="Grid_V_TB_PO_Sort" SortField="BeginTime"
IsDatabasePaging="True" AllowPaging="True" OnRowSelect="Grid_V_TB_PO_RowSelect" EnableRowSelectEvent="true" IsDatabasePaging="True" AllowPaging="True" OnRowSelect="Grid_V_TB_PO_RowSelect" EnableRowSelectEvent="true"
AutoScroll="True" SortDirection="DESC" OnPageIndexChange="Grid_V_TB_PO_PageIndexChange" > AutoScroll="True" SortDirection="DESC" OnPageIndexChange="Grid_V_TB_PO_PageIndexChange" >

10
SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs

@ -49,7 +49,11 @@ namespace SCP.PlanData
} }
public void SearchV_TB_PO(Action<IQueryable<V_TB_PO>> p_action) public void SearchV_TB_PO(Action<IQueryable<V_TB_PO>> p_action)
{ {
var ls=SCPDB.TB_FACTORY.Where(p => p.ErpDomain == CurrentUser.UsedDomain).ToList();
DropDownList1.DataSource = ls;
DropDownList1.DataBind();
V_TB_PO _entity = new V_TB_PO(); V_TB_PO _entity = new V_TB_PO();
_entity.IsDeleted = false; _entity.IsDeleted = false;
if (this.DP_StartDate.SelectedDate != null) if (this.DP_StartDate.SelectedDate != null)
@ -73,7 +77,7 @@ namespace SCP.PlanData
} }
_entity.ErpBillNum = TXT_ProjectId.Text; _entity.ErpBillNum = TXT_ProjectId.Text;
_entity.SubSite = TxT_SubSite.Text; _entity.SubSite = DropDownList1.SelectedValue;
_entity.Extend1 = TxT_Extend1.Text; _entity.Extend1 = TxT_Extend1.Text;
_entity.Extend2 = TxT_Extend2.Text; _entity.Extend2 = TxT_Extend2.Text;
_entity.Extend3 = TxT_Extend3.Text; _entity.Extend3 = TxT_Extend3.Text;
@ -105,7 +109,7 @@ namespace SCP.PlanData
protected void Grid_V_TB_PO_Sort(object sender, FineUI.GridSortEventArgs e) protected void Grid_V_TB_PO_Sort(object sender, FineUI.GridSortEventArgs e)
{ {
} }
protected void btnOutput_Click(object sender, EventArgs e) protected void btnOutput_Click(object sender, EventArgs e)

4
SCP/Views/PlanData/SCP_PO_EXTEND.aspx.designer.cs

@ -132,13 +132,13 @@ namespace SCP.PlanData
protected global::FineUI.TextBox TXT_BillNo; protected global::FineUI.TextBox TXT_BillNo;
/// <summary> /// <summary>
/// TxT_SubSite 控件。 /// DropDownList1 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TxT_SubSite; protected global::FineUI.DropDownList DropDownList1;
/// <summary> /// <summary>
/// TxT_Extend1 控件。 /// TxT_Extend1 控件。

2
SCP/Views/PlanData/SCP_PO_PLAN_EXTEND.aspx

@ -18,7 +18,7 @@
<f:Toolbar ID="Toolbar2" runat="server"> <f:Toolbar ID="Toolbar2" runat="server">
<Items> <Items>
<f:Button ID="btnShow" runat="server" Text="显示查询面板" OnClick="btnShow_Click"> <f:Button ID="btnShow" runat="server" Text="显示查询面板" Icon="Find" OnClick="btnShow_Click">
</f:Button> </f:Button>
<f:ToolbarSeparator runat="server" /> <f:ToolbarSeparator runat="server" />
</Items> </Items>

9
SCP/Views/SupplierData/SCP_ASK.aspx

@ -20,7 +20,7 @@
<f:Toolbar ID="Toolbar2" runat="server"> <f:Toolbar ID="Toolbar2" runat="server">
<Items> <Items>
<f:ToolbarSeparator runat="server" /> <f:ToolbarSeparator runat="server" />
<f:Button ID="button3" runat="server" EnablePostBack="false" Text="刷新" Icon="Add" OnClientClick="location.reload();"> <f:Button ID="button3" runat="server" EnablePostBack="false" Text="刷新" Icon="Reload" OnClientClick="location.reload();">
</f:Button> </f:Button>
<f:ToolbarSeparator runat="server" /> <f:ToolbarSeparator runat="server" />
<f:Button ID="btnOutput" runat="server" Text="导出" Icon="PageExcel" OnClick="btnOutput_Click" > <f:Button ID="btnOutput" runat="server" Text="导出" Icon="PageExcel" OnClick="btnOutput_Click" >
@ -31,7 +31,7 @@
</f:Button> </f:Button>
<f:Button ID="btn" runat="server" Text="生成发货单(默认全发)" Icon="Add" OnClick="btn_Click" OnClientClick="if(!confirm('是否要将剩余零件,全部生成到发货单,请确认标包数量是否准确,发货数量必须与物料实际数量一致?'))return false;" > <f:Button ID="btn" runat="server" Text="生成发货单(默认全发)" Icon="Add" OnClick="btn_Click" OnClientClick="if(!confirm('是否要将剩余零件,全部生成到发货单,请确认标包数量是否准确,发货数量必须与物料实际数量一致?'))return false;" >
</f:Button> </f:Button>
<f:Button ID="btnShow" runat="server" Text="查询面板" Icon="Find" OnClick="btnShow_Click"> <f:Button ID="btnShow" runat="server" Text="查询面板" Icon="Zoom" OnClick="btnShow_Click">
</f:Button> </f:Button>
<f:Button ID="Button6" runat="server" Text="全部" Icon="Reload" OnClick="Button6_Click" > <f:Button ID="Button6" runat="server" Text="全部" Icon="Reload" OnClick="Button6_Click" >
</f:Button> </f:Button>
@ -57,7 +57,8 @@
<f:FormRow runat="server" ID="FormRow_1"> <f:FormRow runat="server" ID="FormRow_1">
<Items> <Items>
<f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo" /> <f:TextBox runat = "server" Label = "订单编号" EmptyText = "" ID = "TXT_BillNo" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_SubSite" Hidden="true" /> <f:DropDownList runat="server" ID="DropDownList1" Label="地点" DataTextField="FactoryName" DataValueField=" ErpDomain">
</f:DropDownList>
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1" Hidden="true" /> <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend1" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2" Hidden="true" /> <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend2" Hidden="true" />
<f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3" Hidden="true" /> <f:TextBox runat = "server" Label = "子网站" EmptyText = "" ID = "TXT_Extend3" Hidden="true" />
@ -95,7 +96,7 @@
</Items> </Items>
</f:GroupPanel> </f:GroupPanel>
<f:Grid ID = "Grid_V_TB_ASK" EnableCollapse = "true" ShowBorder = "true" ShowHeader = "true" runat ="server" EnableCheckBoxSelect="true" <f:Grid ID = "Grid_V_TB_ASK" PageSize="50" 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" DataKeyNames = "UID,PoBillNum,AskBillNum,VendId,Site,Buyer,BuyerPhone,State,Remark,VendName,State_DESC,ModType_DESC,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,GUID"
CssClass="maingrid" EnableRowDoubleClickEvent="True" OnSort="Grid_V_TB_ASK_Sort" SortField="CreateTime" CssClass="maingrid" EnableRowDoubleClickEvent="True" OnSort="Grid_V_TB_ASK_Sort" SortField="CreateTime"
IsDatabasePaging="True" AllowPaging="True" OnRowDoubleClick="Grid_V_TB_ASK_RowDoubleClick" IsDatabasePaging="True" AllowPaging="True" OnRowDoubleClick="Grid_V_TB_ASK_RowDoubleClick"

5
SCP/Views/SupplierData/SCP_ASK.aspx.cs

@ -83,6 +83,9 @@ namespace SCP.Views.SupplierData
} }
public void SearchV_TB_ASKData(Action<IQueryable<V_TB_ASK>> p_action) public void SearchV_TB_ASKData(Action<IQueryable<V_TB_ASK>> p_action)
{ {
var ls = SCPDB.TB_FACTORY.Where(p => p.ErpDomain == CurrentUser.UsedDomain).ToList();
DropDownList1.DataSource = ls;
DropDownList1.DataBind();
V_TB_ASK _entity = new V_TB_ASK(); V_TB_ASK _entity = new V_TB_ASK();
_entity.IsDeleted = false; _entity.IsDeleted = false;
_entity.PoBillNum = TXT_BillNo.Text; _entity.PoBillNum = TXT_BillNo.Text;
@ -90,7 +93,7 @@ namespace SCP.Views.SupplierData
_entity.State_DESC = TXT_Site_Desc.Text; _entity.State_DESC = TXT_Site_Desc.Text;
_entity.AskBillNum = TXT_AskBillNo.Text; _entity.AskBillNum = TXT_AskBillNo.Text;
_entity.ErpBillNum = TXT_ProjectId.Text; _entity.ErpBillNum = TXT_ProjectId.Text;
_entity.SubSite = TXT_SubSite.Text; _entity.SubSite = DropDownList1.SelectedValue;
_entity.Extend1 = TXT_Extend1.Text; _entity.Extend1 = TXT_Extend1.Text;
_entity.Extend2 = TXT_Extend2.Text; _entity.Extend2 = TXT_Extend2.Text;
_entity.Extend3 = TXT_Extend3.Text; _entity.Extend3 = TXT_Extend3.Text;

4
SCP/Views/SupplierData/SCP_ASK.aspx.designer.cs

@ -159,13 +159,13 @@ namespace SCP.Views.SupplierData
protected global::FineUI.TextBox TXT_BillNo; protected global::FineUI.TextBox TXT_BillNo;
/// <summary> /// <summary>
/// TXT_SubSite 控件。 /// DropDownList1 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TXT_SubSite; protected global::FineUI.DropDownList DropDownList1;
/// <summary> /// <summary>
/// TXT_Extend1 控件。 /// TXT_Extend1 控件。

13
SCP/Views/SupplierData/SCP_ASN.aspx

@ -16,11 +16,11 @@
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" runat="server"> <f:Toolbar ID="Toolbar2" runat="server">
<Items> <Items>
<f:Button ID="Button1" runat="server" EnablePostBack="True" Text="刷新" Icon="Add" OnClientClick="location.reload();"> <f:Button ID="Button1" runat="server" EnablePostBack="True" Text="刷新" Icon="Reload" OnClientClick="location.reload();">
</f:Button> </f:Button>
<f:Button ID="BtnOutPut" runat="server" EnablePostBack="True" Text="导出" Icon="Add" OnClick="BtnOutPut_Click"> <f:Button ID="BtnOutPut" runat="server" EnablePostBack="True" Text="导出" Icon="PageExcel" OnClick="BtnOutPut_Click">
</f:Button> </f:Button>
<f:Button ID="btnDetail" runat="server" EnablePostBack="True" Text="明细" Icon="Add" OnClick="btnDetail_Click"> <f:Button ID="btnDetail" runat="server" EnablePostBack="True" Text="明细" Icon="Find" OnClick="btnDetail_Click">
</f:Button> </f:Button>
<f:Button ID="btnBarCode" runat="server" EnablePostBack="True" Text="打印表皮标签" Icon="Printer" OnClick="btnBarCode_Click"> <f:Button ID="btnBarCode" runat="server" EnablePostBack="True" Text="打印表皮标签" Icon="Printer" OnClick="btnBarCode_Click">
</f:Button> </f:Button>
@ -29,11 +29,11 @@
</f:Button> </f:Button>
<%--<f:Button ID="btnDelete" runat="server" EnablePostBack="True" Text="删除" Icon="Add" OnClick="btnDelete_Click" Hidden="True"> <%--<f:Button ID="btnDelete" runat="server" EnablePostBack="True" Text="删除" Icon="Add" OnClick="btnDelete_Click" Hidden="True">
</f:Button>--%> </f:Button>--%>
<f:Button ID="btnShow" runat="server" Icon="Add" Text="显示查询面板" OnClick="btnShow_Click"> <f:Button ID="btnShow" runat="server" Icon="Find" Text="显示查询面板" OnClick="btnShow_Click">
</f:Button> </f:Button>
<f:Button ID="btnPallet" runat="server" Icon="Add" Text="创建托盘" OnClick="btnPallet_Click" > <f:Button ID="btnPallet" runat="server" Icon="Add" Text="创建托盘" OnClick="btnPallet_Click" >
</f:Button> </f:Button>
<f:Button ID="btnPalletDetail" runat="server" Icon="Add" Text="查看托盘" OnClick="btnPalletDetail_Click" > <f:Button ID="btnPalletDetail" runat="server" Icon=" Zoom" Text="查看托盘" OnClick="btnPalletDetail_Click" >
</f:Button> </f:Button>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
@ -61,7 +61,8 @@
<f:TextBox ID="TXT_VenderName" runat="server" Label="供应商"/> <f:TextBox ID="TXT_VenderName" runat="server" Label="供应商"/>
<f:TextBox ID="TXT_ASK" runat="server" Label="看板编号" /> <f:TextBox ID="TXT_ASK" runat="server" Label="看板编号" />
<f:TextBox ID="txtPO" runat="server" Label="订单编号" /> <f:TextBox ID="txtPO" runat="server" Label="订单编号" />
<f:TextBox ID="TXT_SubSite" runat="server" Label="子网站" Hidden="true" /> <f:DropDownList runat="server" ID="DropDownList1" Label="地点" DataTextField="FactoryName" DataValueField=" ErpDomain">
</f:DropDownList>
<f:TextBox ID="TXT_Extend1" runat="server" Label="子网站" Hidden="true" /> <f:TextBox ID="TXT_Extend1" runat="server" Label="子网站" Hidden="true" />
<f:TextBox ID="TXT_Extend2" runat="server" Label="子网站" Hidden="true" /> <f:TextBox ID="TXT_Extend2" runat="server" Label="子网站" Hidden="true" />
<f:TextBox ID="TXT_Extend3" runat="server" Label="子网站" Hidden="true" /> <f:TextBox ID="TXT_Extend3" runat="server" Label="子网站" Hidden="true" />

5
SCP/Views/SupplierData/SCP_ASN.aspx.cs

@ -60,6 +60,9 @@ namespace SCP.SupplierData
} }
public void SearchV_TB_ASN(Action<IQueryable<V_TB_ASN>> p_action) public void SearchV_TB_ASN(Action<IQueryable<V_TB_ASN>> p_action)
{ {
var ls = SCPDB.TB_FACTORY.Where(p => p.ErpDomain == CurrentUser.UsedDomain).ToList();
DropDownList1.DataSource = ls;
DropDownList1.DataBind();
V_TB_ASN _entity = new V_TB_ASN(); V_TB_ASN _entity = new V_TB_ASN();
_entity.IsDeleted = false; _entity.IsDeleted = false;
_entity.VendId = TXT_VenderName.Text; _entity.VendId = TXT_VenderName.Text;
@ -68,7 +71,7 @@ namespace SCP.SupplierData
_entity.AskBillNum = TXT_ASK.Text; _entity.AskBillNum = TXT_ASK.Text;
_entity.UserInVendIds = CurrentUser.VenderList; _entity.UserInVendIds = CurrentUser.VenderList;
_entity.UserInAddress = CurrentUser.FactoryList; _entity.UserInAddress = CurrentUser.FactoryList;
_entity.SubSite = TXT_SubSite.Text; _entity.SubSite = DropDownList1.SelectedValue;
_entity.Extend1 = TXT_Extend1.Text; _entity.Extend1 = TXT_Extend1.Text;
_entity.Extend2 = TXT_Extend2.Text; _entity.Extend2 = TXT_Extend2.Text;
_entity.Extend3 = TXT_Extend3.Text; _entity.Extend3 = TXT_Extend3.Text;

4
SCP/Views/SupplierData/SCP_ASN.aspx.designer.cs

@ -186,13 +186,13 @@ namespace SCP.SupplierData
protected global::FineUI.TextBox txtPO; protected global::FineUI.TextBox txtPO;
/// <summary> /// <summary>
/// TXT_SubSite 控件。 /// DropDownList1 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUI.TextBox TXT_SubSite; protected global::FineUI.DropDownList DropDownList1;
/// <summary> /// <summary>
/// TXT_Extend1 控件。 /// TXT_Extend1 控件。

2
SCP/Views/SupplierData/SCP_ASN_DETAIL.aspx.cs

@ -256,8 +256,6 @@ namespace SCP.SupplierData
{ {
} }
private List<V_TB_ASN_DETAIL> GetSelectedList() private List<V_TB_ASN_DETAIL> GetSelectedList()
{ {
List<V_TB_ASN_DETAIL> _list = new List<V_TB_ASN_DETAIL>(); List<V_TB_ASN_DETAIL> _list = new List<V_TB_ASN_DETAIL>();

2
SCP/Views/SupplierData/SCP_CLAIM.aspx

@ -28,7 +28,7 @@
</f:Button> </f:Button>
<f:Button ID="btnUnAccept" runat="server" Text="取消审批索赔" OnClick="btnUnAccept_Click" Icon="Delete"> <f:Button ID="btnUnAccept" runat="server" Text="取消审批索赔" OnClick="btnUnAccept_Click" Icon="Delete">
</f:Button> </f:Button>
<f:Button ID="btnSave" runat="server" Text="修改评审单" OnClick="btnSave_Click" Icon="TableSave"> <f:Button ID="btnSave" runat="server" Text="修改评审单" OnClick="btnSave_Click" Icon="BasketEdit">
</f:Button> </f:Button>

1
SCP/Views/SupplierData/SCP_CLAIM.aspx.cs

@ -289,6 +289,7 @@ namespace SCP.Views.SupplierData
protected void DropDownList1_SelectedIndexChanged(object sender, EventArgs e) protected void DropDownList1_SelectedIndexChanged(object sender, EventArgs e)
{ {
Grid_TM_HYANTOLIN_REVIEW.PageSize=Convert.ToInt32(DropDownList1.SelectedValue);
Bind(); Bind();
} }

4
SCP/Views/SupplierData/SCP_INVOICE.aspx

@ -24,7 +24,7 @@
<f:ToolbarSeparator runat="server" /> <f:ToolbarSeparator runat="server" />
<f:Button ID="btnOutput" runat="server" Text="导出" Icon="PageExcel" OnClick="btnOutput_OnClick"> <f:Button ID="btnOutput" runat="server" Text="导出" Icon="PageExcel" OnClick="btnOutput_OnClick">
</f:Button> </f:Button>
<f:Button ID="btnShow" runat="server" Text="显示查询面板" OnClick="btnShow_OnClick"> <f:Button ID="btnShow" runat="server" Text="显示查询面板" Icon="Find" OnClick="btnShow_OnClick">
</f:Button> </f:Button>
<f:DropDownList ID="DDL_VEND_LIST" DataValueField="VendId" DataTextField="VendName" runat="server" Label="供应商编码" EnableEdit="true" EnableMultiSelect="false" Hidden="true"/> <f:DropDownList ID="DDL_VEND_LIST" DataValueField="VendId" DataTextField="VendName" runat="server" Label="供应商编码" EnableEdit="true" EnableMultiSelect="false" Hidden="true"/>
<f:Button ID="BTN_INV" runat="server" EnablePostBack="True" Text="确认供应商发票管理" OnClick="BTN_INV_Click" Hidden="true"></f:Button> <f:Button ID="BTN_INV" runat="server" EnablePostBack="True" Text="确认供应商发票管理" OnClick="BTN_INV_Click" Hidden="true"></f:Button>
@ -90,7 +90,7 @@
</f:GroupPanel> </f:GroupPanel>
<f:Grid ID="Grid_V_TB_INVOICE" runat="server" EnableCheckBoxSelect="true" ShowHeader="False" <f:Grid ID="Grid_V_TB_INVOICE" runat="server" EnableCheckBoxSelect="true" ShowHeader="False"
AllowPaging="True" PageSize="100" OnPageIndexChange="Grid_V_TB_INVOICE_PageIndexChange" AllowPaging="True" PageSize="10" OnPageIndexChange="Grid_V_TB_INVOICE_PageIndexChange"
ShowBorder="False" OnRowDoubleClick="Grid_V_TB_INVOICE_RowDoubleClick" BoxFlex="1" ShowBorder="False" OnRowDoubleClick="Grid_V_TB_INVOICE_RowDoubleClick" BoxFlex="1"
DataKeyNames="UID, InvcBillNum" AllowSorting="true" IsDatabasePaging="true" SortField="State" OnRowDataBound="Grid_V_TB_INVOICE_RowDataBound" > DataKeyNames="UID, InvcBillNum" AllowSorting="true" IsDatabasePaging="true" SortField="State" OnRowDataBound="Grid_V_TB_INVOICE_RowDataBound" >
<PageItems> <PageItems>

2
SCP/Views/SupplierData/SCP_QUALITY.aspx

@ -26,7 +26,7 @@
</f:Button> </f:Button>
<f:Button ID="btnUnAccept" runat="server" Text="置为不索赔" OnClick="btnUnAccept_Click" Icon="Accept"> <f:Button ID="btnUnAccept" runat="server" Text="置为不索赔" OnClick="btnUnAccept_Click" Icon="Accept">
</f:Button> </f:Button>
<f:Button ID="btnClose" runat="server" Text="关闭" OnClick="btnClose_Click" Icon="PageExcel"> <f:Button ID="btnClose" runat="server" Text="关闭" OnClick="btnClose_Click" Icon="SystemClose">
</f:Button> </f:Button>
</Items> </Items>

6
SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx

@ -26,7 +26,7 @@
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" runat="server"> <f:Toolbar ID="Toolbar2" runat="server">
<Items> <Items>
<f:Button ID="Button1" runat="server" EnablePostBack="True" Text="刷新" Icon="Add" OnClientClick="location.reload();"> <f:Button ID="Button1" runat="server" EnablePostBack="True" Text="刷新" Icon="Reload" OnClientClick="location.reload();">
</f:Button> </f:Button>
<f:Button ID="btnCreate" runat="server" EnablePostBack="True" Text="生成发票" OnClick="btnCreate_OnClick" Icon="Add" Hidden="true"> <f:Button ID="btnCreate" runat="server" EnablePostBack="True" Text="生成发票" OnClick="btnCreate_OnClick" Icon="Add" Hidden="true">
</f:Button> </f:Button>
@ -34,11 +34,11 @@
</f:Button> </f:Button>
<f:Button ID="btn" runat="server" EnablePostBack="True" Text="补开发票" Icon="Add" Hidden="true"> <f:Button ID="btn" runat="server" EnablePostBack="True" Text="补开发票" Icon="Add" Hidden="true">
</f:Button> </f:Button>
<f:Button ID="Button2" runat="server" EnablePostBack="True" Text="导出" Icon="Add" OnClick="btnOutput_OnClick"> <f:Button ID="Button2" runat="server" EnablePostBack="True" Text="导出" Icon="PageExcel" OnClick="btnOutput_OnClick">
</f:Button> </f:Button>
<f:Button ID="btnCanIn" runat="server" EnablePostBack="True" Text="只看可开票零件" Icon="Zoom" OnClick="btnCanIn_Click" Hidden="true"> <f:Button ID="btnCanIn" runat="server" EnablePostBack="True" Text="只看可开票零件" Icon="Zoom" OnClick="btnCanIn_Click" Hidden="true">
</f:Button> </f:Button>
<f:Button ID="btnShow" runat="server" Text="查询面板" OnClick="btnShow_Click"> <f:Button ID="btnShow" runat="server" Text="查询面板" Icon="Zoom" OnClick="btnShow_Click">
</f:Button> </f:Button>
<f:ToolbarFill runat="server" Hidden="true"/> <f:ToolbarFill runat="server" Hidden="true"/>
<f:TextBox ID="tb_RecvBillNum" runat="server" Label="单据号" Hidden="true"/> <f:TextBox ID="tb_RecvBillNum" runat="server" Label="单据号" Hidden="true"/>

6
SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs

@ -73,9 +73,9 @@ namespace SCP.SupplierData
public void LoadData() public void LoadData()
{ {
// 每页记录数 // 每页记录数
Grid_V_TB_RECEIVE_LIST.PageSize = ConfigHelper.PageSize; //Grid_V_TB_RECEIVE_LIST.PageSize = ConfigHelper.PageSize;
ddlGridPageSize.SelectedValue = ConfigHelper.PageSize.ToString(); //ddlGridPageSize.SelectedValue = ConfigHelper.PageSize.ToString();
BindData(); //BindData();
} }
private void SearchData(Action<IQueryable<V_TB_RECEIVE_LIST>> p_action) private void SearchData(Action<IQueryable<V_TB_RECEIVE_LIST>> p_action)
{ {

4
SCP/Views/WarehouseData/SCP_INVOICE.aspx

@ -22,7 +22,7 @@
<f:ToolbarSeparator runat="server" /> <f:ToolbarSeparator runat="server" />
<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>
<f:Button ID="btnShow" runat="server" Text="显示查询面板" OnClick="btnShow_OnClick"> <f:Button ID="btnShow" runat="server" Text="显示查询面板" Icon="Find" OnClick="btnShow_OnClick">
</f:Button> </f:Button>
</Items> </Items>
</f:Toolbar> </f:Toolbar>
@ -72,7 +72,7 @@
<f:Grid ID="Grid_V_TB_INVOICE" runat="server" EnableCheckBoxSelect="true" <f:Grid ID="Grid_V_TB_INVOICE" runat="server" EnableCheckBoxSelect="true"
ShowHeader="False" SortField="State;CreateTime" ShowHeader="False" SortField="State;CreateTime"
AllowPaging="True" PageSize="100" OnPageIndexChange="Grid_V_TB_INVOICE_PageIndexChange" AllowPaging="True" PageSize="10" OnPageIndexChange="Grid_V_TB_INVOICE_PageIndexChange"
ShowBorder="False" OnRowDoubleClick="Grid_V_TB_INVOICE_RowDoubleClick" BoxFlex="1" ShowBorder="False" OnRowDoubleClick="Grid_V_TB_INVOICE_RowDoubleClick" BoxFlex="1"
DataKeyNames="UID, InvcBillNum,State_DESC,InvoiceNum,ExpressNum,VendName,Amount,Tax,TaxAmount,ContractPrice,BlancePrice,Total,CreateTime,Remark,VendId" AllowSorting="true" IsDatabasePaging="true" > DataKeyNames="UID, InvcBillNum,State_DESC,InvoiceNum,ExpressNum,VendName,Amount,Tax,TaxAmount,ContractPrice,BlancePrice,Total,CreateTime,Remark,VendId" AllowSorting="true" IsDatabasePaging="true" >
<PageItems> <PageItems>

2
SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx

@ -37,7 +37,7 @@
<f:FormRow runat="server" ColumnWidths="20% 20% 20% 20% 20%" > <f:FormRow runat="server" ColumnWidths="20% 20% 20% 20% 20%" >
<Items> <Items>
<f:Button ID="BtnSearch" runat="server" OnClick="BtnSearch_Click" Text="快速查找"> <f:Button ID="BtnSearch" runat="server" OnClick="BtnSearch_Click" Text="快速查找" Icon="Zoom">
</f:Button> </f:Button>
<f:Button ID="btnOutput" runat="server" Text="导出打印" OnClick="btnOutput_Click" Icon="PageExcel"></f:Button> <f:Button ID="btnOutput" runat="server" Text="导出打印" OnClick="btnOutput_Click" Icon="PageExcel"></f:Button>
<f:Button ID="btnPrint" runat="server" Text="打印报表" OnClick="btnPrint_Click" Icon="PageExcel"></f:Button> <f:Button ID="btnPrint" runat="server" Text="打印报表" OnClick="btnPrint_Click" Icon="PageExcel"></f:Button>

2
SCP/Views/沈阳金杯/SupplierData/SCP_RECEIVE_LIST.aspx

@ -33,7 +33,7 @@
</f:Button> </f:Button>
<f:Button ID="Button2" runat="server" EnablePostBack="True" Text="导出" Icon="Add" OnClick="btnOutput_OnClick"> <f:Button ID="Button2" runat="server" EnablePostBack="True" Text="导出" Icon="Add" OnClick="btnOutput_OnClick">
</f:Button> </f:Button>
<f:Button ID="btnShow" runat="server" Text="查询面板" OnClick="btnShow_Click"> <f:Button ID="btnShow" runat="server" Text="查询面板" Icon="Zoom" OnClick="btnShow_Click">
</f:Button> </f:Button>
<f:ToolbarFill runat="server" Hidden="true" /> <f:ToolbarFill runat="server" Hidden="true" />
<f:TextBox ID="tb_RecvBillNum" runat="server" Label="单据号" Hidden="true" /> <f:TextBox ID="tb_RecvBillNum" runat="server" Label="单据号" Hidden="true" />

18
UniApiGroup/Controller/OdbcApiQadController.cs

@ -381,6 +381,7 @@ namespace CK.SCP.GrupUniApi.Controller
scpRcv.PoBillNum = firstqadData.xxqad_prh_po_nbr;//采购单 scpRcv.PoBillNum = firstqadData.xxqad_prh_po_nbr;//采购单
//发货单号 //发货单号
scpRcv.Site = firstqadData.xxqad_prh_domain;//地点 scpRcv.Site = firstqadData.xxqad_prh_domain;//地点
scpRcv.SubSite = firstqadData.xxqad_prh_site;
scpRcv.VendId = firstqadData.xxqad_prh_vend;//供货商名称 scpRcv.VendId = firstqadData.xxqad_prh_vend;//供货商名称
scpRcv.ShipTime = firstqadData.xxqad_prh_date_ship;//收货日期 scpRcv.ShipTime = firstqadData.xxqad_prh_date_ship;//收货日期
scpRcv.ErpRecvBillNum = firstqadData.xxqad_prh_receiver; scpRcv.ErpRecvBillNum = firstqadData.xxqad_prh_receiver;
@ -445,6 +446,7 @@ namespace CK.SCP.GrupUniApi.Controller
scpRcvDetail.StdCost = qadData.xxqad_prh_std_cost != null ? qadData.xxqad_prh_std_cost.Value : 0; scpRcvDetail.StdCost = qadData.xxqad_prh_std_cost != null ? qadData.xxqad_prh_std_cost.Value : 0;
scpRcvDetail.Rate = qadData.xxqad_prh_curr_rate != null ? qadData.xxqad_prh_curr_rate.Value : 1; scpRcvDetail.Rate = qadData.xxqad_prh_curr_rate != null ? qadData.xxqad_prh_curr_rate.Value : 1;
scpRcvDetail.Site = qadData.xxqad_prh_domain; scpRcvDetail.Site = qadData.xxqad_prh_domain;
scpRcvDetail.SubSite = qadData.xxqad_prh_site;
scpRcvDetail.Tax = firstqadData.xxqad_prh_taxc; scpRcvDetail.Tax = firstqadData.xxqad_prh_taxc;
if (scpRcveDetailList.Count(p => if (scpRcveDetailList.Count(p =>
p.RecvBillNum == scpRcvDetail.RecvBillNum && p.RecvBillNum == scpRcvDetail.RecvBillNum &&
@ -536,6 +538,7 @@ namespace CK.SCP.GrupUniApi.Controller
} }
scpRcv.PoBillNum = firstqadData.xxqad_prh_po_nbr;//采购单 //发货单号 scpRcv.PoBillNum = firstqadData.xxqad_prh_po_nbr;//采购单 //发货单号
scpRcv.Site = firstqadData.xxqad_prh_domain;//地点 scpRcv.Site = firstqadData.xxqad_prh_domain;//地点
scpRcv.SubSite = firstqadData.xxqad_prh_site;//地点
scpRcv.VendId = firstqadData.xxqad_prh_vend;//供货商名称 scpRcv.VendId = firstqadData.xxqad_prh_vend;//供货商名称
scpRcv.ShipTime = firstqadData.xxqad_prh_date_ship;//收货日期 scpRcv.ShipTime = firstqadData.xxqad_prh_date_ship;//收货日期
scpRcv.ErpRecvBillNum = firstqadData.xxqad_prh_receiver; scpRcv.ErpRecvBillNum = firstqadData.xxqad_prh_receiver;
@ -552,7 +555,6 @@ namespace CK.SCP.GrupUniApi.Controller
p.PoBillNum == qadData.xxqad_prh_po_nbr && p.PoBillNum == qadData.xxqad_prh_po_nbr &&
p.PoLine == poLineNum && p.PoLine == poLineNum &&
p.PartCode == qadData.xxqad_prh_part p.PartCode == qadData.xxqad_prh_part
&& p.Site==qadData.xxqad_prh_domain && p.Site==qadData.xxqad_prh_domain
); );
@ -583,6 +585,7 @@ namespace CK.SCP.GrupUniApi.Controller
StdCost = qadData.xxqad_prh_std_cost != null ? qadData.xxqad_prh_std_cost.Value : 0, StdCost = qadData.xxqad_prh_std_cost != null ? qadData.xxqad_prh_std_cost.Value : 0,
Rate = qadData.xxqad_prh_curr_rate != null ? qadData.xxqad_prh_curr_rate.Value : 1, Rate = qadData.xxqad_prh_curr_rate != null ? qadData.xxqad_prh_curr_rate.Value : 1,
Site = qadData.xxqad_prh_domain, Site = qadData.xxqad_prh_domain,
SubSite=qadData.xxqad_prh_site,
Tax = firstqadData.xxqad_prh_taxc Tax = firstqadData.xxqad_prh_taxc
}; };
@ -593,6 +596,7 @@ namespace CK.SCP.GrupUniApi.Controller
scpRcvDetail.Rate = qadData.xxqad_prh_curr_rate != null ? qadData.xxqad_prh_curr_rate.Value : 1; scpRcvDetail.Rate = qadData.xxqad_prh_curr_rate != null ? qadData.xxqad_prh_curr_rate.Value : 1;
scpRcvDetail.CurAmt = qadData.xxqad_prh_curr_amt != null ? qadData.xxqad_prh_curr_amt.Value : 0; scpRcvDetail.CurAmt = qadData.xxqad_prh_curr_amt != null ? qadData.xxqad_prh_curr_amt.Value : 0;
scpRcvDetail.Site = qadData.xxqad_prh_domain; scpRcvDetail.Site = qadData.xxqad_prh_domain;
scpRcvDetail.SubSite = qadData.xxqad_prh_domain;
scpRcveDetailList.Add(scpRcvDetail); scpRcveDetailList.Add(scpRcvDetail);
qadData.xxqad_prh_scmread = ((int)UniApiState.).ToString(); qadData.xxqad_prh_scmread = ((int)UniApiState.).ToString();
@ -816,6 +820,7 @@ namespace CK.SCP.GrupUniApi.Controller
wmsPo.BuyerPhone = firstqadData.xxqad_pod_buyer_phone; wmsPo.BuyerPhone = firstqadData.xxqad_pod_buyer_phone;
wmsPo.UpdateTime = firstqadData.xxqad_pod_updatedt;//更新日期 wmsPo.UpdateTime = firstqadData.xxqad_pod_updatedt;//更新日期
wmsPo.UpdateUser = firstqadData.xxqad_pod_updateur;//更新用户 wmsPo.UpdateUser = firstqadData.xxqad_pod_updateur;//更新用户
wmsPo.SubSite = firstqadData.xxqad_pod_site;
foreach (var qadData in qadDataList) foreach (var qadData in qadDataList)
{ {
@ -844,15 +849,14 @@ namespace CK.SCP.GrupUniApi.Controller
wmsPoDetail.PoUnit = qadData.xxqad_pod_um;//采购单位 wmsPoDetail.PoUnit = qadData.xxqad_pod_um;//采购单位
wmsPoDetail.LocUnit = qadData.xxqad_pod_loc_um.ToUpper();//存储单位 wmsPoDetail.LocUnit = qadData.xxqad_pod_loc_um.ToUpper();//存储单位
wmsPoDetail.DockCode = qadData.xxqad_pod_loc; wmsPoDetail.DockCode = qadData.xxqad_pod_loc;
wmsPoDetail.Price = ScpCache.Config. == ProjectName..ToString() wmsPoDetail.Price = ScpCache.Config. == ProjectName..ToString()? 0: qadData.xxqad_pod_price;
? 0
: qadData.xxqad_pod_price;
wmsPoDetail.Currency = qadData.xxqad_pod_curr;//币种 wmsPoDetail.Currency = qadData.xxqad_pod_curr;//币种
wmsPoDetail.PackQty = qadData.xxqad_pod_qty_std;//标包数量 wmsPoDetail.PackQty = qadData.xxqad_pod_qty_std;//标包数量
wmsPoDetail.UnConv = qadData.xxqad_pod_um_conv;//转换率 wmsPoDetail.UnConv = qadData.xxqad_pod_um_conv;//转换率
wmsPoDetail.DockCode = qadData.xxqad_pod_loc; wmsPoDetail.DockCode = qadData.xxqad_pod_loc;
wmsPoDetail.State = Convert.ToInt32(qadData.xxqad_pod_status);//状态 wmsPoDetail.State = Convert.ToInt32(qadData.xxqad_pod_status);//状态
wmsPoDetail.Remark = qadData.xxqad_pod_domain;//备注 wmsPoDetail.Site = qadData.xxqad_pod_domain;//备注
wmsPoDetail.SubSite = qadData.xxqad_pod_site;
wmsPoDetail.CreateTime = firstqadData.xxqad_pod_createdt == null ? DateTime.Now : (DateTime)firstqadData.xxqad_pod_createdt;//创建日期 wmsPoDetail.CreateTime = firstqadData.xxqad_pod_createdt == null ? DateTime.Now : (DateTime)firstqadData.xxqad_pod_createdt;//创建日期
wmsPoDetail.CreateUser = firstqadData.xxqad_pod_createur;//创建用户 wmsPoDetail.CreateUser = firstqadData.xxqad_pod_createur;//创建用户
wmsPoDetail.UpdateTime = firstqadData.xxqad_pod_updatedt;//更新日期 wmsPoDetail.UpdateTime = firstqadData.xxqad_pod_updatedt;//更新日期
@ -1015,6 +1019,7 @@ namespace CK.SCP.GrupUniApi.Controller
VendId = firstqadData.xxqad_pod_vend.ToUpper(),//供应商编号 VendId = firstqadData.xxqad_pod_vend.ToUpper(),//供应商编号
Buyer = firstqadData.xxqad_pod_attn,//联系人 Buyer = firstqadData.xxqad_pod_attn,//联系人
Site = firstqadData.xxqad_pod_domain,//地点 Site = firstqadData.xxqad_pod_domain,//地点
SubSite=firstqadData.xxqad_pod_site,
State = (int)AskState.New,//状态 State = (int)AskState.New,//状态
CreateTime = firstqadData.xxqad_pod_createdt == null ? DateTime.Now : (DateTime)firstqadData.xxqad_pod_createdt,//创建日期 CreateTime = firstqadData.xxqad_pod_createdt == null ? DateTime.Now : (DateTime)firstqadData.xxqad_pod_createdt,//创建日期
CreateUser = firstqadData.xxqad_pod_buyer,//创建用户 CreateUser = firstqadData.xxqad_pod_buyer,//创建用户
@ -1069,7 +1074,8 @@ namespace CK.SCP.GrupUniApi.Controller
_taskDetail.UnConv = qadData.xxqad_pod_um_conv;//转换率 _taskDetail.UnConv = qadData.xxqad_pod_um_conv;//转换率
_taskDetail.DockCode = qadData.xxqad_pod_loc; _taskDetail.DockCode = qadData.xxqad_pod_loc;
_taskDetail.State = Convert.ToInt32(qadData.xxqad_pod_status);//状态 _taskDetail.State = Convert.ToInt32(qadData.xxqad_pod_status);//状态
_taskDetail.Remark = qadData.xxqad_pod_domain;//备注 _taskDetail.SubSite = qadData.xxqad_pod_site;//备注
_taskDetail.Site = qadData.xxqad_pod_domain;
_taskDetail.CreateTime = firstqadData.xxqad_pod_createdt == null ? DateTime.Now : (DateTime)firstqadData.xxqad_pod_createdt;//创建日期 _taskDetail.CreateTime = firstqadData.xxqad_pod_createdt == null ? DateTime.Now : (DateTime)firstqadData.xxqad_pod_createdt;//创建日期
_taskDetail.CreateUser = firstqadData.xxqad_pod_buyer;//创建用户 _taskDetail.CreateUser = firstqadData.xxqad_pod_buyer;//创建用户
_taskDetail.UpdateTime = firstqadData.xxqad_pod_updatedt;//更新日期 _taskDetail.UpdateTime = firstqadData.xxqad_pod_updatedt;//更新日期

1
UniApiGroup/Controller/OdbcApiScpController.cs

@ -240,6 +240,7 @@ namespace CK.SCP.GrupUniApi.Controller
xxscm_tx_batch = wmsData.VendBatch, xxscm_tx_batch = wmsData.VendBatch,
xxscm_tx_boxcode = wmsData.Barcode, xxscm_tx_boxcode = wmsData.Barcode,
xxscm_tx_qty_real = wmsData.Qty, xxscm_tx_qty_real = wmsData.Qty,
}; };
qadDataList.Add(qadData); qadDataList.Add(qadData);
} }

9
UniApiGroup/Controller/OdbcApiWmsController.cs

@ -9,6 +9,7 @@ using CK.SCP.Models.UniApiEntity;
using CK.SCP.Utils; using CK.SCP.Utils;
using System.Text; using System.Text;
using System.Data.Entity.Core; using System.Data.Entity.Core;
using CK.SCP.Models.ScpEntity.ExcelExportEnttity;
namespace CK.SCP.GrupUniApi.Controller namespace CK.SCP.GrupUniApi.Controller
{ {
@ -271,6 +272,7 @@ namespace CK.SCP.GrupUniApi.Controller
scpRcv.Site = firstqadData.xxwms_rc_domain;//地点 scpRcv.Site = firstqadData.xxwms_rc_domain;//地点
scpRcv.VendId = firstqadData.xxwms_rc_vend;//供货商名称 scpRcv.VendId = firstqadData.xxwms_rc_vend;//供货商名称
scpRcv.ShipTime = firstqadData.xxwms_rc_date_ship;//收货日期 scpRcv.ShipTime = firstqadData.xxwms_rc_date_ship;//收货日期
scpRcv.SubSite = !string.IsNullOrEmpty(firstqadData.xxwms_rc_site)? firstqadData.xxwms_rc_site: firstqadData.xxwms_rc_domain;
//var scpAsn = wdb.TF_ASN.FirstOrDefault(p => p.BillNum == scpRcv.AsnBillNum); //var scpAsn = wdb.TF_ASN.FirstOrDefault(p => p.BillNum == scpRcv.AsnBillNum);
var scpAsn = wdb.TB_ASN.Where(p => p.AsnBillNum== scpRcv.AsnBillNum && p.IsDeleted==false).ToList();//发货单主表订单号==收货单主表发货单号 var scpAsn = wdb.TB_ASN.Where(p => p.AsnBillNum== scpRcv.AsnBillNum && p.IsDeleted==false).ToList();//发货单主表订单号==收货单主表发货单号
@ -328,7 +330,8 @@ namespace CK.SCP.GrupUniApi.Controller
Qty = qadData.xxwms_rc_qty_total,//收货总量 Qty = qadData.xxwms_rc_qty_total,//收货总量
//DockCode = ?,//收货口 //DockCode = ?,//收货口
State = istate,// (int)FormState.关闭, State = istate,// (int)FormState.关闭,
Remark = firstqadData.xxwms_rc_domain, Site = firstqadData.xxwms_rc_domain,
SubSite = !string.IsNullOrEmpty(firstqadData.xxwms_rc_site) ? firstqadData.xxwms_rc_site : firstqadData.xxwms_rc_domain,
CreateTime = qadData.xxwms_rc_createdt == null ? DateTime.Now : (DateTime)qadData.xxwms_rc_createdt,//创建日期 CreateTime = qadData.xxwms_rc_createdt == null ? DateTime.Now : (DateTime)qadData.xxwms_rc_createdt,//创建日期
CreateUser = qadData.xxwms_rc_createur,//创建用户 CreateUser = qadData.xxwms_rc_createur,//创建用户
IsDeleted = false, IsDeleted = false,
@ -560,6 +563,7 @@ namespace CK.SCP.GrupUniApi.Controller
scpRcv.Site = firstqadData.xxwms_rt_domain;//地点 scpRcv.Site = firstqadData.xxwms_rt_domain;//地点
scpRcv.VendId = firstqadData.xxwms_rt_vend;//供货商名称 scpRcv.VendId = firstqadData.xxwms_rt_vend;//供货商名称
scpRcv.ShipTime = firstqadData.xxwms_rt_date_ship;//收货日期 scpRcv.ShipTime = firstqadData.xxwms_rt_date_ship;//收货日期
scpRcv.SubSite = !string.IsNullOrEmpty(firstqadData.xxwms_rt_site)? firstqadData.xxwms_rt_site: firstqadData.xxwms_rt_domain;
//var scpAsn = wdb.TF_ASN.FirstOrDefault(p => p.BillNum == scpRcv.AsnBillNum); //var scpAsn = wdb.TF_ASN.FirstOrDefault(p => p.BillNum == scpRcv.AsnBillNum);
var scpAsn = wdb.TB_ASN.FirstOrDefault(p => p.PoBillNum == scpRcv.AsnBillNum);//发货单主表订单号==退货单主表发货单号 var scpAsn = wdb.TB_ASN.FirstOrDefault(p => p.PoBillNum == scpRcv.AsnBillNum);//发货单主表订单号==退货单主表发货单号
if (scpAsn != null) if (scpAsn != null)
@ -600,7 +604,8 @@ namespace CK.SCP.GrupUniApi.Controller
LocUnit = qadData.xxwms_rt_loc_um,//基本单位 LocUnit = qadData.xxwms_rt_loc_um,//基本单位
Qty = qadData.xxwms_rt_qty_total,//退货总量 Qty = qadData.xxwms_rt_qty_total,//退货总量
State = istate,// (int)FormState.关闭, State = istate,// (int)FormState.关闭,
Remark = firstqadData.xxwms_rt_domain, Site = firstqadData.xxwms_rt_domain,
SubSite=firstqadData.xxwms_rt_site,
CreateTime = qadData.xxwms_rt_createdt == null ? DateTime.Now : (DateTime)qadData.xxwms_rt_createdt,//创建日期 CreateTime = qadData.xxwms_rt_createdt == null ? DateTime.Now : (DateTime)qadData.xxwms_rt_createdt,//创建日期
CreateUser = qadData.xxwms_rt_createur,//创建用户 CreateUser = qadData.xxwms_rt_createur,//创建用户
IsDeleted = false, IsDeleted = false,

Loading…
Cancel
Save