From 072a3ea235c6df866deb33d861d5def45e82b045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE=E7=94=B7?= <446507344@qq.com>
Date: Thu, 27 Apr 2023 10:08:08 +0800
Subject: [PATCH] 1

---
 APPQ5/QMAPP.WinForm/App.config                |  6 +-
 .../Forms/Operation/BZDRePrintForm.cs         | 31 +++++++-
 .../Operation/BZDRePrintForm.designer.cs      | 73 +++++++++++++------
 .../WCF/QMFrameWork.WebServiceHost/Web.config |  6 +-
 4 files changed, 87 insertions(+), 29 deletions(-)

diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index 442a620..2e3a5ad 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -4,8 +4,8 @@
     <!--主数据库连接-->
 
     
-    <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
-    <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
+    <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+    <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
      
     <!--<add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=10.111.144.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
@@ -22,7 +22,7 @@
     <add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
      -->
    
-    <add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
+    <!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->
    
     <!--  <add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
     
diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/BZDRePrintForm.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/BZDRePrintForm.cs
index 97716c3..1725283 100644
--- a/APPQ5/QMAPP.WinForm/Forms/Operation/BZDRePrintForm.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/Operation/BZDRePrintForm.cs
@@ -26,6 +26,18 @@ namespace QMAPP.WinForm.Forms.Operation
             InitializeComponent();
             infolabel.Text = "";
             infolabel.ForeColor = Color.Red;
+
+            //产线
+            var list_line = new List<Lines>();
+            list_line.Add(new Lines { Code = "VW371仪表板", Name = "VW371仪表板" });
+            list_line.Add(new Lines { Code = "BC316仪表板", Name = "BC316仪表板" });
+            list_line.Add(new Lines { Code = "BC316-MP2仪表板", Name = "BC316-MP2仪表板" });
+            list_line.Add(new Lines { Code = "BC316-MP3仪表板", Name = "BC316-MP3仪表板" });
+
+            this.cbLine.DataSource = list_line;
+            this.cbLine.DisplayMember = "Name";
+            this.cbLine.ValueMember = "Code";
+
             _parentForm = parentForm;
         }
 
@@ -197,10 +209,16 @@ namespace QMAPP.WinForm.Forms.Operation
         {
             _bzdConfig =
                 _agent.InvokeServiceFunction<List<BZDConfig>>(B9IPCService.BZDConfigBLL_GetAllList.ToString(),"");
+            var list =new List<BZDConfig>();
             foreach (var t in _bzdConfig)
             {
-                t.MATERIALCODDE = t.MATERIALCODDE + "|" + t.ColorDetail + "|" + t.Line_code;
+                if (!string.IsNullOrEmpty(cbLine.SelectedValue.ToString()) && t.configDetail.Contains(cbLine.SelectedValue.ToString()))
+                {
+                    t.MATERIALCODDE = t.MATERIALCODDE + "|" + t.ColorDetail + "|" + t.configDetail;
+                    list.Add(t);
+                }
             }
+            _bzdConfig = list;
             LoadAssyMaterial();
         }
 
@@ -224,9 +242,20 @@ namespace QMAPP.WinForm.Forms.Operation
 
         #endregion
 
+        public class Lines
+        {
+            public string Code { get; set; }
+            public string Name { get; set; }
+        }
+
         private void label2_Click(object sender, EventArgs e)
         {
 
         }
+
+        private void cbLine_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            PrintForm_Load(sender,e);
+        }
     }
 }
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/BZDRePrintForm.designer.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/BZDRePrintForm.designer.cs
index 3c26571..f9307d1 100644
--- a/APPQ5/QMAPP.WinForm/Forms/Operation/BZDRePrintForm.designer.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/Operation/BZDRePrintForm.designer.cs
@@ -38,16 +38,18 @@ namespace QMAPP.WinForm.Forms.Operation
             this.label5 = new System.Windows.Forms.Label();
             this.cbMaterial = new System.Windows.Forms.ComboBox();
             this.label2 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.cbLine = 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(272, 38);
+            this.label1.Location = new System.Drawing.Point(306, 46);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(287, 47);
+            this.label1.Size = new System.Drawing.Size(339, 56);
             this.label1.TabIndex = 0;
             this.label1.Text = "BZD条码补打";
             // 
@@ -55,10 +57,10 @@ namespace QMAPP.WinForm.Forms.Operation
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(87, 301);
+            this.label3.Location = new System.Drawing.Point(98, 379);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(103, 30);
+            this.label3.Size = new System.Drawing.Size(123, 36);
             this.label3.TabIndex = 2;
             this.label3.Text = "装配码";
             // 
