From b13f610551f65032f92342d69455b76ac6af98ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE=E7=94=B7?= <446507344@qq.com> Date: Wed, 12 Apr 2023 08:42:03 +0800 Subject: [PATCH] 11 --- .../Forms/TianJin/PlanRePrintForm.cs | 1 + .../TianJin/TJPrintPlanLabel.Designer.cs | 114 +++++++++--------- .../Forms/TianJin/TJPrintPlanLabel.cs | 8 +- .../Forms/TianJin/TJPrintPlanLabel.resx | 8 +- .../QMAPP.WinForm/Properties/AssemblyInfo.cs | 4 +- 5 files changed, 69 insertions(+), 66 deletions(-) diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs index 60638ca..3c9a5ac 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs @@ -218,6 +218,7 @@ namespace QMAPP.WinForm.Forms.TianJin var list = new List(); list.Add(new Linese() { NAME = "018D", CODE = "018D" }); list.Add(new Linese() { NAME = "770B", CODE = "770B" }); + list.Add(new Linese() { NAME = "278D", CODE = "278D" }); this.Lines.DataSource = list; this.Lines.DisplayMember = "NAME"; this.Lines.ValueMember = "CODE"; diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs index 7bad796..c5e37eb 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs @@ -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.SelectStripButton = new System.Windows.Forms.ToolStripButton(); this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.tsbPrint = new System.Windows.Forms.ToolStripButton(); @@ -78,7 +79,6 @@ this.dtpCREATEDATESTART = new DateTimePickerA(); this.label4 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); - this.SelectStripButton = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.dgvPlan)).BeginInit(); this.tpContent.SuspendLayout(); this.tpPlanList.SuspendLayout(); @@ -130,7 +130,7 @@ this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle10; this.dgvPlan.RowTemplate.Height = 23; this.dgvPlan.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvPlan.Size = new System.Drawing.Size(1319, 341); + this.dgvPlan.Size = new System.Drawing.Size(1617, 641); this.dgvPlan.TabIndex = 7; this.dgvPlan.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvPlan_RowPrePaint); this.dgvPlan.SelectionChanged += new System.EventHandler(this.dgvPlan_SelectionChanged); @@ -143,7 +143,7 @@ this.dgcOrderNo.HeaderText = "订单号"; this.dgcOrderNo.Name = "dgcOrderNo"; this.dgcOrderNo.ReadOnly = true; - this.dgcOrderNo.Width = 94; + this.dgcOrderNo.Width = 135; // // dgcSeq // @@ -153,7 +153,7 @@ this.dgcSeq.HeaderText = "顺序号"; this.dgcSeq.Name = "dgcSeq"; this.dgcSeq.ReadOnly = true; - this.dgcSeq.Width = 94; + this.dgcSeq.Width = 135; // // dgcMaterialCode // @@ -163,7 +163,7 @@ this.dgcMaterialCode.HeaderText = "零件号"; this.dgcMaterialCode.Name = "dgcMaterialCode"; this.dgcMaterialCode.ReadOnly = true; - this.dgcMaterialCode.Width = 94; + this.dgcMaterialCode.Width = 135; // // dgcMaterialName // @@ -173,7 +173,7 @@ this.dgcMaterialName.HeaderText = "零件描述"; this.dgcMaterialName.Name = "dgcMaterialName"; this.dgcMaterialName.ReadOnly = true; - this.dgcMaterialName.Width = 113; + this.dgcMaterialName.Width = 163; // // dgcState // @@ -183,7 +183,7 @@ this.dgcState.MinimumWidth = 80; this.dgcState.Name = "dgcState"; this.dgcState.ReadOnly = true; - this.dgcState.Width = 113; + this.dgcState.Width = 163; // // dgcPlanDate // @@ -193,7 +193,7 @@ this.dgcPlanDate.HeaderText = "计划日期"; this.dgcPlanDate.Name = "dgcPlanDate"; this.dgcPlanDate.ReadOnly = true; - this.dgcPlanDate.Width = 113; + this.dgcPlanDate.Width = 163; // // dgcShift // @@ -203,7 +203,7 @@ this.dgcShift.HeaderText = "计划类型"; this.dgcShift.Name = "dgcShift"; this.dgcShift.ReadOnly = true; - this.dgcShift.Width = 113; + this.dgcShift.Width = 163; // // dataGridViewTextBoxColumn8 // @@ -252,7 +252,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(1339, 481); + this.tpContent.Size = new System.Drawing.Size(1637, 781); this.tpContent.TabIndex = 0; // // tpPlanList @@ -263,7 +263,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(1331, 428); + this.tpPlanList.Size = new System.Drawing.Size(1629, 728); this.tpPlanList.TabIndex = 0; this.tpPlanList.Text = "计划列表"; this.tpPlanList.UseVisualStyleBackColor = true; @@ -280,13 +280,25 @@ this.tsbPrint, this.tsbOrderOperation, this.tslblOrderCount}); - this.toolStrip1.Location = new System.Drawing.Point(3, 355); + this.toolStrip1.Location = new System.Drawing.Point(3, 655); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1325, 70); + this.toolStrip1.Size = new System.Drawing.Size(1623, 70); this.toolStrip1.Stretch = true; this.toolStrip1.TabIndex = 0; this.toolStrip1.Text = "toolStrip1"; // + // SelectStripButton + // + this.SelectStripButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.SelectStripButton.Font = new System.Drawing.Font("微软雅黑", 12F); + this.SelectStripButton.Image = ((System.Drawing.Image)(resources.GetObject("SelectStripButton.Image"))); + this.SelectStripButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.SelectStripButton.ImageTransparentColor = System.Drawing.Color.White; + this.SelectStripButton.Name = "SelectStripButton"; + this.SelectStripButton.Size = new System.Drawing.Size(114, 67); + this.SelectStripButton.Text = "刷新"; + this.SelectStripButton.Click += new System.EventHandler(this.SelectStripButton_Click); + // // toolStripButton2 // this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; @@ -295,7 +307,7 @@ 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.Size = new System.Drawing.Size(162, 67); this.toolStripButton2.Text = "条码补打"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); // @@ -307,7 +319,7 @@ 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.Size = new System.Drawing.Size(193, 67); this.toolStripButton1.Text = "批量打印(&P)"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // @@ -319,7 +331,7 @@ this.tsbPrint.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.tsbPrint.ImageTransparentColor = System.Drawing.Color.White; this.tsbPrint.Name = "tsbPrint"; - this.tsbPrint.Size = new System.Drawing.Size(114, 67); + this.tsbPrint.Size = new System.Drawing.Size(145, 67); this.tsbPrint.Text = "打印(&P)"; this.tsbPrint.Click += new System.EventHandler(this.tsbPrint_Click); // @@ -335,7 +347,7 @@ this.tsbOrderOperation.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.tsbOrderOperation.ImageTransparentColor = System.Drawing.Color.White; this.tsbOrderOperation.Name = "tsbOrderOperation"; - this.tsbOrderOperation.Size = new System.Drawing.Size(135, 67); + this.tsbOrderOperation.Size = new System.Drawing.Size(176, 67); this.tsbOrderOperation.Text = "工单操作"; // // tsmiSuspendOrder @@ -343,7 +355,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(196, 36); this.tsmiSuspendOrder.Text = "挂起工单"; this.tsmiSuspendOrder.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.tsmiSuspendOrder.Click += new System.EventHandler(this.tsmiSuspendOrder_Click); @@ -353,7 +365,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(196, 36); this.tsmiCancelSuspend.Text = "取消挂起"; this.tsmiCancelSuspend.Click += new System.EventHandler(this.tsmiCancelSuspend_Click); // @@ -362,7 +374,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(196, 36); this.tsmiDeleteOrder.Text = "删除工单"; this.tsmiDeleteOrder.Click += new System.EventHandler(this.tsmiDeleteOrder_Click); // @@ -370,7 +382,7 @@ // this.tslblOrderCount.Font = new System.Drawing.Font("微软雅黑", 14F); this.tslblOrderCount.Name = "tslblOrderCount"; - this.tslblOrderCount.Size = new System.Drawing.Size(140, 67); + this.tslblOrderCount.Size = new System.Drawing.Size(203, 67); this.tslblOrderCount.Text = "计划总数：100"; this.tslblOrderCount.Visible = false; // @@ -379,7 +391,7 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(12, 13); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(69, 25); + this.label1.Size = new System.Drawing.Size(99, 36); this.label1.TabIndex = 10; this.label1.Text = "生产线"; // @@ -389,7 +401,7 @@ this.cbRoutes.FormattingEnabled = true; this.cbRoutes.Location = new System.Drawing.Point(87, 10); this.cbRoutes.Name = "cbRoutes"; - this.cbRoutes.Size = new System.Drawing.Size(359, 33); + this.cbRoutes.Size = new System.Drawing.Size(359, 44); this.cbRoutes.TabIndex = 1; // // cbPlanFilter @@ -402,9 +414,9 @@ "显示全部工单", "隐藏挂起工单", "只看挂起工单"}); - this.cbPlanFilter.Location = new System.Drawing.Point(980, 66); + this.cbPlanFilter.Location = new System.Drawing.Point(1278, 66); this.cbPlanFilter.Name = "cbPlanFilter"; - this.cbPlanFilter.Size = new System.Drawing.Size(175, 33); + this.cbPlanFilter.Size = new System.Drawing.Size(175, 44); this.cbPlanFilter.TabIndex = 2; // // label10 @@ -412,9 +424,9 @@ 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(912, 72); + this.label10.Location = new System.Drawing.Point(1210, 72); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(65, 20); + this.label10.Size = new System.Drawing.Size(92, 27); this.label10.TabIndex = 16; this.label10.Text = "工单过滤"; // @@ -430,9 +442,9 @@ "20", "30", "40"}); - this.cbListRowcount.Location = new System.Drawing.Point(1254, 66); + this.cbListRowcount.Location = new System.Drawing.Point(1552, 66); this.cbListRowcount.Name = "cbListRowcount"; - this.cbListRowcount.Size = new System.Drawing.Size(78, 33); + this.cbListRowcount.Size = new System.Drawing.Size(78, 44); this.cbListRowcount.TabIndex = 3; // // label8 @@ -440,9 +452,9 @@ 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(1158, 72); + this.label8.Location = new System.Drawing.Point(1456, 72); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(93, 20); + this.label8.Size = new System.Drawing.Size(132, 27); this.label8.TabIndex = 12; this.label8.Text = "列表显示行数"; // @@ -457,9 +469,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(810, 64); + this.comboBox1.Location = new System.Drawing.Point(1108, 64); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(91, 33); + this.comboBox1.Size = new System.Drawing.Size(91, 44); this.comboBox1.TabIndex = 17; this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // @@ -468,9 +480,9 @@ 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(737, 72); + this.label2.Location = new System.Drawing.Point(1035, 72); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(65, 20); + this.label2.Size = new System.Drawing.Size(92, 27); this.label2.TabIndex = 18; this.label2.Text = "门板位置"; // @@ -480,9 +492,9 @@ 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(634, 64); + this.comboBox2.Location = new System.Drawing.Point(932, 64); this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(91, 33); + this.comboBox2.Size = new System.Drawing.Size(91, 44); this.comboBox2.TabIndex = 19; // // label3 @@ -490,9 +502,9 @@ 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(562, 71); + this.label3.Location = new System.Drawing.Point(860, 71); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(65, 20); + this.label3.Size = new System.Drawing.Size(92, 27); this.label3.TabIndex = 20; this.label3.Text = "计划类型"; // @@ -505,7 +517,7 @@ this.dtpCREATEDATEEND.Location = new System.Drawing.Point(398, 67); this.dtpCREATEDATEEND.Name = "dtpCREATEDATEEND"; this.dtpCREATEDATEEND.OriginalFormat = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpCREATEDATEEND.Size = new System.Drawing.Size(160, 26); + this.dtpCREATEDATEEND.Size = new System.Drawing.Size(160, 35); this.dtpCREATEDATEEND.TabIndex = 24; this.dtpCREATEDATEEND.ValueX = null; this.dtpCREATEDATEEND.ValueChanged += new System.EventHandler(this.dtpCREATEDATEEND_ValueChanged); @@ -519,7 +531,7 @@ this.dtpCREATEDATESTART.Location = new System.Drawing.Point(200, 67); this.dtpCREATEDATESTART.Name = "dtpCREATEDATESTART"; this.dtpCREATEDATESTART.OriginalFormat = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpCREATEDATESTART.Size = new System.Drawing.Size(160, 26); + this.dtpCREATEDATESTART.Size = new System.Drawing.Size(160, 35); this.dtpCREATEDATESTART.TabIndex = 23; this.dtpCREATEDATESTART.ValueX = null; this.dtpCREATEDATESTART.ValueChanged += new System.EventHandler(this.dtpCREATEDATESTART_ValueChanged); @@ -530,7 +542,7 @@ 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(124, 70); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(69, 20); + this.label4.Size = new System.Drawing.Size(105, 30); this.label4.TabIndex = 21; this.label4.Text = "计划时间"; // @@ -540,27 +552,15 @@ 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(367, 70); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(24, 20); + this.label5.Size = new System.Drawing.Size(36, 30); this.label5.TabIndex = 22; this.label5.Text = "至"; // - // SelectStripButton - // - this.SelectStripButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.SelectStripButton.Font = new System.Drawing.Font("微软雅黑", 12F); - this.SelectStripButton.Image = ((System.Drawing.Image)(resources.GetObject("SelectStripButton.Image"))); - this.SelectStripButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.SelectStripButton.ImageTransparentColor = System.Drawing.Color.White; - this.SelectStripButton.Name = "SelectStripButton"; - this.SelectStripButton.Size = new System.Drawing.Size(94, 67); - this.SelectStripButton.Text = "刷新"; - this.SelectStripButton.Click += new System.EventHandler(this.SelectStripButton_Click); - // // TJPrintPlanLabel // - this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 25F); + this.AutoScaleDimensions = new System.Drawing.SizeF(17F, 36F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1347, 540); + this.ClientSize = new System.Drawing.Size(1645, 840); this.Controls.Add(this.dtpCREATEDATEEND); this.Controls.Add(this.dtpCREATEDATESTART); this.Controls.Add(this.label4); diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs index 09202bd..64082e3 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs @@ -177,9 +177,11 @@ namespace QMAPP.WinForm.Forms.TianJin { string filepath = ConfigurationManager.AppSettings["SaveFilePath"]; filepath = string.Format("{0}ViewSetting.cfg", filepath); + if (string.IsNullOrEmpty(cbListRowcount.Text)) + cbListRowcount.Text = "1"; var setting = new { - ListRowcount = int.Parse(cbListRowcount.Text), + ListRowcount = int.Parse("100"), RefreshRate = int.Parse("20"), //PlanFilter = cbPlanFilter.SelectedIndex }; @@ -530,7 +532,7 @@ namespace QMAPP.WinForm.Forms.TianJin labeldata.Class = " " + book.CarModel.Substring(book.CarModel.Length - 3, 3); labeldata.Description = book.Text; labeldata.OrderNo = book.CarModel + positioncode + data; - if (orders[0].MATERIAL_CODE.Contains("018D")) + if (orders[0].MATERIAL_CODE.Contains("018D")|| orders[0].MATERIAL_CODE.Contains("278D")) { var bookS = _agent.InvokeServiceFunction("FISPhraseBLL_GetPHRASEBOOK", labeldata.Class.Trim()); labeldata.Remark = bookS.Text; @@ -720,7 +722,7 @@ namespace QMAPP.WinForm.Forms.TianJin labeldata.Class = " " + book.Class.Substring(0, 2); labeldata.Description = book.Text; labeldata.OrderNo = book.CarModel + positioncode + data; - if (orders[0].MATERIAL_CODE.Contains("018D")) + if (orders[0].MATERIAL_CODE.Contains("018D")|| orders[0].MATERIAL_CODE.Contains("278D")) { var bookS = _agent.InvokeServiceFunction("FISPhraseBLL_GetPHRASEBOOK", orders[0].MATERIAL_CODE.Substring(5, 3).Trim()); labeldata.Remark = bookS.Text; diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx index f1b8096..6066d18 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx @@ -157,7 +157,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA7mSURBVGhD1ZlZcFvXfcapum3SptMm05l4Jk/tg97qNs1L + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAA7mSURBVGhD1ZlZcFvXfcapum3SptMm05l4Jk/tg97qNs1L X/rUaR4Sd6YvfehMl6nTJJ7YriwpsceOY1dy5IoSCW5auG8gQHARCe47KXHfSQAiiH0HCYAEd4AgCBBf v3MBUKQs2nStOOqZOby4FyDu9/uv51xkfFUDSCA549Ixdfn/zwBiFL57LPwkSIJc0sUXcQBHkjgkFqj5 L6hZdgyS4HuJRPxY/AsJIiwtHaP/AUR4eniBl/6MIIWYcYfRoI3CsLaP+FHsRRSfsn5cB2x/jYan+PBL @@ -227,7 +227,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA7mSURBVGhD1ZlZcFvXfcapum3SptMm05l4Jk/tg97qNs1L + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAA7mSURBVGhD1ZlZcFvXfcapum3SptMm05l4Jk/tg97qNs1L X/rUaR4Sd6YvfehMl6nTJJ7YriwpsceOY1dy5IoSCW5auG8gQHARCe47KXHfSQAiiH0HCYAEd4AgCBBf v3MBUKQs2nStOOqZOby4FyDu9/uv51xkfFUDSCA549Ixdfn/zwBiFL57LPwkSIJc0sUXcQBHkjgkFqj5 L6hZdgyS4HuJRPxY/AsJIiwtHaP/AUR4eniBl/6MIIWYcYfRoI3CsLaP+FHsRRSfsn5cB2x/jYan+PBL @@ -297,7 +297,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA7mSURBVGhD1ZlZcFvXfcapum3SptMm05l4Jk/tg97qNs1L + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAA7mSURBVGhD1ZlZcFvXfcapum3SptMm05l4Jk/tg97qNs1L X/rUaR4Sd6YvfehMl6nTJJ7YriwpsceOY1dy5IoSCW5auG8gQHARCe47KXHfSQAiiH0HCYAEd4AgCBBf v3MBUKQs2nStOOqZOby4FyDu9/uv51xkfFUDSCA549Ixdfn/zwBiFL57LPwkSIJc0sUXcQBHkjgkFqj5 L6hZdgyS4HuJRPxY/AsJIiwtHaP/AUR4eniBl/6MIIWYcYfRoI3CsLaP+FHsRRSfsn5cB2x/jYan+PBL @@ -367,7 +367,7 @@ iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA7mSURBVGhD1ZlZcFvXfcapum3SptMm05l4Jk/tg97qNs1L + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAA7mSURBVGhD1ZlZcFvXfcapum3SptMm05l4Jk/tg97qNs1L X/rUaR4Sd6YvfehMl6nTJJ7YriwpsceOY1dy5IoSCW5auG8gQHARCe47KXHfSQAiiH0HCYAEd4AgCBBf v3MBUKQs2nStOOqZOby4FyDu9/uv51xkfFUDSCA549Ixdfn/zwBiFL57LPwkSIJc0sUXcQBHkjgkFqj5 L6hZdgyS4HuJRPxY/AsJIiwtHaP/AUR4eniBl/6MIIWYcYfRoI3CsLaP+FHsRRSfsn5cB2x/jYan+PBL diff --git a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs index 0f4c43f..61135f4 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("2023.01.02.02")] -[assembly: AssemblyFileVersion("2023.01.02.02")] +[assembly: AssemblyVersion("2023.04.12.01")] +[assembly: AssemblyFileVersion("2023.04.12.01")]