diff --git a/APP/QMAPP.Web/App_Data/MainPower.xml b/APP/QMAPP.Web/App_Data/MainPower.xml
index 17bb419..0f186fb 100644
--- a/APP/QMAPP.Web/App_Data/MainPower.xml
+++ b/APP/QMAPP.Web/App_Data/MainPower.xml
@@ -203,6 +203,7 @@
+
@@ -245,6 +246,10 @@
+
+
+
+
@@ -270,6 +275,9 @@
+
+
+
-
+
-
+
diff --git a/APPQ5/QMAPP.FJC.Web/Models/TianJin/TJDoorPlankPlanModel.cs b/APPQ5/QMAPP.FJC.Web/Models/TianJin/TJDoorPlankPlanModel.cs
index b578484..71c9cfb 100644
--- a/APPQ5/QMAPP.FJC.Web/Models/TianJin/TJDoorPlankPlanModel.cs
+++ b/APPQ5/QMAPP.FJC.Web/Models/TianJin/TJDoorPlankPlanModel.cs
@@ -44,7 +44,7 @@ namespace QMAPP.FJC.Web.Models.TianJin
[HTMLInput(UpdateRead = false, required = true, MaxLength = 30)]
[InputType(inputType.text)]
[DGColumn(frozenColumns = false, Sortable = true, Width = 80, DataAlign = DataAlign.center)]
- public string LINENO { get; set; }
+ public string LINENO { get; set; } = "770";
///
///计划状态
diff --git a/APPQ5/QMAPP.FJC.Web/Temp/060540e8-be79-4fbf-b956-679bf3775c9e.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/060540e8-be79-4fbf-b956-679bf3775c9e.xlsx
new file mode 100644
index 0000000..f7e1c18
Binary files /dev/null and b/APPQ5/QMAPP.FJC.Web/Temp/060540e8-be79-4fbf-b956-679bf3775c9e.xlsx differ
diff --git a/APPQ5/QMAPP.FJC.Web/Temp/2a4faca6-f361-4483-b9e7-d914d0dccfbd.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/2a4faca6-f361-4483-b9e7-d914d0dccfbd.xlsx
new file mode 100644
index 0000000..f7e1c18
Binary files /dev/null and b/APPQ5/QMAPP.FJC.Web/Temp/2a4faca6-f361-4483-b9e7-d914d0dccfbd.xlsx differ
diff --git a/APPQ5/QMAPP.FJC.Web/Temp/3571a329-f8f8-403e-b595-550e4c3e264b.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/3571a329-f8f8-403e-b595-550e4c3e264b.xlsx
new file mode 100644
index 0000000..8dae8a4
Binary files /dev/null and b/APPQ5/QMAPP.FJC.Web/Temp/3571a329-f8f8-403e-b595-550e4c3e264b.xlsx differ
diff --git a/APPQ5/QMAPP.FJC.Web/Temp/91e5dcd7-7700-4563-ba58-abe36aa77f93.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/91e5dcd7-7700-4563-ba58-abe36aa77f93.xlsx
new file mode 100644
index 0000000..f7e1c18
Binary files /dev/null and b/APPQ5/QMAPP.FJC.Web/Temp/91e5dcd7-7700-4563-ba58-abe36aa77f93.xlsx differ
diff --git a/APPQ5/QMAPP.FJC.Web/Temp/9e3cbd8b-d09d-4a43-8400-6486ec428ef6.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/9e3cbd8b-d09d-4a43-8400-6486ec428ef6.xlsx
new file mode 100644
index 0000000..f7e1c18
Binary files /dev/null and b/APPQ5/QMAPP.FJC.Web/Temp/9e3cbd8b-d09d-4a43-8400-6486ec428ef6.xlsx differ
diff --git a/APPQ5/QMAPP.FJC.Web/Temp/b35b99c1-bd8e-4f80-9e4f-41a1488047c8.xlsx b/APPQ5/QMAPP.FJC.Web/Temp/b35b99c1-bd8e-4f80-9e4f-41a1488047c8.xlsx
new file mode 100644
index 0000000..f7e1c18
Binary files /dev/null and b/APPQ5/QMAPP.FJC.Web/Temp/b35b99c1-bd8e-4f80-9e4f-41a1488047c8.xlsx differ
diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index 585b5c1..ed50406 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -184,13 +184,13 @@
-
+
-
+
diff --git a/APPQ5/QMAPP.WinForm/Common/PrintUtil.cs b/APPQ5/QMAPP.WinForm/Common/PrintUtil.cs
index 97604f9..2f23b5a 100644
--- a/APPQ5/QMAPP.WinForm/Common/PrintUtil.cs
+++ b/APPQ5/QMAPP.WinForm/Common/PrintUtil.cs
@@ -97,7 +97,10 @@ namespace QM.Assist
}
else
{
- thisproc[0].Kill();
+ foreach (var t in thisproc)
+ {
+ t.Kill();
+ }
}
System.Threading.Thread.Sleep(1000);
}
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs
new file mode 100644
index 0000000..a93c06e
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs
@@ -0,0 +1,205 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Drawing;
+using System.Windows.Forms;
+using QMAPP.FJC.Entity.Operation;
+using QMAPP.ServicesAgent;
+using QMAPP.FJC.Entity.BZD;
+using QMAPP.Entity;
+using QMAPP.MD.Entity;
+using System.Text;
+
+namespace QMAPP.WinForm.Forms.TianJin
+{
+ public partial class PlanRePrintForm : Form
+ {
+ //获取服务代理
+ QMAPP.ServicesAgent.ServiceAgent _agent = ClientContext.GetServiceAgent();
+
+ List _Material = null;
+
+ Product _CurrentProduct = null;
+ private TJPrintPlanLabel _parentForm;
+
+
+ public PlanRePrintForm(TJPrintPlanLabel parentForm)
+ {
+ InitializeComponent();
+ infolabel.Text = "";
+ infolabel.ForeColor = Color.Red;
+ _parentForm = parentForm;
+ }
+
+ #region 打印按钮
+
+ ///
+ /// 打印按钮
+ ///
+ ///
+ ///
+ private void button1_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ if (string.IsNullOrWhiteSpace(cbMaterial.Text))
+ {
+ infolabel.Text = "请选择物料号！";
+ cbMaterial.Focus();
+ return;
+ }
+ var data = DateTime.Now.ToString("yyyyMMddHHmmssfff");
+ data = data.Substring(2, data.Length - 2);
+
+ var MATERIAL_CODE = cbMaterial.Text.Split('|')[0];
+ var MATERIAL_NAME = cbMaterial.Text.Split('|')[1];
+
+ List labels = new List();
+ LabelData labeldata = new LabelData();
+
+ labeldata.MATERIALCODE = MATERIAL_CODE;
+
+ string positioncode = GetNameCode(MATERIAL_NAME);
+ var book = _agent.InvokeServiceFunction("FISPhraseBLL_GetFisPhraseBook", MATERIAL_CODE , positioncode);
+ if (book != null)
+ {
+ labeldata.Class = " " + book.Class.Substring(0, 2);
+ labeldata.Description = book.Text;
+ labeldata.OrderNo = book.CarModel + positioncode + data;
+ }
+ var mcresult = _agent.InvokeServiceFunction>("MaterialBLL_Get", new Material { MATERIAL_CODE = MATERIAL_CODE });
+ var material = mcresult.IsSuccess ? mcresult.Result : null;
+ if (material != null)
+ {
+ labeldata.MaterialName = material.MATERIAL_SHORT;
+ labeldata.CarModel = material.PROJECTCODE;
+ }
+ labels.Add(labeldata);
+
+ // _parentForm.planMATERIAL_CODE = MATERIAL_CODE;
+
+ PrintLabel(labels);
+
+ }
+ catch (Exception exception)
+ {
+ MessageBox.Show("打印失败！");
+ throw;
+ }
+ }
+
+ #endregion
+
+ private void PrintLabel(List labeldata)
+ {
+ #region 计划标签打印
+ //string xmlPath = System.Configuration.ConfigurationSettings.AppSettings["XmlName"].ToString(); ;
+ //BarcodeLib.BarCodeGenerate g = new BarcodeLib.BarCodeGenerate( xmlPath);
+ //bool b = g.PrintBarCode(_operationServiceParam.main.MAINCODE);
+ QM.Assist.LabelInfo ll = new QM.Assist.LabelInfo();
+ StringBuilder dataline = new StringBuilder();
+ foreach (var label in labeldata)
+ {
+ string[] texts = new string[6];
+
+ var sourcetext = label.Description.Split(new string[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
+
+ for (int i = 0; i < texts.Length && i < sourcetext.Length; i++)
+ {
+ texts[i] = sourcetext[i];
+ }
+
+ //OrderNo,OrderType,PlanDate,Name,Class,CarModel,Text1,Text2,Text3,Text4,Text5,Text6
+ dataline.AppendFormat("\"{0}\",\"{1}\",\"{2:yyyy-MM-dd HH:mm:ss}\",\"{3}\",\"{4}\",\"{5}\",\"{6}\",\"{7}\",\"{8}\",\"{9}\",\"{10}\",\"{11}\",\"{12}\"\r\n",
+ label.OrderNo,//计划号
+ label.OrderType,//计划类型(0:FIS,1:STOCK,2:INSERT)
+ label.PlanDate,//计划日期
+ label.MaterialName,//总成物料名称
+ label.Class,//
+ label.CarModel,//车型
+ texts[0],//装配详细信息
+ texts[1],//装配详细信息
+ texts[2],//装配详细信息
+ texts[3],//装配详细信息
+ texts[4],//装配详细信息
+ texts[5],//装配详细信息
+ label.MATERIALCODE//
+ );
+
+
+ }
+
+ ll.BarCode = dataline.ToString().TrimEnd('\r', '\n');
+ ll.PrinterName = "";
+ QM.Assist.PrintUtil.LabelList2.Add(ll);
+ QM.Assist.PrintUtil pu = new QM.Assist.PrintUtil();
+ pu.PrintLabel2(System.Configuration.ConfigurationManager.AppSettings["proPath"].ToString
+ (), System.Configuration.ConfigurationManager.AppSettings["PlanLabelTMPPath"].ToString
+ (), System.Configuration.ConfigurationManager.AppSettings["PlanLabelDATPath"].ToString
+ ());
+
+ #endregion
+ }
+
+ public string GetNameCode(string Name)
+ {
+ var Code = "";
+ if (!string.IsNullOrEmpty(Name))
+ {
+ if (Name.Contains("左前"))
+ Code = "FL";
+ else if (Name.Contains("左后"))
+ Code = "RL";
+ else if (Name.Contains("右前"))
+ Code = "FR";
+ else if (Name.Contains("右后"))
+ Code = "RR";
+ return Code;
+ }
+ else
+ return null;
+ }
+
+ #region 初始界面
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ private void PrintForm_Load(object sender, EventArgs e)
+ {
+ _Material = _agent.InvokeServiceFunction>("MaterialBLL_GetMaterialList", new Material { REMARK = "REMARK" });
+ foreach (var t in _Material)
+ {
+ t.MATERIAL_NAME = t.MATERIAL_CODE + "|" + t.MATERIAL_NAME;
+ }
+ LoadAssyMaterial();
+ }
+
+ #endregion
+
+ #region 加载总成物料
+
+ ///
+ /// 加载总成物料
+ ///
+ private void LoadAssyMaterial()
+ {
+
+ //模腔号
+ this.cbMaterial.DataSource = _Material;
+ this.cbMaterial.DisplayMember = "MATERIAL_NAME";
+ this.cbMaterial.ValueMember = "MATERIAL_CODE";
+ }
+
+
+
+ #endregion
+
+ private void label2_Click(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.designer.cs
new file mode 100644
index 0000000..59e4e3d
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.designer.cs
@@ -0,0 +1,118 @@
+using System.Drawing;
+
+namespace QMAPP.WinForm.Forms.TianJin
+{
+ partial class PlanRePrintForm
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.label1 = new System.Windows.Forms.Label();
+ this.button1 = new System.Windows.Forms.Button();
+ this.infolabel = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.cbMaterial = new System.Windows.Forms.ComboBox();
+ this.SuspendLayout();
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("宋体", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label1.Location = new System.Drawing.Point(258, 58);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(169, 37);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "条码补打";
+ //
+ // button1
+ //
+ this.button1.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.button1.Location = new System.Drawing.Point(233, 257);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(221, 35);
+ this.button1.TabIndex = 5;
+ this.button1.Text = "打印";
+ this.button1.UseVisualStyleBackColor = true;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
+ //
+ // infolabel
+ //
+ this.infolabel.AutoSize = true;
+ this.infolabel.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.infolabel.ForeColor = System.Drawing.Color.Red;
+ this.infolabel.Location = new System.Drawing.Point(63, 328);
+ this.infolabel.Name = "infolabel";
+ this.infolabel.Size = new System.Drawing.Size(0, 31);
+ this.infolabel.TabIndex = 6;
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label5.Location = new System.Drawing.Point(27, 164);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(130, 24);
+ this.label5.TabIndex = 2;
+ this.label5.Text = "门板物料号";
+ //
+ // cbMaterial
+ //
+ this.cbMaterial.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cbMaterial.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.cbMaterial.FormattingEnabled = true;
+ this.cbMaterial.Location = new System.Drawing.Point(173, 152);
+ this.cbMaterial.Name = "cbMaterial";
+ this.cbMaterial.Size = new System.Drawing.Size(470, 36);
+ this.cbMaterial.TabIndex = 7;
+ //
+ // PlanRePrintForm
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(665, 399);
+ this.Controls.Add(this.cbMaterial);
+ this.Controls.Add(this.infolabel);
+ this.Controls.Add(this.button1);
+ this.Controls.Add(this.label5);
+ this.Controls.Add(this.label1);
+ this.Name = "PlanRePrintForm";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "条码补打";
+ this.Load += new System.EventHandler(this.PrintForm_Load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Button button1;
+ private System.Windows.Forms.Label infolabel;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.ComboBox cbMaterial;
+ }
+}
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
index 474b25f..d72713c 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
@@ -188,10 +188,54 @@ namespace QMAPP.WinForm.Forms.TianJin
{
QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
DataTable tbl = agent.InvokeServiceFunction(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetList.ToString(), pFisType, WORKCENTER_CODE);
-
tbl.AcceptChanges();
+
+ var tblf = tbl.Select("MOULD_CODE = '左前'");
+ var tblr = tbl.Select("MOULD_CODE = '左后'");
+ var tbrf = tbl.Select("MOULD_CODE = '右前'");
+ var tbrr = tbl.Select("MOULD_CODE = '右后'");
+
+ //if (tb.Rows.Count > 0)
+ //{
+ // tbz = tb.Select(t=>t.);
+ //}
+
+ DataTable tbz = new DataTable();
+
+
if (tbl.Rows.Count <= 0)
{
+ //#region 重新排序
+ //int defaultNum = Convert.ToInt32(QMAPP.WinForm.Common.LocalSetting.Settings["ShowDataCount", "4"]);
+ //if (pFisType == "01")
+ //{
+ // for (int i = 1; i < 100; i++)
+ // {
+ // var num = Convert.ToInt32(i * defaultNum);
+ // if (num > tblf.Count())
+ // {
+ // for (int a = 0; a <= defaultNum; a++)
+ // {
+ // tbz.Rows.Add(tblf[i-1+a]);
+ // }
+ // for (int a = 0; a <= defaultNum; a++)
+ // {
+ // tbz.Rows.Add(tblr[i - 1 + a]);
+ // }
+ // }
+ // else
+ // {
+ // var tblfcount =tblf.Count() - (i - 1) * defaultNum;
+ // for
+ // }
+ // }
+ //}
+ //else
+ //{
+
+ //}
+ //#endregion
+
DataTable dt = (DataTable)dgvMATChange.DataSource;
if (dt != null)
{
@@ -1173,16 +1217,7 @@ namespace QMAPP.WinForm.Forms.TianJin
}
inputstring = txtCode.Text.ToUpper();
this.lberror.Text = null;
-
- #region fis区是否有记录
- if (dgvMATChange.Rows.Count == 0)
- {
- Alert("当前没有发运计划，请先下计划后再扫描!");
- ArragetxtCode();
- return;
- }
- #endregion
-
+
#region 一号位校验是否扫描校验
//2016-01-07 增加1号位校验
@@ -1232,7 +1267,7 @@ namespace QMAPP.WinForm.Forms.TianJin
return;
}
- inputstring += DateTime.Now.ToString("yyyyMMddHHmmssfff");
+ //inputstring += DateTime.Now.ToString("yyyyMMddHHmmssfff");
if (PlaceFirstPositionType == "True")
{
@@ -1269,7 +1304,7 @@ namespace QMAPP.WinForm.Forms.TianJin
strcarsetdesc_cn = rule.MATERIAL_TYPE;
}
}
-
+ strvin = inputstring;
CreateNFPaste(inputstring); //创建NF的贴车单以及明细
//CreateNFPaste__();
@@ -1288,6 +1323,15 @@ namespace QMAPP.WinForm.Forms.TianJin
#endregion
+ #region fis区是否有记录
+ if (dgvMATChange.Rows.Count == 0)
+ {
+ Alert("当前没有发运计划，请先下计划后再扫描!");
+ ArragetxtCode();
+ return;
+ }
+ #endregion
+
#region FIS区域数据全部扫描完成，请获取数据后再扫描
if (dgvNF.Rows.Count >= dgvMATChange.Rows.Count)
{
@@ -1763,7 +1807,7 @@ namespace QMAPP.WinForm.Forms.TianJin
//pastdetail.KIN = strkin;
pastdetail.DGVROWINDEX = dgvrowindex;
- pastdetail.LINENO = strlineno;
+ pastdetail.LINENO = strcarsetdesc_cn.Substring(0,3);
pastdetail.MOULDCODE = strmouldcode;
nfpastecard.DetailsCardlist.Add(pastdetail);
nflist.Add(pastdetail);
@@ -2016,7 +2060,7 @@ namespace QMAPP.WinForm.Forms.TianJin
ncsdr["PRODNO"] = tbl.Rows[i]["PRODNO"].ToString();
ncsdr["CP5A"] = tbl.Rows[i]["CP5A"].ToString(); //门板位置
ncsdr["CARSETDESCCN"] = tbl.Rows[i]["CARSETDESC_CN"].ToString();
- ncsdr["PASTECARDNO"] = tbl.Rows[i]["PASTECARDNO"].ToString();;
+ ncsdr["PASTECARDNO"] = tbl.Rows[i]["PASTECARDNO"].ToString();
ncsdr["SCANDATE"] = DateTime.Now.ToString();
ncsdr["PRODUCTIONNAME"] = strprodtype;
ncsdr["LINENO"] = tbl.Rows[i]["LINENO"].ToString();
@@ -2115,18 +2159,33 @@ namespace QMAPP.WinForm.Forms.TianJin
for (int i = 0; i < tpContainer.ColumnCount; i++)
{
tpContainer.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50));
-
+
for (int j = 0; j < tpContainer.RowCount; j++)
{
Label lblItem = new Label();
- lblItem.Text = (i*rowcount+j+ 1).ToString();
+ lblItem.Text = (i + j * tpContainer.ColumnCount + 1).ToString();
lblItem.Font = new Font("微软雅黑", 24, FontStyle.Bold);
lblItem.Dock = DockStyle.Fill;
lblItem.TextAlign = ContentAlignment.MiddleCenter;
tpContainer.Controls.Add(lblItem, i, j);
}
}
-
+
+ //for (int i = 0; i < tpContainer.ColumnCount; i++)
+ //{
+ // tpContainer.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50));
+
+ // for (int j = 0; j < tpContainer.RowCount; j++)
+ // {
+ // Label lblItem = new Label();
+ // lblItem.Text = (i*rowcount+j+ 1).ToString();
+ // lblItem.Font = new Font("微软雅黑", 24, FontStyle.Bold);
+ // lblItem.Dock = DockStyle.Fill;
+ // lblItem.TextAlign = ContentAlignment.MiddleCenter;
+ // tpContainer.Controls.Add(lblItem, i, j);
+ // }
+ //}
+
for (int i = 0; i < nfindex; i++)
{
SetContainerItem(i, true);
@@ -2151,9 +2210,9 @@ namespace QMAPP.WinForm.Forms.TianJin
else
{
itemindex = itemindex - 1;
- var columnindex = itemindex / (tpContainer.RowCount);
- var rowindex = itemindex % (tpContainer.RowCount);
- var label = tpContainer.GetControlFromPosition(columnindex, rowindex) as Label;
+ var columnindex = itemindex / (tpContainer.ColumnCount);
+ var rowindex = itemindex % (tpContainer.ColumnCount);
+ var label = tpContainer.GetControlFromPosition(rowindex, columnindex) as Label;
if (label != null)
{
label.BackColor = result ? Color.Lime : Color.Red;
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs
index ea91500..a588379 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs
@@ -29,16 +29,16 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TJPrintPlanLabel));
this.dgvPlan = new System.Windows.Forms.DataGridView();
this.dgcOrderNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -55,6 +55,7 @@
this.tpContent = new System.Windows.Forms.TabControl();
this.tpPlanList = new System.Windows.Forms.TabPage();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.tsbPrint = new System.Windows.Forms.ToolStripButton();
this.tsbOrderOperation = new System.Windows.Forms.ToolStripDropDownButton();
this.tsmiSuspendOrder = new System.Windows.Forms.ToolStripMenuItem();
@@ -72,7 +73,13 @@
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.label2 = new System.Windows.Forms.Label();
- this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
+ this.comboBox2 = new System.Windows.Forms.ComboBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
+ this.dtpCREATEDATEEND = new DateTimePickerA();
+ this.dtpCREATEDATESTART = new DateTimePickerA();
+ this.label4 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.dgvPlan)).BeginInit();
this.tpContent.SuspendLayout();
this.tpPlanList.SuspendLayout();
@@ -88,14 +95,14 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.dgvPlan.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
this.dgvPlan.BackgroundColor = System.Drawing.SystemColors.ButtonFace;
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dgvPlan.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle31.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dgvPlan.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle31;
this.dgvPlan.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvPlan.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.dgcOrderNo,
@@ -109,22 +116,22 @@
this.dataGridViewTextBoxColumn9,
this.dataGridViewTextBoxColumn10,
this.dataGridViewTextBoxColumn11});
- this.dgvPlan.Location = new System.Drawing.Point(6, 6);
+ this.dgvPlan.Location = new System.Drawing.Point(6, 11);
this.dgvPlan.Name = "dgvPlan";
this.dgvPlan.ReadOnly = true;
- dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dgvPlan.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;
- dataGridViewCellStyle10.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0);
- this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle10;
+ dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle39.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle39.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dgvPlan.RowHeadersDefaultCellStyle = dataGridViewCellStyle39;
+ dataGridViewCellStyle40.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0);
+ this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle40;
this.dgvPlan.RowTemplate.Height = 23;
this.dgvPlan.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
- this.dgvPlan.Size = new System.Drawing.Size(1350, 183);
+ this.dgvPlan.Size = new System.Drawing.Size(1777, 341);
this.dgvPlan.TabIndex = 7;
this.dgvPlan.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvPlan_RowPrePaint);
this.dgvPlan.SelectionChanged += new System.EventHandler(this.dgvPlan_SelectionChanged);
@@ -132,8 +139,8 @@
// dgcOrderNo
//
this.dgcOrderNo.DataPropertyName = "ORDERPLAN_NO";
- dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.dgcOrderNo.DefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle32.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.dgcOrderNo.DefaultCellStyle = dataGridViewCellStyle32;
this.dgcOrderNo.HeaderText = "订单号";
this.dgcOrderNo.Name = "dgcOrderNo";
this.dgcOrderNo.ReadOnly = true;
@@ -142,8 +149,8 @@
// dgcSeq
//
this.dgcSeq.DataPropertyName = "SEQ";
- dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 15.75F);
- this.dgcSeq.DefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle33.Font = new System.Drawing.Font("宋体", 15.75F);
+ this.dgcSeq.DefaultCellStyle = dataGridViewCellStyle33;
this.dgcSeq.HeaderText = "顺序号";
this.dgcSeq.Name = "dgcSeq";
this.dgcSeq.ReadOnly = true;
@@ -152,8 +159,8 @@
// dgcMaterialCode
//
this.dgcMaterialCode.DataPropertyName = "MATERIAL_CODE";
- dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 15.75F);
- this.dgcMaterialCode.DefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle34.Font = new System.Drawing.Font("宋体", 15.75F);
+ this.dgcMaterialCode.DefaultCellStyle = dataGridViewCellStyle34;
this.dgcMaterialCode.HeaderText = "零件号";
this.dgcMaterialCode.Name = "dgcMaterialCode";
this.dgcMaterialCode.ReadOnly = true;
@@ -162,8 +169,8 @@
// dgcMaterialName
//
this.dgcMaterialName.DataPropertyName = "MATERIAL_NAME";
- dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 15.75F);
- this.dgcMaterialName.DefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle35.Font = new System.Drawing.Font("宋体", 15.75F);
+ this.dgcMaterialName.DefaultCellStyle = dataGridViewCellStyle35;
this.dgcMaterialName.HeaderText = "零件描述";
this.dgcMaterialName.Name = "dgcMaterialName";
this.dgcMaterialName.ReadOnly = true;
@@ -171,8 +178,8 @@
//
// dgcState
//
- dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.dgcState.DefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle36.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.dgcState.DefaultCellStyle = dataGridViewCellStyle36;
this.dgcState.HeaderText = "工单状态";
this.dgcState.MinimumWidth = 80;
this.dgcState.Name = "dgcState";
@@ -182,8 +189,8 @@
// dgcPlanDate
//
this.dgcPlanDate.DataPropertyName = "PLAN_DATE";
- dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 15.75F);
- this.dgcPlanDate.DefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle37.Font = new System.Drawing.Font("宋体", 15.75F);
+ this.dgcPlanDate.DefaultCellStyle = dataGridViewCellStyle37;
this.dgcPlanDate.HeaderText = "计划日期";
this.dgcPlanDate.Name = "dgcPlanDate";
this.dgcPlanDate.ReadOnly = true;
@@ -192,8 +199,8 @@
// dgcShift
//
this.dgcShift.DataPropertyName = "SHIFT_CODE";
- dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 15.75F);
- this.dgcShift.DefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle38.Font = new System.Drawing.Font("宋体", 15.75F);
+ this.dgcShift.DefaultCellStyle = dataGridViewCellStyle38;
this.dgcShift.HeaderText = "计划类型";
this.dgcShift.Name = "dgcShift";
this.dgcShift.ReadOnly = true;
@@ -246,7 +253,7 @@
this.tpContent.Location = new System.Drawing.Point(5, 55);
this.tpContent.Name = "tpContent";
this.tpContent.SelectedIndex = 0;
- this.tpContent.Size = new System.Drawing.Size(1370, 323);
+ this.tpContent.Size = new System.Drawing.Size(1797, 481);
this.tpContent.TabIndex = 0;
//
// tpPlanList
@@ -257,7 +264,7 @@
this.tpPlanList.Location = new System.Drawing.Point(4, 49);
this.tpPlanList.Name = "tpPlanList";
this.tpPlanList.Padding = new System.Windows.Forms.Padding(3);
- this.tpPlanList.Size = new System.Drawing.Size(1362, 270);
+ this.tpPlanList.Size = new System.Drawing.Size(1789, 428);
this.tpPlanList.TabIndex = 0;
this.tpPlanList.Text = "计划列表";
this.tpPlanList.UseVisualStyleBackColor = true;
@@ -268,17 +275,30 @@
this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripButton2,
this.toolStripButton1,
this.tsbPrint,
this.tsbOrderOperation,
this.tslblOrderCount});
- this.toolStrip1.Location = new System.Drawing.Point(3, 197);
+ this.toolStrip1.Location = new System.Drawing.Point(3, 355);
this.toolStrip1.Name = "toolStrip1";
- this.toolStrip1.Size = new System.Drawing.Size(1356, 70);
+ this.toolStrip1.Size = new System.Drawing.Size(1783, 70);
this.toolStrip1.Stretch = true;
this.toolStrip1.TabIndex = 0;
this.toolStrip1.Text = "toolStrip1";
//
+ // toolStripButton1
+ //
+ this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripButton1.Font = new System.Drawing.Font("微软雅黑", 12F);
+ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+ this.toolStripButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.White;
+ this.toolStripButton1.Name = "toolStripButton1";
+ this.toolStripButton1.Size = new System.Drawing.Size(146, 67);
+ this.toolStripButton1.Text = "批量打印(&P)";
+ this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
+ //
// tsbPrint
//
this.tsbPrint.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
@@ -311,7 +331,7 @@
this.tsmiSuspendOrder.Image = global::QMAPP.WinForm.Resource1.stop;
this.tsmiSuspendOrder.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7);
this.tsmiSuspendOrder.Name = "tsmiSuspendOrder";
- this.tsmiSuspendOrder.Size = new System.Drawing.Size(184, 26);
+ this.tsmiSuspendOrder.Size = new System.Drawing.Size(144, 26);
this.tsmiSuspendOrder.Text = "挂起工单";
this.tsmiSuspendOrder.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.tsmiSuspendOrder.Click += new System.EventHandler(this.tsmiSuspendOrder_Click);
@@ -321,7 +341,7 @@
this.tsmiCancelSuspend.Image = global::QMAPP.WinForm.Resource1.back;
this.tsmiCancelSuspend.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7);
this.tsmiCancelSuspend.Name = "tsmiCancelSuspend";
- this.tsmiCancelSuspend.Size = new System.Drawing.Size(184, 26);
+ this.tsmiCancelSuspend.Size = new System.Drawing.Size(144, 26);
this.tsmiCancelSuspend.Text = "取消挂起";
this.tsmiCancelSuspend.Click += new System.EventHandler(this.tsmiCancelSuspend_Click);
//
@@ -330,7 +350,7 @@
this.tsmiDeleteOrder.Image = global::QMAPP.WinForm.Resource1.delete;
this.tsmiDeleteOrder.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7);
this.tsmiDeleteOrder.Name = "tsmiDeleteOrder";
- this.tsmiDeleteOrder.Size = new System.Drawing.Size(184, 26);
+ this.tsmiDeleteOrder.Size = new System.Drawing.Size(144, 26);
this.tsmiDeleteOrder.Text = "删除工单";
this.tsmiDeleteOrder.Click += new System.EventHandler(this.tsmiDeleteOrder_Click);
//
@@ -370,7 +390,7 @@
"显示全部工单",
"隐藏挂起工单",
"只看挂起工单"});
- this.cbPlanFilter.Location = new System.Drawing.Point(849, 66);
+ this.cbPlanFilter.Location = new System.Drawing.Point(1276, 66);
this.cbPlanFilter.Name = "cbPlanFilter";
this.cbPlanFilter.Size = new System.Drawing.Size(175, 33);
this.cbPlanFilter.TabIndex = 2;
@@ -380,7 +400,7 @@
this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label10.AutoSize = true;
this.label10.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label10.Location = new System.Drawing.Point(781, 72);
+ this.label10.Location = new System.Drawing.Point(1208, 72);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(65, 20);
this.label10.TabIndex = 16;
@@ -398,7 +418,7 @@
"40",
"50",
"100"});
- this.cbListRowcount.Location = new System.Drawing.Point(1123, 66);
+ this.cbListRowcount.Location = new System.Drawing.Point(1550, 66);
this.cbListRowcount.Name = "cbListRowcount";
this.cbListRowcount.Size = new System.Drawing.Size(78, 33);
this.cbListRowcount.TabIndex = 3;
@@ -416,7 +436,7 @@
"10s",
"15s",
"20s"});
- this.cbRefreshRate.Location = new System.Drawing.Point(1300, 66);
+ this.cbRefreshRate.Location = new System.Drawing.Point(1727, 66);
this.cbRefreshRate.Name = "cbRefreshRate";
this.cbRefreshRate.Size = new System.Drawing.Size(66, 33);
this.cbRefreshRate.TabIndex = 4;
@@ -426,7 +446,7 @@
this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label8.Location = new System.Drawing.Point(1027, 72);
+ this.label8.Location = new System.Drawing.Point(1454, 72);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(93, 20);
this.label8.TabIndex = 12;
@@ -437,7 +457,7 @@
this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label6.Location = new System.Drawing.Point(1204, 72);
+ this.label6.Location = new System.Drawing.Point(1631, 72);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(93, 20);
this.label6.TabIndex = 13;
@@ -455,9 +475,9 @@
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox1.FormattingEnabled = true;
- this.comboBox1.Location = new System.Drawing.Point(595, 64);
+ this.comboBox1.Location = new System.Drawing.Point(1106, 64);
this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(175, 33);
+ this.comboBox1.Size = new System.Drawing.Size(91, 33);
this.comboBox1.TabIndex = 17;
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
@@ -466,29 +486,105 @@
this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label2.Location = new System.Drawing.Point(524, 72);
+ this.label2.Location = new System.Drawing.Point(1033, 72);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(65, 20);
this.label2.TabIndex = 18;
this.label2.Text = "门板位置";
//
- // toolStripButton1
- //
- this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
- this.toolStripButton1.Font = new System.Drawing.Font("微软雅黑", 12F);
- this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
- this.toolStripButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.White;
- this.toolStripButton1.Name = "toolStripButton1";
- this.toolStripButton1.Size = new System.Drawing.Size(146, 67);
- this.toolStripButton1.Text = "批量打印(&P)";
- this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
+ // comboBox2
+ //
+ this.comboBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBox2.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.comboBox2.FormattingEnabled = true;
+ this.comboBox2.Location = new System.Drawing.Point(930, 64);
+ this.comboBox2.Name = "comboBox2";
+ this.comboBox2.Size = new System.Drawing.Size(91, 33);
+ this.comboBox2.TabIndex = 19;
+ //
+ // label3
+ //
+ this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.label3.AutoSize = true;
+ this.label3.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label3.Location = new System.Drawing.Point(856, 71);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(65, 20);
+ this.label3.TabIndex = 20;
+ this.label3.Text = "计划类型";
+ //
+ // toolStripButton2
+ //
+ this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripButton2.Font = new System.Drawing.Font("微软雅黑", 12F);
+ this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
+ this.toolStripButton2.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.White;
+ this.toolStripButton2.Name = "toolStripButton2";
+ this.toolStripButton2.Size = new System.Drawing.Size(126, 67);
+ this.toolStripButton2.Text = "条码补打";
+ this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
+ //
+ // dtpCREATEDATEEND
+ //
+ this.dtpCREATEDATEEND.CustomFormat = " ";
+ this.dtpCREATEDATEEND.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold);
+ this.dtpCREATEDATEEND.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+ this.dtpCREATEDATEEND.FormatString = "yyyy年MM月dd日";
+ this.dtpCREATEDATEEND.Location = new System.Drawing.Point(788, 66);
+ this.dtpCREATEDATEEND.Name = "dtpCREATEDATEEND";
+ this.dtpCREATEDATEEND.OriginalFormat = System.Windows.Forms.DateTimePickerFormat.Custom;
+ this.dtpCREATEDATEEND.Size = new System.Drawing.Size(160, 26);
+ this.dtpCREATEDATEEND.TabIndex = 24;
+ this.dtpCREATEDATEEND.ValueX = null;
+ this.dtpCREATEDATEEND.ValueChanged += new System.EventHandler(this.dtpCREATEDATEEND_ValueChanged);
+ //
+ // dtpCREATEDATESTART
+ //
+ this.dtpCREATEDATESTART.CustomFormat = " ";
+ this.dtpCREATEDATESTART.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold);
+ this.dtpCREATEDATESTART.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+ this.dtpCREATEDATESTART.FormatString = "yyyy年MM月dd日";
+ this.dtpCREATEDATESTART.Location = new System.Drawing.Point(590, 66);
+ this.dtpCREATEDATESTART.Name = "dtpCREATEDATESTART";
+ this.dtpCREATEDATESTART.OriginalFormat = System.Windows.Forms.DateTimePickerFormat.Custom;
+ this.dtpCREATEDATESTART.Size = new System.Drawing.Size(160, 26);
+ this.dtpCREATEDATESTART.TabIndex = 23;
+ this.dtpCREATEDATESTART.ValueX = null;
+ this.dtpCREATEDATESTART.ValueChanged += new System.EventHandler(this.dtpCREATEDATESTART_ValueChanged);
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label4.Location = new System.Drawing.Point(514, 69);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(69, 20);
+ this.label4.TabIndex = 21;
+ this.label4.Text = "计划时间";
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label5.Location = new System.Drawing.Point(757, 69);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(24, 20);
+ this.label5.TabIndex = 22;
+ this.label5.Text = "至";
//
// TJPrintPlanLabel
//
this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 25F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1378, 382);
+ this.ClientSize = new System.Drawing.Size(1805, 540);
+ this.Controls.Add(this.dtpCREATEDATEEND);
+ this.Controls.Add(this.dtpCREATEDATESTART);
+ this.Controls.Add(this.label4);
+ this.Controls.Add(this.label5);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.comboBox2);
this.Controls.Add(this.label2);
this.Controls.Add(this.comboBox1);
this.Controls.Add(this.cbPlanFilter);
@@ -551,5 +647,12 @@
private System.Windows.Forms.ComboBox comboBox1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.ToolStripButton toolStripButton1;
+ private System.Windows.Forms.ComboBox comboBox2;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.ToolStripButton toolStripButton2;
+ private DateTimePickerA dtpCREATEDATEEND;
+ private DateTimePickerA dtpCREATEDATESTART;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Label label5;
}
}
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
index 8e6d531..d7905b7 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
@@ -13,6 +13,7 @@ using QMAPP.MD.Entity;
using QMAPP.Entity;
using QMFrameWork.Data;
using System.Configuration;
+using System.Threading;
namespace QMAPP.WinForm.Forms.TianJin
{
@@ -21,7 +22,8 @@ namespace QMAPP.WinForm.Forms.TianJin
QMAPP.ServicesAgent.ServiceAgent _agent = ClientContext.GetServiceAgent();
List cbsource = null;
-
+ private string planMATERIAL_CODE = string.Empty;
+
///
///
///
@@ -51,6 +53,14 @@ namespace QMAPP.WinForm.Forms.TianJin
comboBox1.DisplayMember = "Name";
comboBox1.ValueMember = "Code";
comboBox1.DataSource = listDir;
+
+ var listSHIFT = new List();
+ listSHIFT.Add(new Direction { Code = "A", Name = "A班" });
+ listSHIFT.Add(new Direction { Code = "B", Name = "B班" });
+ listSHIFT.Add(new Direction { Code = "C", Name = "C班" });
+ comboBox2.DisplayMember = "Name";
+ comboBox2.ValueMember = "Code";
+ comboBox2.DataSource = listSHIFT;
}
#region 加载列表显示设置
@@ -77,6 +87,7 @@ namespace QMAPP.WinForm.Forms.TianJin
cbRefreshRate.SelectedIndexChanged += new EventHandler(cbRefreshRate_SelectedIndexChanged);
cbPlanFilter.TextChanged += new EventHandler(cbPlanFilter_SelectedIndexChanged);
comboBox1.TextChanged += new EventHandler(cbPlanFilter_SelectedIndexChanged);
+ comboBox2.TextChanged += new EventHandler(cbPlanFilter_SelectedIndexChanged);
#endregion
}
@@ -103,8 +114,18 @@ namespace QMAPP.WinForm.Forms.TianJin
dataPage.PageSize = int.Parse(cbListRowcount.Text);
dataPage.PageIndex = 1;
dataPage.SortExpression = " ROWVALUE ASC";
+ //操作开始时间
+ //if (string.IsNullOrEmpty(this.dtpCREATEDATESTART.Text.Trim()) == false)
+ //{
+ // searchModel.BeginTime = Convert.ToDateTime((this.dtpCREATEDATESTART.Value).ToString("yyyy-MM-dd") + " 00:00:00");
+ //}
+ ////操作结束时间
+ //if (string.IsNullOrEmpty(this.dtpCREATEDATEEND.Text.Trim()) == false)
+ //{
+ // searchModel.EndTime = Convert.ToDateTime((this.dtpCREATEDATEEND.Value).ToString("yyyy-MM-dd") + " 23:59:59");
+ //}
#region 服务查询
- var orderlist = _agent.InvokeServiceFunction>("TJWorkOrderBLL_GetOrderUnPrinted", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString());
+ var orderlist = _agent.InvokeServiceFunction>("TJWorkOrderBLL_GetOrderUnPrinted", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString(), comboBox2.SelectedValue.ToString(), this.dtpCREATEDATESTART.Value.ToString(), this.dtpCREATEDATEEND.Value.ToString());
#endregion
this.dgvPlan.DataSource = orderlist;
}
@@ -207,7 +228,7 @@ namespace QMAPP.WinForm.Forms.TianJin
#endregion
}
-
+
private void PrintPlanLabel_Load(object sender, EventArgs e)
{
LoadViewSetting();
@@ -474,7 +495,7 @@ namespace QMAPP.WinForm.Forms.TianJin
//变更打印状态 0=>1
_agent.InvokeServiceFunction("WorkOrderBLL_SetOrderPrinted", orders[0].PID);
-
+ InsertProduct(labeldata.OrderNo, orders[0].MATERIAL_CODE);
BindPlanView();
tsbPrint.Enabled = true;
}
@@ -497,6 +518,55 @@ namespace QMAPP.WinForm.Forms.TianJin
return null;
}
+ ///
+ ///
+ ///
+ ///
+ ///
+ public void InsertProduct(string ProductCode,string Material_Code)
+ {
+ #region 组成新增产品实例
+ Product newProduct = new Product();
+
+ newProduct.PID = Guid.NewGuid().ToString();
+
+ newProduct.PRODUCTTYPE = string.Empty;
+
+ newProduct.PRODUCTCODE = ProductCode;
+
+ newProduct.PRODUCTSOURCE = "0";
+
+ newProduct.MACHINENAME = "门板打印";
+
+ newProduct.MACHINECODDE = "门板打印";
+
+ newProduct.MATERIAL_CODE = Material_Code;
+
+ newProduct.STATUS = "0";
+
+ newProduct.OUTFLAG = "0";
+
+ newProduct.CAPACITY = 1;
+
+ newProduct.USINGCOUNT = 0;
+
+ newProduct.WORKCELL_CODE = "PREPARE1";
+
+ newProduct.WORKLOC_CODE = "DP_PREPARELOC1";
+
+ newProduct.WORKCENTER_CODE = "WORK770B";
+
+ newProduct.MATERIAL_TYPE = "DP_FINASSY";
+
+ newProduct.USINGSTATE = "0";
+
+ #endregion
+
+ //新增
+ //ProductHelper.Insert(newProduct);
+ _agent.InvokeServiceFunction>("ProductBLL_Insert", newProduct);
+ }
+
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
SaveSetting();
@@ -522,6 +592,8 @@ namespace QMAPP.WinForm.Forms.TianJin
for (var i = 0; i < count; i++)
{
+ System.Threading.Thread.Sleep(3000);
+
var orders = new List();
var order1 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[i].DataBoundItem;
@@ -568,6 +640,22 @@ namespace QMAPP.WinForm.Forms.TianJin
BindPlanView();
toolStripButton1.Enabled = true;
}
+
+ private void toolStripButton2_Click(object sender, EventArgs e)
+ {
+ PlanRePrintForm frm = new PlanRePrintForm(this);
+ frm.ShowDialog();
+ }
+
+ private void dtpCREATEDATESTART_ValueChanged(object sender, EventArgs e)
+ {
+ BindPlanView();
+ }
+
+ private void dtpCREATEDATEEND_ValueChanged(object sender, EventArgs e)
+ {
+ BindPlanView();
+ }
}
class Direction {
public string Code { get; set; }
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx
index c4731e6..845a04e 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx
@@ -153,6 +153,9 @@
17, 17
+
+ 17, 17
+
@@ -297,6 +300,76 @@
127, 17
+
+
+ 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
+ Ae6xxmll7eSUAAAAAElFTkSuQmCC
+
+
63
diff --git a/APPQ5/QMAPP.WinForm/Menu.xml b/APPQ5/QMAPP.WinForm/Menu.xml
index b5b6e24..64f56df 100644
--- a/APPQ5/QMAPP.WinForm/Menu.xml
+++ b/APPQ5/QMAPP.WinForm/Menu.xml
@@ -35,6 +35,7 @@
+
@@ -46,6 +47,9 @@
+
+
+
@@ -58,7 +62,8 @@
-
+
+
diff --git a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs
index 72d343b..bf8ed5d 100644
--- a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs
+++ b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2022.03.31.01")]
-[assembly: AssemblyFileVersion("2022.03.31.01")]
+[assembly: AssemblyVersion("2022.04.09.01")]
+[assembly: AssemblyFileVersion("2022.04.09.01")]
diff --git a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj
index 0da36a0..8f9d25a 100644
--- a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj
+++ b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj
@@ -801,6 +801,12 @@
ReprintForm.cs
+
+ Form
+
+
+ PlanRePrintForm.cs
+
Form
@@ -1314,6 +1320,9 @@
ReprintForm.cs
+
+ PlanRePrintForm.cs
+
TJOutWarehouseForm.cs
Designer