@@ -66,19 +68,19 @@ namespace QMAPP.WinForm.Forms.Operation
             // 
             this.txtMainCode.BackColor = System.Drawing.SystemColors.Window;
             this.txtMainCode.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtMainCode.Location = new System.Drawing.Point(231, 295);
-            this.txtMainCode.Margin = new System.Windows.Forms.Padding(4);
+            this.txtMainCode.Location = new System.Drawing.Point(260, 372);
+            this.txtMainCode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txtMainCode.Name = "txtMainCode";
-            this.txtMainCode.Size = new System.Drawing.Size(453, 42);
+            this.txtMainCode.Size = new System.Drawing.Size(509, 49);
             this.txtMainCode.TabIndex = 4;
             // 
             // 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(693, 295);
-            this.button1.Margin = new System.Windows.Forms.Padding(4);
+            this.button1.Location = new System.Drawing.Point(780, 372);
+            this.button1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(164, 44);
+            this.button1.Size = new System.Drawing.Size(184, 53);
             this.button1.TabIndex = 5;
             this.button1.Text = "打印";
             this.button1.UseVisualStyleBackColor = true;
@@ -89,20 +91,20 @@ namespace QMAPP.WinForm.Forms.Operation
             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(84, 410);
+            this.infolabel.Location = new System.Drawing.Point(94, 492);
             this.infolabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.infolabel.Name = "infolabel";
-            this.infolabel.Size = new System.Drawing.Size(0, 39);
+            this.infolabel.Size = new System.Drawing.Size(0, 46);
             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(36, 164);
+            this.label5.Location = new System.Drawing.Point(39, 227);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(163, 30);
+            this.label5.Size = new System.Drawing.Size(195, 36);
             this.label5.TabIndex = 2;
             this.label5.Text = "总成零件号";
             // 
@@ -111,10 +113,10 @@ namespace QMAPP.WinForm.Forms.Operation
             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(231, 149);
-            this.cbMaterial.Margin = new System.Windows.Forms.Padding(4);
+            this.cbMaterial.Location = new System.Drawing.Point(261, 222);
+            this.cbMaterial.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.cbMaterial.Name = "cbMaterial";
-            this.cbMaterial.Size = new System.Drawing.Size(625, 43);
+            this.cbMaterial.Size = new System.Drawing.Size(703, 49);
             this.cbMaterial.TabIndex = 7;
             // 
             // label2
@@ -122,18 +124,43 @@ namespace QMAPP.WinForm.Forms.Operation
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("宋体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.Red;
-            this.label2.Location = new System.Drawing.Point(238, 236);
+            this.label2.Location = new System.Drawing.Point(268, 301);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(423, 34);
+            this.label2.Size = new System.Drawing.Size(457, 40);
             this.label2.TabIndex = 8;
             this.label2.Text = "装配码：请输入骨架条码";
             this.label2.Click += new System.EventHandler(this.label2_Click);
             // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label4.Location = new System.Drawing.Point(98, 153);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(87, 36);
+            this.label4.TabIndex = 9;
+            this.label4.Text = "产线";
+            // 
+            // cbLine
+            // 
+            this.cbLine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbLine.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbLine.FormattingEnabled = true;
+            this.cbLine.Location = new System.Drawing.Point(261, 148);
+            this.cbLine.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.cbLine.Name = "cbLine";
+            this.cbLine.Size = new System.Drawing.Size(538, 49);
+            this.cbLine.TabIndex = 10;
+            this.cbLine.SelectedIndexChanged += new System.EventHandler(this.cbLine_SelectedIndexChanged);
+            // 
             // BZDRePrintForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(887, 499);
+            this.ClientSize = new System.Drawing.Size(998, 599);
+            this.Controls.Add(this.cbLine);
+            this.Controls.Add(this.label4);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.cbMaterial);
             this.Controls.Add(this.infolabel);
@@ -142,7 +169,7 @@ namespace QMAPP.WinForm.Forms.Operation
             this.Controls.Add(this.label5);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.label1);
-            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Name = "BZDRePrintForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "总成装配条码打印";
@@ -162,5 +189,7 @@ namespace QMAPP.WinForm.Forms.Operation
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.ComboBox cbMaterial;
         private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.ComboBox cbLine;
     }
 }
\ No newline at end of file
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index 877c4c7..c9ff77c 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -63,10 +63,10 @@
   <connectionStrings>
     <!--主数据库连接-->
 
-    <!--
+
     <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
-   
+    <!--
     <add name="maindbYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=scCFAACDYBNCSNF;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>
     <add name="maindbNCSYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=scCFAACDYBDY;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>-->
 
@@ -88,7 +88,7 @@
 
    <!--<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>-->
 
-    <add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
+    <!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->
 
     <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;max pool size=10240;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->