From 1b6b6f124790ff050746bdaa5e65ca0d833c46ec Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Sat, 9 Apr 2022 00:56:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E6=B4=A5=E5=AE=8C=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APP/QMAPP.Web/App_Data/MainPower.xml | 11 + APP/QMAPP.Web/App_Data/PCPower.xml | 6 +- APP/QMAPP.Web/QMAPP.Web.csproj | 7 + APPMD/QMAPP.MD.DAL/MaterialDAL.cs | 4 + APPMD/QMAPP.MD.DAL/ProcessRouteDAL.cs | 2 +- APPMD/QMAPP.MD.Web/QMAPP.MD.Web.csproj | 1 + .../TianJin/TJDoorPlankPlanBLL.cs | 65 +++-- APPQ5/QMAPP.FJC.BLL/TianJin/TJWorkOrderBLL.cs | 4 +- APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs | 38 ++- APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs | 14 +- .../DAHandler/DataAcquirer.cs | 32 ++- .../DataAnalyzers/TJDPFISCodeAnalyzer.cs | 161 +++++++++++ .../QMAPP.FJC.TRACING.csproj | 1 + .../App_Data/Excel/TJDoorPlankPlanImp.xlsx | Bin 9343 -> 9306 bytes .../App_Data/Excel/TJDoorPlankPlanImp.xml | 8 +- .../Models/TianJin/TJDoorPlankPlanModel.cs | 2 +- .../060540e8-be79-4fbf-b956-679bf3775c9e.xlsx | Bin 0 -> 9416 bytes .../2a4faca6-f361-4483-b9e7-d914d0dccfbd.xlsx | Bin 0 -> 9416 bytes .../3571a329-f8f8-403e-b595-550e4c3e264b.xlsx | Bin 0 -> 9410 bytes .../91e5dcd7-7700-4563-ba58-abe36aa77f93.xlsx | Bin 0 -> 9416 bytes .../9e3cbd8b-d09d-4a43-8400-6486ec428ef6.xlsx | Bin 0 -> 9416 bytes .../b35b99c1-bd8e-4f80-9e4f-41a1488047c8.xlsx | Bin 0 -> 9416 bytes APPQ5/QMAPP.WinForm/App.config | 8 +- APPQ5/QMAPP.WinForm/Common/PrintUtil.cs | 5 +- .../Forms/TianJin/PlanRePrintForm.cs | 205 ++++++++++++++ .../Forms/TianJin/PlanRePrintForm.designer.cs | 118 +++++++++ .../Forms/TianJin/PlanRePrintForm.resx | 120 +++++++++ .../QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs | 101 +++++-- .../TianJin/TJPrintPlanLabel.Designer.cs | 249 +++++++++++++----- .../Forms/TianJin/TJPrintPlanLabel.cs | 96 ++++++- .../Forms/TianJin/TJPrintPlanLabel.resx | 73 +++++ APPQ5/QMAPP.WinForm/Menu.xml | 7 +- .../QMAPP.WinForm/Properties/AssemblyInfo.cs | 4 +- APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj | 9 + 34 files changed, 1188 insertions(+), 163 deletions(-) create mode 100644 APPQ5/QMAPP.FJC.TRACING/DataAnalyzers/TJDPFISCodeAnalyzer.cs create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/060540e8-be79-4fbf-b956-679bf3775c9e.xlsx create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/2a4faca6-f361-4483-b9e7-d914d0dccfbd.xlsx create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/3571a329-f8f8-403e-b595-550e4c3e264b.xlsx create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/91e5dcd7-7700-4563-ba58-abe36aa77f93.xlsx create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/9e3cbd8b-d09d-4a43-8400-6486ec428ef6.xlsx create mode 100644 APPQ5/QMAPP.FJC.Web/Temp/b35b99c1-bd8e-4f80-9e4f-41a1488047c8.xlsx create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.designer.cs create mode 100644 APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.resx 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 0000000000000000000000000000000000000000..f7e1c18d6bbbb911bede90616718e84141df580b GIT binary patch literal 9416 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f7e1c18d6bbbb911bede90616718e84141df580b GIT binary patch literal 9416 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8dae8a46b2c98b7299870571e313524b7cfe4c03 GIT binary patch literal 9410 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f7e1c18d6bbbb911bede90616718e84141df580b GIT binary patch literal 9416 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f7e1c18d6bbbb911bede90616718e84141df580b GIT binary patch literal 9416 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f7e1c18d6bbbb911bede90616718e84141df580b GIT binary patch literal 9416 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 literal 0 HcmV?d00001 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