diff --git a/view/index.aspx.cs b/view/index.aspx.cs
index 06b3591..ddcd9da 100644
--- a/view/index.aspx.cs
+++ b/view/index.aspx.cs
@@ -12,8 +12,12 @@ public partial class index : Page
{
// if(!IsPostBack)
// Session[appScope.PagelevelObj] = this;
- if (!IsPostBack)
- bindData();
+
+ // if (!IsPostBack)
+ // bindData();
+
+ Response.Redirect("login.aspx");
+
}
private void InitializeComponent()
diff --git a/view/licenses.licx b/view/licenses.licx
index 4e6ad92..f853b11 100644
--- a/view/licenses.licx
+++ b/view/licenses.licx
@@ -1,2 +1,4 @@
+DevExpress.Patch.InMemoryPatch, DevExpress.Patch.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=7fc7bfca2443de66
+DevExpress.XtraCharts.Web.WebChartControl, DevExpress.XtraCharts.v16.2.Web, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.Web.ASPxPageControl, DevExpress.Web.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.Web.ASPxGridView, DevExpress.Web.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/view/masterPage.master b/view/masterPage.master
index 5472585..cdcc3eb 100644
--- a/view/masterPage.master
+++ b/view/masterPage.master
@@ -124,7 +124,7 @@
|
+ OnClick="ImageButton1_Click" ToolTip="ʾĵ" Width="32px" Visible="False" />
|
@@ -139,8 +139,10 @@
|
- ҳ
+ ҳ
+
|
@@ -198,7 +200,7 @@
{
now = new Date() ;
document.aspnetForm.thetime.value =now.toLocaleString() ;
-
+
setTimeout("showDate()",1000);
}
showDate();
diff --git a/view/masterPage.master.cs b/view/masterPage.master.cs
index dca0761..adef8bd 100644
--- a/view/masterPage.master.cs
+++ b/view/masterPage.master.cs
@@ -57,10 +57,11 @@ namespace ajax
// login.Visible = lem == null;
lbWelcome.Text = lem != null ? "ӭ" + lem.GetEmployee.em_name +",": "";
lkbtnLogin.Text = lem != null ? "˳" : "¼";
- lkIndex.Visible = lem != null;
+ // lkIndex.Visible = lem != null;
divAuhtority.Visible = lem != null;
lkDesktop.Visible = lem != null;
leftMenu.Visible = lem!=null;
+ lkkanban.Visible = lem != null;
ImageBtnHelp.Visible = leftMenu.Visible;
}
@@ -294,5 +295,9 @@ namespace ajax
string newWindow = "openwin('" + helpDoc + "');";
ScriptManager.RegisterStartupScript(UpdatePanel1, typeof(UpdatePanel), "alert", newWindow, true);
}
+ protected void lkkanban_Click(object sender, EventArgs e)
+ {
+ Response.Redirect("~/wms/Charts.aspx");
+ }
}
}
\ No newline at end of file
diff --git a/view/wms/Charts - 副本 (2).aspx.exclude b/view/wms/Charts - 副本 (2).aspx.exclude
new file mode 100644
index 0000000..3da484a
--- /dev/null
+++ b/view/wms/Charts - 副本 (2).aspx.exclude
@@ -0,0 +1,577 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Charts.aspx.cs" Inherits="wms_Charts" %>
+
+<%@ Register assembly="DevExpress.XtraCharts.v16.2.Web, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts.Web" tagprefix="dx" %>
+<%@ Register assembly="DevExpress.XtraCharts.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts" tagprefix="dx" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/view/wms/Charts - 副本 (3).aspx.exclude b/view/wms/Charts - 副本 (3).aspx.exclude
new file mode 100644
index 0000000..909f848
--- /dev/null
+++ b/view/wms/Charts - 副本 (3).aspx.exclude
@@ -0,0 +1,652 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Charts.aspx.cs" Inherits="wms_Charts" %>
+
+<%@ Register assembly="DevExpress.XtraCharts.v16.2.Web, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts.Web" tagprefix="dx" %>
+<%@ Register assembly="DevExpress.XtraCharts.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts" tagprefix="dx" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/view/wms/Charts - 副本 (4).aspx.exclude b/view/wms/Charts - 副本 (4).aspx.exclude
new file mode 100644
index 0000000..a50e432
--- /dev/null
+++ b/view/wms/Charts - 副本 (4).aspx.exclude
@@ -0,0 +1,727 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Charts.aspx.cs" Inherits="wms_Charts" %>
+
+<%@ Register assembly="DevExpress.XtraCharts.v16.2.Web, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts.Web" tagprefix="dx" %>
+<%@ Register assembly="DevExpress.XtraCharts.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts" tagprefix="dx" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/view/wms/Charts - 副本.aspx.exclude b/view/wms/Charts - 副本.aspx.exclude
new file mode 100644
index 0000000..990a37b
--- /dev/null
+++ b/view/wms/Charts - 副本.aspx.exclude
@@ -0,0 +1,389 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Charts.aspx.cs" Inherits="wms_Charts" %>
+
+<%@ Register assembly="DevExpress.XtraCharts.v16.2.Web, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts.Web" tagprefix="dx" %>
+<%@ Register assembly="DevExpress.XtraCharts.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts" tagprefix="dx" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/view/wms/Charts.aspx b/view/wms/Charts.aspx
new file mode 100644
index 0000000..b85a779
--- /dev/null
+++ b/view/wms/Charts.aspx
@@ -0,0 +1,751 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Charts.aspx.cs" Inherits="wms_Charts" %>
+
+<%@ Register assembly="DevExpress.XtraCharts.v16.2.Web, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts.Web" tagprefix="dx" %>
+<%@ Register assembly="DevExpress.XtraCharts.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts" tagprefix="dx" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/view/wms/Charts.aspx - 副本.cs b/view/wms/Charts.aspx - 副本.cs
new file mode 100644
index 0000000..1f9d4cd
--- /dev/null
+++ b/view/wms/Charts.aspx - 副本.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.Security;
+
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+using DeiNiu.Utils;
+using DeiNiu.wms.Logical;
+using DevExpress.XtraCharts;
+using System.Data;
+
+
+public partial class wms_Charts : System.Web.UI.Page
+{
+ DataSet ds;
+ lCharts lchart = new lCharts();
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ loadData();
+ }
+
+ void loadData()
+ {
+ ds = lchart.getDailyKanBanData();
+ setTasks();
+ setLocs();
+ setUserTasks();
+ }
+
+
+ void setLocs()
+ {
+
+
+ DataTable dt = ds.Tables[2];
+
+ Series taskSeries = this.webChartLocs.SeriesSerializable[0];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ taskSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), Convert.ToInt32(dr["totalCnt"].ToString())));
+
+ }
+ Series finishedSeries = webChartLocs.SeriesSerializable[1];
+
+ finishedSeries.Points.Clear();
+ foreach (DataRow dr in dt.Rows)
+ {
+ finishedSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), Convert.ToInt32(dr["usedCnt"].ToString())));
+
+ }
+
+ }
+ void setUserTasks()
+ {
+
+ DataTable dt = ds.Tables[1];
+
+ Series taskSeries = this.webChartEmpTasks.SeriesSerializable[0];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ taskSeries.Points.Add(new SeriesPoint(dr["emName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+ }
+
+
+ }
+ void setTasks()
+ {
+ DataTable dt = ds.Tables[0];
+
+ Series taskSeries = this.WebChartTasks.SeriesSerializable[0];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ taskSeries.Points.Add(new SeriesPoint(dr["typeName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+ }
+
+ Series finishedSeries = WebChartTasks.SeriesSerializable[1];
+
+ finishedSeries.Points.Clear();
+ foreach (DataRow dr in dt.Rows)
+ {
+ finishedSeries.Points.Add(new SeriesPoint(dr["typeName"].ToString(), Convert.ToInt32(dr["finishedCnt"].ToString())));
+
+ }
+
+
+
+ }
+ protected void btnSubmit_Click(object sender, EventArgs e)
+ {
+ // loadData();// Page_Load(sender, e);
+ }
+}
\ No newline at end of file
diff --git a/view/wms/Charts.aspx.cs b/view/wms/Charts.aspx.cs
new file mode 100644
index 0000000..e188ed1
--- /dev/null
+++ b/view/wms/Charts.aspx.cs
@@ -0,0 +1,245 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.Security;
+
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+using DeiNiu.Utils;
+using DeiNiu.wms.Logical;
+using DevExpress.XtraCharts;
+using System.Data;
+
+
+public partial class wms_Charts : System.Web.UI.Page
+{
+ DataSet dsDaily;
+ DataSet dsErpOrders;
+ lCharts lchart = new lCharts();
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ loadDailyData();
+
+ loadErpData();
+ }
+
+ private void loadErpData()
+ {
+ dsErpOrders = lchart.getErpOderData();
+
+ //set erp in orders pie
+
+ DataTable dt = dsErpOrders.Tables[0];
+
+ Series taskSeries = WebChartInOrders.SeriesSerializable[0];
+
+ //Series taskSeries2 = this.WebChartErpOrders.SeriesSerializable[0];
+ //taskSeries2.Points.Clear();
+
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ // taskSeries2.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+ taskSeries.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+
+ }
+ //set erp out orders pie
+ dt = dsErpOrders.Tables[1];
+
+ taskSeries = WebChartOutOrders.SeriesSerializable[0];
+ // taskSeries2 = this.WebChartErpOrders.SeriesSerializable[1];
+ taskSeries.Points.Clear();
+ //taskSeries2.Points.Clear();
+ foreach (DataRow dr in dt.Rows)
+ {
+ taskSeries.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+ // taskSeries2.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+ }
+
+
+
+
+ // in out line counts
+
+ string day = "";
+ dt = dsErpOrders.Tables[2];
+
+ taskSeries = WebChartInOutLines.SeriesSerializable[0];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ day = string.Format("{0}-{1}-{2}", dr["year"].ToString(), dr["month"].ToString(), dr["day"].ToString());
+ taskSeries.Points.Add(new SeriesPoint(day, Convert.ToInt32(dr["cnt"].ToString())));
+
+ }
+
+
+
+ dt = dsErpOrders.Tables[3];
+
+ taskSeries = WebChartInOutLines.SeriesSerializable[1];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ day = string.Format("{0}-{1}-{2}", dr["year"].ToString(), dr["month"].ToString(), dr["day"].ToString());
+ taskSeries.Points.Add(new SeriesPoint(day, Convert.ToInt32(dr["cnt"].ToString())));
+
+ }
+
+
+
+ }
+
+ void loadDailyData()
+ {
+ dsDaily = lchart.getDailyKanBanData();
+ setTasks();
+ setLocs();
+ setUserTasks();
+ setTasksSumByStatePie();
+ setPartTasks();
+ }
+
+ private void setTasksSumByStatePie()
+ {
+
+
+ DataTable dt = dsDaily.Tables[3];
+
+ Series taskSeries = WebChartStatePie.SeriesSerializable[0];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ taskSeries.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+ }
+
+ }
+
+
+ void setLocs()
+ {
+
+
+ DataTable dt = dsDaily.Tables[2];
+
+ Series taskSeries = WebChartLocs.SeriesSerializable[0];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ // taskSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), Convert.ToInt32(dr["totalCnt"].ToString())));
+ taskSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), dr["usedPercent"].ToString()) );
+
+ }
+ /*
+ Series finishedSeries = this.WebChartLocs.SeriesSerializable[1];
+
+ finishedSeries.Points.Clear();
+ foreach (DataRow dr in dt.Rows)
+ {
+ finishedSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), Convert.ToInt32(dr["usedCnt"].ToString())));
+
+ }
+ */
+
+
+ }
+ void setUserTasks()
+ {
+
+ DataTable dt = dsDaily.Tables[1];
+
+ Series taskSeries = WebChartEmpTasks.SeriesSerializable[0];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ taskSeries.Points.Add(new SeriesPoint(dr["emName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+ }
+
+
+ }
+ void setTasks()
+ {
+ DataTable dt = dsDaily.Tables[0];
+
+ Series taskSeries = this.WebChartTasks.SeriesSerializable[0];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ taskSeries.Points.Add(new SeriesPoint(dr["typeName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+ }
+
+ Series finishedSeries = WebChartTasks.SeriesSerializable[1];
+
+ finishedSeries.Points.Clear();
+ foreach (DataRow dr in dt.Rows)
+ {
+ finishedSeries.Points.Add(new SeriesPoint(dr["typeName"].ToString(), Convert.ToInt32(dr["finishedCnt"].ToString())));
+
+ }
+
+
+
+ }
+ void setPartTasks()
+ {
+ DataTable dt = dsDaily.Tables[4];
+
+ Series taskSeries = this.WebChartPartTasks .SeriesSerializable[0];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ taskSeries.Points.Add(new SeriesPoint(dr["partName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+ }
+
+ Series finishedSeries = WebChartPartTasks.SeriesSerializable[1];
+
+ finishedSeries.Points.Clear();
+ foreach (DataRow dr in dt.Rows)
+ {
+ finishedSeries.Points.Add(new SeriesPoint(dr["partName"].ToString(), Convert.ToInt32(dr["finishedCnt"].ToString())));
+
+ }
+
+
+
+ }
+ protected void btnSubmit_Click(object sender, EventArgs e)
+ {
+ // loadData();// Page_Load(sender, e);
+ }
+ protected void WebChartEmpTasks_ObjectSelected(object sender, HotTrackEventArgs e)
+ {
+
+ }
+ protected void Button1_Click(object sender, EventArgs e)
+ {
+
+ loadDailyData();
+
+ loadErpData();
+ }
+}
\ No newline at end of file
diff --git a/view/wms/ChartsNew.aspx b/view/wms/ChartsNew.aspx
new file mode 100644
index 0000000..65dd6b3
--- /dev/null
+++ b/view/wms/ChartsNew.aspx
@@ -0,0 +1,749 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="ChartsNew.aspx.cs" Inherits="wms_Charts" %>
+
+<%@ Register assembly="DevExpress.XtraCharts.v16.2.Web, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts.Web" tagprefix="dx" %>
+<%@ Register assembly="DevExpress.XtraCharts.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.XtraCharts" tagprefix="dx" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/view/wms/ChartsNew.aspx.cs b/view/wms/ChartsNew.aspx.cs
new file mode 100644
index 0000000..c2b44f2
--- /dev/null
+++ b/view/wms/ChartsNew.aspx.cs
@@ -0,0 +1,238 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.Security;
+
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+
+using DeiNiu.Utils;
+using DeiNiu.wms.Logical;
+using DevExpress.XtraCharts;
+using System.Data;
+
+
+public partial class wms_Charts : System.Web.UI.Page
+{
+ DataSet dsDaily;
+ DataSet dsErpOrders;
+ lCharts lchart = new lCharts();
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ loadDailyData();
+
+ loadErpData();
+ }
+
+ private void loadErpData()
+ {
+ dsErpOrders = lchart.getErpOderData();
+
+ //set erp in orders pie
+
+ DataTable dt = dsErpOrders.Tables[0];
+
+ Series taskSeries = WebChartInOrders.SeriesSerializable[0];
+
+ //Series taskSeries2 = this.WebChartErpOrders.SeriesSerializable[0];
+ //taskSeries2.Points.Clear();
+
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ // taskSeries2.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+ taskSeries.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+
+ }
+ //set erp out orders pie
+ dt = dsErpOrders.Tables[1];
+
+ taskSeries = WebChartOutOrders.SeriesSerializable[0];
+ // taskSeries2 = this.WebChartErpOrders.SeriesSerializable[1];
+ taskSeries.Points.Clear();
+ //taskSeries2.Points.Clear();
+ foreach (DataRow dr in dt.Rows)
+ {
+ taskSeries.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+ // taskSeries2.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["orderCnt"].ToString())));
+ }
+
+
+
+
+ // in out line counts
+
+ string day = "";
+ dt = dsErpOrders.Tables[2];
+
+ taskSeries = WebChartInOutLines.SeriesSerializable[0];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ day = string.Format("{0}-{1}-{2}", dr["year"].ToString(), dr["month"].ToString(), dr["day"].ToString());
+ taskSeries.Points.Add(new SeriesPoint(day, Convert.ToInt32(dr["cnt"].ToString())));
+
+ }
+
+
+
+ dt = dsErpOrders.Tables[3];
+
+ taskSeries = WebChartInOutLines.SeriesSerializable[1];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ day = string.Format("{0}-{1}-{2}", dr["year"].ToString(), dr["month"].ToString(), dr["day"].ToString());
+ taskSeries.Points.Add(new SeriesPoint(day, Convert.ToInt32(dr["cnt"].ToString())));
+
+ }
+
+
+
+ }
+
+ void loadDailyData()
+ {
+ dsDaily = lchart.getDailyKanBanData();
+ setTasks();
+ setLocs();
+ setUserTasks();
+ setTasksSumByStatePie();
+ setPartTasks();
+ }
+
+ private void setTasksSumByStatePie()
+ {
+
+
+ DataTable dt = dsDaily.Tables[3];
+
+ Series taskSeries = WebChartStatePie.SeriesSerializable[0];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ taskSeries.Points.Add(new SeriesPoint(dr["state"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+ }
+
+ }
+
+
+ void setLocs()
+ {
+
+
+ DataTable dt = dsDaily.Tables[2];
+
+ Series taskSeries = WebChartLocs.SeriesSerializable[0];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ // taskSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), Convert.ToInt32(dr["totalCnt"].ToString())));
+ taskSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), dr["usedPercent"].ToString()) );
+
+ }
+ /*
+ Series finishedSeries = this.WebChartLocs.SeriesSerializable[1];
+
+ finishedSeries.Points.Clear();
+ foreach (DataRow dr in dt.Rows)
+ {
+ finishedSeries.Points.Add(new SeriesPoint(dr["volType"].ToString(), Convert.ToInt32(dr["usedCnt"].ToString())));
+
+ }
+ */
+
+
+ }
+ void setUserTasks()
+ {
+
+ DataTable dt = dsDaily.Tables[1];
+
+ Series taskSeries = WebChartEmpTasks.SeriesSerializable[0];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ taskSeries.Points.Add(new SeriesPoint(dr["emName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+ }
+
+
+ }
+ void setTasks()
+ {
+ DataTable dt = dsDaily.Tables[0];
+
+ Series taskSeries = this.WebChartTasks.SeriesSerializable[0];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ taskSeries.Points.Add(new SeriesPoint(dr["typeName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+ }
+
+ Series finishedSeries = WebChartTasks.SeriesSerializable[1];
+
+ finishedSeries.Points.Clear();
+ foreach (DataRow dr in dt.Rows)
+ {
+ finishedSeries.Points.Add(new SeriesPoint(dr["typeName"].ToString(), Convert.ToInt32(dr["finishedCnt"].ToString())));
+
+ }
+
+
+
+ }
+ void setPartTasks()
+ {
+ DataTable dt = dsDaily.Tables[4];
+
+ Series taskSeries = this.WebChartPartTasks .SeriesSerializable[0];
+
+ taskSeries.Points.Clear();
+
+ foreach (DataRow dr in dt.Rows)
+ {
+ taskSeries.Points.Add(new SeriesPoint(dr["partName"].ToString(), Convert.ToInt32(dr["taskCnt"].ToString())));
+
+ }
+
+ Series finishedSeries = WebChartPartTasks.SeriesSerializable[1];
+
+ finishedSeries.Points.Clear();
+ foreach (DataRow dr in dt.Rows)
+ {
+ finishedSeries.Points.Add(new SeriesPoint(dr["partName"].ToString(), Convert.ToInt32(dr["finishedCnt"].ToString())));
+
+ }
+
+
+
+ }
+ protected void btnSubmit_Click(object sender, EventArgs e)
+ {
+ // loadData();// Page_Load(sender, e);
+ }
+ protected void WebChartEmpTasks_ObjectSelected(object sender, HotTrackEventArgs e)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/winform/Login.cs b/winform/Login.cs
index 4658440..2a36166 100644
--- a/winform/Login.cs
+++ b/winform/Login.cs
@@ -1,24 +1,17 @@
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
using System.Windows.Forms;
//using DeiNiu.wms.Logical;
-using Microsoft.Data.ConnectionUI;
using System.Data.SqlClient;
using DeiNiu.Utils;
using System.Configuration;
using DeiNiu.wms.win.utils;
-using DeiNiu.Data.DataAccess;
-using DeiNiu.wms.win.portalService;
using System.ServiceModel.Configuration;
using System.Text.RegularExpressions;
-using DeiNiu.wms.win.ServiceReferenceConfiguration;
+using Microsoft.Data.ConnectionUI;
//using WcfClientAuthentication;
-namespace DeiNiu.wms.win
+namespace DeiNiu.wms.win
{
public partial class Login : BasicRibbonForm
{
diff --git a/winform/Service References/ServiceReferenceStockInRequest/Reference.cs b/winform/Service References/ServiceReferenceStockInRequest/Reference.cs
index d69da72..0a6fb6e 100644
--- a/winform/Service References/ServiceReferenceStockInRequest/Reference.cs
+++ b/winform/Service References/ServiceReferenceStockInRequest/Reference.cs
@@ -81,6 +81,9 @@ namespace DeiNiu.wms.win.ServiceReferenceStockInRequest {
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWmsInRequest/getReceiveHistory", ReplyAction="http://tempuri.org/IWmsInRequest/getReceiveHistoryResponse")]
System.Data.DataTable getReceiveHistory(string orderNo);
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWmsInRequest/getReceiveMuiltiHistory", ReplyAction="http://tempuri.org/IWmsInRequest/getReceiveMuiltiHistoryResponse")]
+ System.Data.DataTable getReceiveMuiltiHistory(string orderNo);
+
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWmsInRequest/getShipRecs", ReplyAction="http://tempuri.org/IWmsInRequest/getShipRecsResponse")]
System.Data.DataSet getShipRecs(string querystr, int rownumStart, int rownumEnd);
@@ -272,6 +275,10 @@ namespace DeiNiu.wms.win.ServiceReferenceStockInRequest {
return base.Channel.getReceiveHistory(orderNo);
}
+ public System.Data.DataTable getReceiveMuiltiHistory(string orderNo) {
+ return base.Channel.getReceiveMuiltiHistory(orderNo);
+ }
+
public System.Data.DataSet getShipRecs(string querystr, int rownumStart, int rownumEnd) {
return base.Channel.getShipRecs(querystr, rownumStart, rownumEnd);
}
diff --git a/winform/Service References/ServiceReferenceStockInRequest/WmsInRequestService1.wsdl b/winform/Service References/ServiceReferenceStockInRequest/WmsInRequestService1.wsdl
index c532284..7d96a00 100644
--- a/winform/Service References/ServiceReferenceStockInRequest/WmsInRequestService1.wsdl
+++ b/winform/Service References/ServiceReferenceStockInRequest/WmsInRequestService1.wsdl
@@ -142,6 +142,12 @@
+
+
+
+
+
+
@@ -381,6 +387,10 @@
+
+
+
+
@@ -682,6 +692,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/winform/Service References/ServiceReferenceStockInRequest/WmsInRequestService2.xsd b/winform/Service References/ServiceReferenceStockInRequest/WmsInRequestService2.xsd
index 28beb48..6132c8d 100644
--- a/winform/Service References/ServiceReferenceStockInRequest/WmsInRequestService2.xsd
+++ b/winform/Service References/ServiceReferenceStockInRequest/WmsInRequestService2.xsd
@@ -14,6 +14,7 @@
+
diff --git a/winform/Service References/ServiceReferenceStockInRequest/WmsInRequestService5.xsd b/winform/Service References/ServiceReferenceStockInRequest/WmsInRequestService5.xsd
index 241dcdf..1eaf725 100644
--- a/winform/Service References/ServiceReferenceStockInRequest/WmsInRequestService5.xsd
+++ b/winform/Service References/ServiceReferenceStockInRequest/WmsInRequestService5.xsd
@@ -512,6 +512,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/winform/TMS/PrintTrans.cs b/winform/TMS/PrintTrans.cs
index aced14b..129cbe0 100644
--- a/winform/TMS/PrintTrans.cs
+++ b/winform/TMS/PrintTrans.cs
@@ -1253,7 +1253,7 @@ namespace DeiNiu.wms.win
foreach (DataRow dr in dtResult.Rows) //设置发票
{
wpr = new WmsOutPickRequest(dr);
- doPrintTran(wpr);
+ doPrintEachTran(wpr);// doPrintTran(wpr);
}
closeClient();
diff --git a/winform/utils/ConfigPrint.Designer.cs b/winform/utils/ConfigPrint.Designer.cs
index e731c53..fb882b9 100644
--- a/winform/utils/ConfigPrint.Designer.cs
+++ b/winform/utils/ConfigPrint.Designer.cs
@@ -34,6 +34,10 @@
this.ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
this.reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer();
this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.lbCode2 = new System.Windows.Forms.Label();
+ this.lbInfo = new System.Windows.Forms.Label();
this.btnPrint = new DevExpress.XtraEditors.SimpleButton();
this.txtPandian = new DevExpress.XtraEditors.TextEdit();
this.btnReceive = new DevExpress.XtraEditors.SimpleButton();
@@ -45,8 +49,8 @@
this.btnPrintflow = new DevExpress.XtraEditors.SimpleButton();
this.txtflowcnt = new DevExpress.XtraEditors.TextEdit();
this.btnBatch = new DevExpress.XtraEditors.SimpleButton();
- this.lbPin = new System.Windows.Forms.Label();
this.lbCode = new System.Windows.Forms.Label();
+ this.lbPin = new System.Windows.Forms.Label();
this.lbA4 = new System.Windows.Forms.Label();
this.comPrinters = new DevExpress.XtraEditors.ComboBoxEdit();
this.btnA4 = new DevExpress.XtraEditors.SimpleButton();
@@ -59,34 +63,23 @@
this.txtPreIn = new DevExpress.XtraEditors.TextEdit();
this.txtSimpleCode = new DevExpress.XtraEditors.TextEdit();
this.txtSimpleDesc = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
- this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.emptySpaceItem5 = new DevExpress.XtraLayout.EmptySpaceItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
- this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
this.tabbedControlGroup2 = new DevExpress.XtraLayout.TabbedControlGroup();
- this.layoutControlGroup5 = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.emptySpaceItem7 = new DevExpress.XtraLayout.EmptySpaceItem();
this.layoutControlGroup6 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.emptySpaceItem12 = new DevExpress.XtraLayout.EmptySpaceItem();
+ this.layoutControlGroup5 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.emptySpaceItem7 = new DevExpress.XtraLayout.EmptySpaceItem();
this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -109,15 +102,22 @@
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
this.emptySpaceItem9 = new DevExpress.XtraLayout.EmptySpaceItem();
- this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
- this.lbInfo = new System.Windows.Forms.Label();
+ this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem();
+ this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
+ this.emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
- this.lbCode2 = new System.Windows.Forms.Label();
- this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
- this.label2 = new System.Windows.Forms.Label();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
- this.label3 = new System.Windows.Forms.Label();
+ this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.emptySpaceItem5 = new DevExpress.XtraLayout.EmptySpaceItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.dxValidationProvider1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
@@ -132,34 +132,23 @@
((System.ComponentModel.ISupportInitialize)(this.txtPreIn.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtSimpleCode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtSimpleDesc.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
@@ -182,10 +171,21 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
this.SuspendLayout();
//
// ribbon
@@ -228,7 +228,6 @@
this.reportViewer1.Name = "reportViewer1";
this.reportViewer1.Size = new System.Drawing.Size(1639, 694);
this.reportViewer1.TabIndex = 6;
- this.reportViewer1.Visible = false;
this.reportViewer1.Load += new System.EventHandler(this.reportViewer1_Load);
//
// layoutControl1
@@ -249,8 +248,8 @@
this.layoutControl1.Controls.Add(this.txtflowcnt);
this.layoutControl1.Controls.Add(this.btnBatch);
this.layoutControl1.Controls.Add(this.reportViewer1);
- this.layoutControl1.Controls.Add(this.lbPin);
this.layoutControl1.Controls.Add(this.lbCode);
+ this.layoutControl1.Controls.Add(this.lbPin);
this.layoutControl1.Controls.Add(this.lbA4);
this.layoutControl1.Controls.Add(this.comPrinters);
this.layoutControl1.Controls.Add(this.btnA4);
@@ -274,6 +273,50 @@
this.layoutControl1.TabIndex = 9;
this.layoutControl1.Text = "layoutControl1";
//
+ // label3
+ //
+ this.label3.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.label3.Location = new System.Drawing.Point(37, 202);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(154, 32);
+ this.label3.TabIndex = 106;
+ this.label3.Text = "设置多联打印机";
+ this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // label2
+ //
+ this.label2.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.label2.Location = new System.Drawing.Point(37, 154);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(154, 32);
+ this.label2.TabIndex = 105;
+ this.label2.Text = "设置条码打印机";
+ this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // lbCode2
+ //
+ this.lbCode2.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lbCode2.Location = new System.Drawing.Point(197, 154);
+ this.lbCode2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbCode2.Name = "lbCode2";
+ this.lbCode2.Size = new System.Drawing.Size(278, 32);
+ this.lbCode2.TabIndex = 104;
+ this.lbCode2.Text = "条码打印机";
+ this.lbCode2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // lbInfo
+ //
+ this.lbInfo.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lbInfo.Location = new System.Drawing.Point(37, 106);
+ this.lbInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbInfo.Name = "lbInfo";
+ this.lbInfo.Size = new System.Drawing.Size(154, 32);
+ this.lbInfo.TabIndex = 103;
+ this.lbInfo.Text = "设置A4打印机";
+ this.lbInfo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
// btnPrint
//
this.btnPrint.Location = new System.Drawing.Point(578, 126);
@@ -388,17 +431,6 @@
this.btnBatch.Text = "亮灯拣货";
this.btnBatch.Click += new System.EventHandler(this.btnBatch_Click);
//
- // lbPin
- //
- this.lbPin.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lbPin.Location = new System.Drawing.Point(197, 202);
- this.lbPin.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.lbPin.Name = "lbPin";
- this.lbPin.Size = new System.Drawing.Size(278, 32);
- this.lbPin.TabIndex = 78;
- this.lbPin.Text = "默认多联打印机";
- this.lbPin.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
// lbCode
//
this.lbCode.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -410,6 +442,17 @@
this.lbCode.Text = "默认条码打印机";
this.lbCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
+ // lbPin
+ //
+ this.lbPin.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lbPin.Location = new System.Drawing.Point(197, 202);
+ this.lbPin.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbPin.Name = "lbPin";
+ this.lbPin.Size = new System.Drawing.Size(278, 32);
+ this.lbPin.TabIndex = 78;
+ this.lbPin.Text = "默认多联打印机";
+ this.lbPin.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
// lbA4
//
this.lbA4.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -534,6 +577,16 @@
this.txtSimpleDesc.StyleController = this.layoutControl1;
this.txtSimpleDesc.TabIndex = 82;
//
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.lbCode;
+ this.layoutControlItem7.Location = new System.Drawing.Point(222, 86);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.Size = new System.Drawing.Size(222, 42);
+ this.layoutControlItem7.Text = "条码打印机";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem7.TextVisible = false;
+ //
// layoutControlGroup1
//
this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -549,147 +602,13 @@
//
this.tabbedControlGroup1.Location = new System.Drawing.Point(0, 0);
this.tabbedControlGroup1.Name = "tabbedControlGroup1";
- this.tabbedControlGroup1.SelectedTabPage = this.layoutControlGroup2;
- this.tabbedControlGroup1.SelectedTabPageIndex = 0;
+ this.tabbedControlGroup1.SelectedTabPage = this.layoutControlGroup3;
+ this.tabbedControlGroup1.SelectedTabPageIndex = 1;
this.tabbedControlGroup1.Size = new System.Drawing.Size(1684, 886);
this.tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlGroup2,
this.layoutControlGroup3});
//
- // layoutControlGroup2
- //
- this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem1,
- this.layoutControlItem3,
- this.layoutControlItem2,
- this.emptySpaceItem4,
- this.emptySpaceItem2,
- this.emptySpaceItem3,
- this.layoutControlItem27,
- this.layoutControlItem29,
- this.layoutControlItem28,
- this.layoutControlItem8,
- this.layoutControlItem30,
- this.emptySpaceItem5,
- this.layoutControlItem5,
- this.layoutControlItem6});
- this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0);
- this.layoutControlGroup2.Name = "layoutControlGroup2";
- this.layoutControlGroup2.Size = new System.Drawing.Size(1645, 812);
- this.layoutControlGroup2.Text = "本机打印机设置";
- //
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.comPrinters;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(510, 34);
- this.layoutControlItem1.Text = "打印机列表";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem1.TextVisible = false;
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.lbA4;
- this.layoutControlItem3.Location = new System.Drawing.Point(160, 34);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.Size = new System.Drawing.Size(284, 38);
- this.layoutControlItem3.Text = "A4打印机";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem3.TextVisible = false;
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.btnA4;
- this.layoutControlItem2.Location = new System.Drawing.Point(444, 34);
- this.layoutControlItem2.MinSize = new System.Drawing.Size(53, 38);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(66, 38);
- this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem2.TextVisible = false;
- //
- // emptySpaceItem4
- //
- this.emptySpaceItem4.AllowHotTrack = false;
- this.emptySpaceItem4.Location = new System.Drawing.Point(0, 72);
- this.emptySpaceItem4.MaxSize = new System.Drawing.Size(510, 10);
- this.emptySpaceItem4.MinSize = new System.Drawing.Size(510, 10);
- this.emptySpaceItem4.Name = "emptySpaceItem4";
- this.emptySpaceItem4.Size = new System.Drawing.Size(510, 10);
- this.emptySpaceItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.emptySpaceItem4.TextSize = new System.Drawing.Size(0, 0);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.lbCode;
- this.layoutControlItem7.Location = new System.Drawing.Point(222, 86);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.Size = new System.Drawing.Size(222, 42);
- this.layoutControlItem7.Text = "条码打印机";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 20);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.btnCode;
- this.layoutControlItem5.Location = new System.Drawing.Point(444, 82);
- this.layoutControlItem5.MinSize = new System.Drawing.Size(53, 38);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.Size = new System.Drawing.Size(66, 38);
- this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem5.TextVisible = false;
- //
- // emptySpaceItem5
- //
- this.emptySpaceItem5.AllowHotTrack = false;
- this.emptySpaceItem5.CustomizationFormText = "emptySpaceItem4";
- this.emptySpaceItem5.Location = new System.Drawing.Point(0, 120);
- this.emptySpaceItem5.MaxSize = new System.Drawing.Size(510, 10);
- this.emptySpaceItem5.MinSize = new System.Drawing.Size(510, 10);
- this.emptySpaceItem5.Name = "emptySpaceItem5";
- this.emptySpaceItem5.Size = new System.Drawing.Size(510, 10);
- this.emptySpaceItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.emptySpaceItem5.Text = "emptySpaceItem4";
- this.emptySpaceItem5.TextSize = new System.Drawing.Size(0, 0);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.lbPin;
- this.layoutControlItem8.Location = new System.Drawing.Point(160, 130);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.Size = new System.Drawing.Size(284, 38);
- this.layoutControlItem8.Text = "多联打印机";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem8.TextVisible = false;
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.btnPin;
- this.layoutControlItem6.Location = new System.Drawing.Point(444, 130);
- this.layoutControlItem6.MinSize = new System.Drawing.Size(53, 38);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.Size = new System.Drawing.Size(66, 38);
- this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem6.TextVisible = false;
- //
- // emptySpaceItem2
- //
- this.emptySpaceItem2.AllowHotTrack = false;
- this.emptySpaceItem2.Location = new System.Drawing.Point(510, 0);
- this.emptySpaceItem2.Name = "emptySpaceItem2";
- this.emptySpaceItem2.Size = new System.Drawing.Size(1135, 812);
- this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
- //
- // emptySpaceItem3
- //
- this.emptySpaceItem3.AllowHotTrack = false;
- this.emptySpaceItem3.Location = new System.Drawing.Point(0, 168);
- this.emptySpaceItem3.Name = "emptySpaceItem3";
- this.emptySpaceItem3.Size = new System.Drawing.Size(510, 644);
- this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
- //
// layoutControlGroup3
//
this.layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@@ -722,8 +641,8 @@
//
this.tabbedControlGroup2.Location = new System.Drawing.Point(0, 0);
this.tabbedControlGroup2.Name = "tabbedControlGroup2";
- this.tabbedControlGroup2.SelectedTabPage = this.layoutControlGroup5;
- this.tabbedControlGroup2.SelectedTabPageIndex = 0;
+ this.tabbedControlGroup2.SelectedTabPage = this.layoutControlGroup6;
+ this.tabbedControlGroup2.SelectedTabPageIndex = 1;
this.tabbedControlGroup2.Size = new System.Drawing.Size(1124, 112);
this.tabbedControlGroup2.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlGroup5,
@@ -734,62 +653,6 @@
this.layoutControlGroup8,
this.layoutControlGroup10});
//
- // layoutControlGroup5
- //
- this.layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem12,
- this.layoutControlItem13,
- this.layoutControlItem14,
- this.emptySpaceItem7});
- this.layoutControlGroup5.Location = new System.Drawing.Point(0, 0);
- this.layoutControlGroup5.Name = "layoutControlGroup5";
- this.layoutControlGroup5.Size = new System.Drawing.Size(1085, 38);
- this.layoutControlGroup5.Text = "流水号打印";
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txtflowcnt;
- this.layoutControlItem12.Location = new System.Drawing.Point(214, 0);
- this.layoutControlItem12.MaxSize = new System.Drawing.Size(133, 26);
- this.layoutControlItem12.MinSize = new System.Drawing.Size(133, 26);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.Size = new System.Drawing.Size(133, 38);
- this.layoutControlItem12.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem12.Text = "打印数量";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 22);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.btnPrintflow;
- this.layoutControlItem13.Location = new System.Drawing.Point(347, 0);
- this.layoutControlItem13.MinSize = new System.Drawing.Size(53, 38);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.Size = new System.Drawing.Size(67, 38);
- this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem13.TextVisible = false;
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txtflowName;
- this.layoutControlItem14.CustomizationFormText = "打印数量";
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem14.MaxSize = new System.Drawing.Size(214, 26);
- this.layoutControlItem14.MinSize = new System.Drawing.Size(214, 26);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.Size = new System.Drawing.Size(214, 38);
- this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem14.Text = "流水名称";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 22);
- //
- // emptySpaceItem7
- //
- this.emptySpaceItem7.AllowHotTrack = false;
- this.emptySpaceItem7.Location = new System.Drawing.Point(414, 0);
- this.emptySpaceItem7.Name = "emptySpaceItem7";
- this.emptySpaceItem7.Size = new System.Drawing.Size(671, 38);
- this.emptySpaceItem7.TextSize = new System.Drawing.Size(0, 0);
- //
// layoutControlGroup6
//
this.layoutControlGroup6.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@@ -848,6 +711,62 @@
this.emptySpaceItem12.Size = new System.Drawing.Size(511, 38);
this.emptySpaceItem12.TextSize = new System.Drawing.Size(0, 0);
//
+ // layoutControlGroup5
+ //
+ this.layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem12,
+ this.layoutControlItem13,
+ this.layoutControlItem14,
+ this.emptySpaceItem7});
+ this.layoutControlGroup5.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlGroup5.Name = "layoutControlGroup5";
+ this.layoutControlGroup5.Size = new System.Drawing.Size(1085, 38);
+ this.layoutControlGroup5.Text = "流水号打印";
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txtflowcnt;
+ this.layoutControlItem12.Location = new System.Drawing.Point(214, 0);
+ this.layoutControlItem12.MaxSize = new System.Drawing.Size(133, 26);
+ this.layoutControlItem12.MinSize = new System.Drawing.Size(133, 26);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.Size = new System.Drawing.Size(133, 38);
+ this.layoutControlItem12.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem12.Text = "打印数量";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 22);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.btnPrintflow;
+ this.layoutControlItem13.Location = new System.Drawing.Point(347, 0);
+ this.layoutControlItem13.MinSize = new System.Drawing.Size(53, 38);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.Size = new System.Drawing.Size(67, 38);
+ this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem13.TextVisible = false;
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txtflowName;
+ this.layoutControlItem14.CustomizationFormText = "打印数量";
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem14.MaxSize = new System.Drawing.Size(214, 26);
+ this.layoutControlItem14.MinSize = new System.Drawing.Size(214, 26);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.Size = new System.Drawing.Size(214, 38);
+ this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem14.Text = "流水名称";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 22);
+ //
+ // emptySpaceItem7
+ //
+ this.emptySpaceItem7.AllowHotTrack = false;
+ this.emptySpaceItem7.Location = new System.Drawing.Point(414, 0);
+ this.emptySpaceItem7.Name = "emptySpaceItem7";
+ this.emptySpaceItem7.Size = new System.Drawing.Size(671, 38);
+ this.emptySpaceItem7.TextSize = new System.Drawing.Size(0, 0);
+ //
// layoutControlGroup4
//
this.layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@@ -1075,24 +994,85 @@
this.emptySpaceItem9.Size = new System.Drawing.Size(447, 38);
this.emptySpaceItem9.TextSize = new System.Drawing.Size(0, 0);
//
- // simpleButton1
+ // layoutControlGroup2
//
- this.simpleButton1.Location = new System.Drawing.Point(383, 82);
- this.simpleButton1.Name = "simpleButton1";
- this.simpleButton1.Size = new System.Drawing.Size(63, 22);
- this.simpleButton1.TabIndex = 83;
- this.simpleButton1.Text = "打印";
+ this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem1,
+ this.layoutControlItem3,
+ this.layoutControlItem2,
+ this.emptySpaceItem4,
+ this.emptySpaceItem2,
+ this.emptySpaceItem3,
+ this.layoutControlItem27,
+ this.layoutControlItem29,
+ this.layoutControlItem28,
+ this.layoutControlItem8,
+ this.layoutControlItem30,
+ this.emptySpaceItem5,
+ this.layoutControlItem5,
+ this.layoutControlItem6});
+ this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlGroup2.Name = "layoutControlGroup2";
+ this.layoutControlGroup2.Size = new System.Drawing.Size(1645, 812);
+ this.layoutControlGroup2.Text = "本机打印机设置";
//
- // lbInfo
+ // layoutControlItem1
//
- this.lbInfo.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lbInfo.Location = new System.Drawing.Point(37, 106);
- this.lbInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.lbInfo.Name = "lbInfo";
- this.lbInfo.Size = new System.Drawing.Size(154, 32);
- this.lbInfo.TabIndex = 103;
- this.lbInfo.Text = "设置A4打印机";
- this.lbInfo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.layoutControlItem1.Control = this.comPrinters;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(510, 34);
+ this.layoutControlItem1.Text = "打印机列表";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem1.TextVisible = false;
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.lbA4;
+ this.layoutControlItem3.Location = new System.Drawing.Point(160, 34);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.Size = new System.Drawing.Size(284, 38);
+ this.layoutControlItem3.Text = "A4打印机";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem3.TextVisible = false;
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.btnA4;
+ this.layoutControlItem2.Location = new System.Drawing.Point(444, 34);
+ this.layoutControlItem2.MinSize = new System.Drawing.Size(53, 38);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.Size = new System.Drawing.Size(66, 38);
+ this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem2.TextVisible = false;
+ //
+ // emptySpaceItem4
+ //
+ this.emptySpaceItem4.AllowHotTrack = false;
+ this.emptySpaceItem4.Location = new System.Drawing.Point(0, 72);
+ this.emptySpaceItem4.MaxSize = new System.Drawing.Size(510, 10);
+ this.emptySpaceItem4.MinSize = new System.Drawing.Size(510, 10);
+ this.emptySpaceItem4.Name = "emptySpaceItem4";
+ this.emptySpaceItem4.Size = new System.Drawing.Size(510, 10);
+ this.emptySpaceItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.emptySpaceItem4.TextSize = new System.Drawing.Size(0, 0);
+ //
+ // emptySpaceItem2
+ //
+ this.emptySpaceItem2.AllowHotTrack = false;
+ this.emptySpaceItem2.Location = new System.Drawing.Point(510, 0);
+ this.emptySpaceItem2.Name = "emptySpaceItem2";
+ this.emptySpaceItem2.Size = new System.Drawing.Size(1135, 812);
+ this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
+ //
+ // emptySpaceItem3
+ //
+ this.emptySpaceItem3.AllowHotTrack = false;
+ this.emptySpaceItem3.Location = new System.Drawing.Point(0, 168);
+ this.emptySpaceItem3.Name = "emptySpaceItem3";
+ this.emptySpaceItem3.Size = new System.Drawing.Size(510, 644);
+ this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlItem27
//
@@ -1106,37 +1086,6 @@
this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem27.TextVisible = false;
//
- // lbCode2
- //
- this.lbCode2.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lbCode2.Location = new System.Drawing.Point(197, 154);
- this.lbCode2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.lbCode2.Name = "lbCode2";
- this.lbCode2.Size = new System.Drawing.Size(278, 32);
- this.lbCode2.TabIndex = 104;
- this.lbCode2.Text = "条码打印机";
- this.lbCode2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
- // layoutControlItem28
- //
- this.layoutControlItem28.Control = this.lbCode2;
- this.layoutControlItem28.Location = new System.Drawing.Point(160, 82);
- this.layoutControlItem28.Name = "layoutControlItem28";
- this.layoutControlItem28.Size = new System.Drawing.Size(284, 38);
- this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem28.TextVisible = false;
- //
- // label2
- //
- this.label2.Font = new System.Drawing.Font("Tahoma", 10F);
- this.label2.Location = new System.Drawing.Point(37, 154);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(154, 32);
- this.label2.TabIndex = 105;
- this.label2.Text = "设置条码打印机";
- this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- //
// layoutControlItem29
//
this.layoutControlItem29.Control = this.label2;
@@ -1149,16 +1098,24 @@
this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem29.TextVisible = false;
//
- // label3
+ // layoutControlItem28
//
- this.label3.Font = new System.Drawing.Font("Tahoma", 10F);
- this.label3.Location = new System.Drawing.Point(37, 202);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(154, 32);
- this.label3.TabIndex = 106;
- this.label3.Text = "设置多联打印机";
- this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.layoutControlItem28.Control = this.lbCode2;
+ this.layoutControlItem28.Location = new System.Drawing.Point(160, 82);
+ this.layoutControlItem28.Name = "layoutControlItem28";
+ this.layoutControlItem28.Size = new System.Drawing.Size(284, 38);
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem28.TextVisible = false;
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.lbPin;
+ this.layoutControlItem8.Location = new System.Drawing.Point(160, 130);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.Size = new System.Drawing.Size(284, 38);
+ this.layoutControlItem8.Text = "多联打印机";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem8.TextVisible = false;
//
// layoutControlItem30
//
@@ -1172,6 +1129,49 @@
this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem30.TextVisible = false;
//
+ // emptySpaceItem5
+ //
+ this.emptySpaceItem5.AllowHotTrack = false;
+ this.emptySpaceItem5.CustomizationFormText = "emptySpaceItem4";
+ this.emptySpaceItem5.Location = new System.Drawing.Point(0, 120);
+ this.emptySpaceItem5.MaxSize = new System.Drawing.Size(510, 10);
+ this.emptySpaceItem5.MinSize = new System.Drawing.Size(510, 10);
+ this.emptySpaceItem5.Name = "emptySpaceItem5";
+ this.emptySpaceItem5.Size = new System.Drawing.Size(510, 10);
+ this.emptySpaceItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.emptySpaceItem5.Text = "emptySpaceItem4";
+ this.emptySpaceItem5.TextSize = new System.Drawing.Size(0, 0);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.btnCode;
+ this.layoutControlItem5.Location = new System.Drawing.Point(444, 82);
+ this.layoutControlItem5.MinSize = new System.Drawing.Size(53, 38);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.Size = new System.Drawing.Size(66, 38);
+ this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem5.TextVisible = false;
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.btnPin;
+ this.layoutControlItem6.Location = new System.Drawing.Point(444, 130);
+ this.layoutControlItem6.MinSize = new System.Drawing.Size(53, 38);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.Size = new System.Drawing.Size(66, 38);
+ this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem6.TextVisible = false;
+ //
+ // simpleButton1
+ //
+ this.simpleButton1.Location = new System.Drawing.Point(383, 82);
+ this.simpleButton1.Name = "simpleButton1";
+ this.simpleButton1.Size = new System.Drawing.Size(63, 22);
+ this.simpleButton1.TabIndex = 83;
+ this.simpleButton1.Text = "打印";
+ //
// ConfigPrint
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
@@ -1197,34 +1197,23 @@
((System.ComponentModel.ISupportInitialize)(this.txtPreIn.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtSimpleCode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtSimpleDesc.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
@@ -1247,10 +1236,21 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/winform/utils/ConfigPrint.cs b/winform/utils/ConfigPrint.cs
index 7f51d2d..854a0e7 100644
--- a/winform/utils/ConfigPrint.cs
+++ b/winform/utils/ConfigPrint.cs
@@ -16,6 +16,7 @@ using DeiNiu.wms.win.utils.print;
using System.Drawing.Printing;
using DeiNiu.wms.Data.Model;
using System.IO;
+using DeiNiu.wms.win.ServiceCustomer;
namespace DeiNiu.wms.win
{
@@ -549,24 +550,43 @@ namespace DeiNiu.wms.win
{
try
{
- this.reportViewer1.LocalReport.DataSources.Clear();
+
+ DataTable dt = null;
+ using (ServiceCustomer.CustomerClient client =
+ new CustomerClient("BasicHttpBinding_ICustomer",
+ buildSvrAddress("CustomerService.svc")))
+ {
+ //dt = client.getPickVolInfo(waveNo, 1);// client.getPickInfo(waveNo);
+ // string query = (string.Format("takeBy = #{0};partion = #{1};isnull(lineId,0) = #{2};orderType = #{3};" , 282, 0, 0, 0));
+
+ string query = "";
+
+ // query = (string.Format("take = #'{0}'", waveNo));
+ dt = client.query(query, 0, 100).Tables[0];
+ }
+
+ DataView dv = dt.DefaultView;
+ dv.RowFilter = "custId like '130%' ";
+
+
+
+ foreach (DataRowView drv in dv)
+ { this.reportViewer1.LocalReport.DataSources.Clear();
this.reportViewer1.RefreshReport();
//int num = Convert.ToInt32(txtflowcnt.Text.Trim());
Microsoft.Reporting.WinForms.ReportParameter[] parameters
= new Microsoft.Reporting.WinForms.ReportParameter[3];
- this.reportViewer1.LocalReport.ReportPath = getReportPath("simpleCode.rdlc") ;// "DeiNiu.wms.Logical.reports.code_print.rdlc";
- // for (int i = 0; i < num; i++)
- {
- string code128 = txtSimpleCode.Text;
- string code = txtSimpleDesc.Text;
+ this.reportViewer1.LocalReport.ReportPath = getReportPath("singleSimpleCode128.rdlc") ;
+ Customer customer = new Customer(drv.Row);
+ string code = customer.customerId;
+ string name = drv["custName"].ToString();
- parameters[0] = new ReportParameter("flowCode", Util.CreateQRcode(code128));
- parameters[1] = new ReportParameter("flowNo", code128);
- parameters[2] = new ReportParameter("flowName", code);
+ parameters[0] = new ReportParameter("flowNo",code );
+ parameters[1] = new ReportParameter("flowNo128", Util.getCode128(code));
+ parameters[2] = new ReportParameter("flowName", name);
- //BillPrint.Run(new DataTable("tmp"), "simpleCode.rdlc", PrinterType.code, parameters);
-
+
reportViewer1.LocalReport.SetParameters(parameters);
reportViewer1.ProcessingMode = Microsoft.Reporting.WinForms.ProcessingMode.Local;
reportViewer1.LocalReport.DataSources.Add(new ReportDataSource("DataSet1", new DataTable("table1")));
@@ -576,6 +596,32 @@ namespace DeiNiu.wms.win
// printIn.printFlowNos(txtflowName.Text, num);
+ /*
+ this.reportViewer1.LocalReport.DataSources.Clear();
+ this.reportViewer1.RefreshReport();
+ //int num = Convert.ToInt32(txtflowcnt.Text.Trim());
+ Microsoft.Reporting.WinForms.ReportParameter[] parameters
+ = new Microsoft.Reporting.WinForms.ReportParameter[3];
+ this.reportViewer1.LocalReport.ReportPath = getReportPath("singleSimpleCode128.rdlc") ;
+ string code128 = txtSimpleCode.Text;
+ string code = txtSimpleDesc.Text;
+
+ parameters[0] = new ReportParameter("flowCode", Util.CreateQRcode(code128));
+ parameters[1] = new ReportParameter("flowNo", code128);
+ parameters[2] = new ReportParameter("flowName", code);
+
+
+ //BillPrint.Run(new DataTable("tmp"), "simpleCode.rdlc", PrinterType.code, parameters);
+
+ reportViewer1.LocalReport.SetParameters(parameters);
+ reportViewer1.ProcessingMode = Microsoft.Reporting.WinForms.ProcessingMode.Local;
+ reportViewer1.LocalReport.DataSources.Add(new ReportDataSource("DataSet1", new DataTable("table1")));
+ this.reportViewer1.RefreshReport();
+
+ */
+
+
+
}
catch (Exception er)
{
diff --git a/winform/wms.csproj b/winform/wms.csproj
index 16e5be2..074cb4f 100644
--- a/winform/wms.csproj
+++ b/winform/wms.csproj
@@ -29,7 +29,7 @@
得牛软件
publish.htm
false
- 315
+ 319
1.0.0.%2a
false
true
@@ -120,7 +120,7 @@
True