ruoxing.wang
/
BBMPT1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

喷涂老外库或者本地库没颜色配置的明确提示. 合格转报废的控制

master
ruoxing.wang 4 weeks ago
parent
10fbcbc6a8
commit
cbf1de4970
8 changed files with 296 additions and 159 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 80
      FacOneZPStation/FrmZP.Designer.cs
  2. 4
      InjectionPC/FrmMain2408.cs
  3. BIN
      InjectionPC/Sill.grf
  4. 158
      PaintingPC/FrmQuality.Designer.cs
  5. 63
      PaintingPC/FrmQuality.cs
  6. 46
      PaintingPC/Function.cs
  7. 75
      WebService/Function.cs
  8. 29
      WebService/WMSWebService.asmx.cs

80
FacOneZPStation/FrmZP.Designer.cs
View File

@ -77,7 +77,7 @@
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.51529F));
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.62445F));
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32.86026F));
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 648F));
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 649F));
this.tableLayoutPanel3.Controls.Add(this.button6, 3, 0);
this.tableLayoutPanel3.Controls.Add(this.button1, 0, 1);
this.tableLayoutPanel3.Controls.Add(this.button5, 2, 1);
@ -102,10 +102,10 @@
this.button6.Dock = System.Windows.Forms.DockStyle.Fill;
this.button6.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button6.ForeColor = System.Drawing.Color.Black;
this.button6.Location = new System.Drawing.Point(1699, 12);
this.button6.Location = new System.Drawing.Point(1698, 12);
this.button6.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(623, 161);
this.button6.Size = new System.Drawing.Size(624, 161);
this.button6.TabIndex = 7;
this.button6.Text = "手动打印箱单";
this.button6.UseVisualStyleBackColor = false;
@ -131,7 +131,7 @@
this.button5.Dock = System.Windows.Forms.DockStyle.Fill;
this.button5.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button5.ForeColor = System.Drawing.Color.Black;
this.button5.Location = new System.Drawing.Point(1145, 197);
this.button5.Location = new System.Drawing.Point(1144, 197);
this.button5.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(528, 162);
@ -148,7 +148,7 @@
this.button4.Location = new System.Drawing.Point(571, 5);
this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(555, 175);
this.button4.Size = new System.Drawing.Size(554, 175);
this.button4.TabIndex = 4;
this.button4.Text = "下一计划";
this.button4.UseVisualStyleBackColor = false;
@ -177,7 +177,7 @@
this.button2.Location = new System.Drawing.Point(578, 197);
this.button2.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(541, 162);
this.button2.Size = new System.Drawing.Size(540, 162);
this.button2.TabIndex = 2;
this.button2.Text = "补打标签";
this.button2.UseVisualStyleBackColor = false;
@ -188,10 +188,10 @@
this.button7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
this.button7.Dock = System.Windows.Forms.DockStyle.Fill;
this.button7.Font = new System.Drawing.Font("黑体", 16F);
this.button7.Location = new System.Drawing.Point(1692, 190);
this.button7.Location = new System.Drawing.Point(1691, 190);
this.button7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(637, 176);
this.button7.Size = new System.Drawing.Size(638, 176);
this.button7.TabIndex = 8;
this.button7.Text = "补打箱单";
this.button7.UseVisualStyleBackColor = false;
@ -203,7 +203,7 @@
this.label7.Dock = System.Windows.Forms.DockStyle.Fill;
this.label7.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ForeColor = System.Drawing.Color.White;
this.label7.Location = new System.Drawing.Point(1394, 3);
this.label7.Location = new System.Drawing.Point(1392, 3);
this.label7.Margin = new System.Windows.Forms.Padding(2);
this.label7.Name = "label7";
this.tableLayoutPanel4.SetRowSpan(this.label7, 2);
@ -215,10 +215,10 @@
//
this.textBox2.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox2.Font = new System.Drawing.Font("黑体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox2.Location = new System.Drawing.Point(402, 111);
this.textBox2.Location = new System.Drawing.Point(401, 111);
this.textBox2.Margin = new System.Windows.Forms.Padding(4);
this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(985, 77);
this.textBox2.Size = new System.Drawing.Size(984, 77);
this.textBox2.TabIndex = 30;
this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown);
//
@ -230,7 +230,7 @@
this.label3.Location = new System.Drawing.Point(5, 107);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(388, 109);
this.label3.Size = new System.Drawing.Size(387, 109);
this.label3.TabIndex = 29;
this.label3.Text = "扫描物料条码";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -240,10 +240,10 @@
this.labOrderNo.Dock = System.Windows.Forms.DockStyle.Fill;
this.labOrderNo.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labOrderNo.ForeColor = System.Drawing.Color.White;
this.labOrderNo.Location = new System.Drawing.Point(1648, 219);
this.labOrderNo.Location = new System.Drawing.Point(1646, 219);
this.labOrderNo.Margin = new System.Windows.Forms.Padding(2);
this.labOrderNo.Name = "labOrderNo";
this.labOrderNo.Size = new System.Drawing.Size(688, 152);
this.labOrderNo.Size = new System.Drawing.Size(690, 152);
this.labOrderNo.TabIndex = 28;
this.labOrderNo.Text = "A64654646464";
this.labOrderNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -254,7 +254,7 @@
this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
this.label4.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.White;
this.label4.Location = new System.Drawing.Point(1394, 219);
this.label4.Location = new System.Drawing.Point(1392, 219);
this.label4.Margin = new System.Windows.Forms.Padding(2);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(249, 152);
@ -268,10 +268,10 @@
this.labStationNo.Dock = System.Windows.Forms.DockStyle.Fill;
this.labStationNo.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labStationNo.ForeColor = System.Drawing.Color.White;
this.labStationNo.Location = new System.Drawing.Point(400, 219);
this.labStationNo.Location = new System.Drawing.Point(399, 219);
this.labStationNo.Margin = new System.Windows.Forms.Padding(2);
this.labStationNo.Name = "labStationNo";
this.labStationNo.Size = new System.Drawing.Size(989, 152);
this.labStationNo.Size = new System.Drawing.Size(988, 152);
this.labStationNo.TabIndex = 26;
this.labStationNo.Text = "V253-MF-S后保下部延伸焊接";
this.labStationNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -285,7 +285,7 @@
this.label2.Location = new System.Drawing.Point(3, 219);
this.label2.Margin = new System.Windows.Forms.Padding(2);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(392, 152);
this.label2.Size = new System.Drawing.Size(391, 152);
this.label2.TabIndex = 25;
this.label2.Text = "工位名称";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -295,10 +295,10 @@
this.labPName.Dock = System.Windows.Forms.DockStyle.Fill;
this.labPName.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labPName.ForeColor = System.Drawing.Color.White;
this.labPName.Location = new System.Drawing.Point(1648, 376);
this.labPName.Location = new System.Drawing.Point(1646, 376);
this.labPName.Margin = new System.Windows.Forms.Padding(2);
this.labPName.Name = "labPName";
this.labPName.Size = new System.Drawing.Size(688, 249);
this.labPName.Size = new System.Drawing.Size(690, 249);
this.labPName.TabIndex = 24;
this.labPName.Text = "MF253 MF S后保";
this.labPName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -309,7 +309,7 @@
this.label8.Dock = System.Windows.Forms.DockStyle.Fill;
this.label8.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ForeColor = System.Drawing.Color.White;
this.label8.Location = new System.Drawing.Point(1394, 376);
this.label8.Location = new System.Drawing.Point(1392, 376);
this.label8.Margin = new System.Windows.Forms.Padding(2);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(249, 249);
@ -323,10 +323,10 @@
this.labPartNo.Dock = System.Windows.Forms.DockStyle.Fill;
this.labPartNo.Font = new System.Drawing.Font("黑体", 42F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labPartNo.ForeColor = System.Drawing.Color.White;
this.labPartNo.Location = new System.Drawing.Point(400, 376);
this.labPartNo.Location = new System.Drawing.Point(399, 376);
this.labPartNo.Margin = new System.Windows.Forms.Padding(2);
this.labPartNo.Name = "labPartNo";
this.labPartNo.Size = new System.Drawing.Size(989, 249);
this.labPartNo.Size = new System.Drawing.Size(988, 249);
this.labPartNo.TabIndex = 22;
this.labPartNo.Text = "A2530822665";
this.labPartNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -345,7 +345,7 @@
this.label6.Location = new System.Drawing.Point(3, 376);
this.label6.Margin = new System.Windows.Forms.Padding(2);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(392, 249);
this.label6.Size = new System.Drawing.Size(391, 249);
this.label6.TabIndex = 21;
this.label6.Text = "产品代码";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -356,10 +356,10 @@
this.labBadCount.Dock = System.Windows.Forms.DockStyle.Fill;
this.labBadCount.Font = new System.Drawing.Font("黑体", 60F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labBadCount.ForeColor = System.Drawing.Color.Lime;
this.labBadCount.Location = new System.Drawing.Point(1648, 630);
this.labBadCount.Location = new System.Drawing.Point(1646, 630);
this.labBadCount.Margin = new System.Windows.Forms.Padding(2);
this.labBadCount.Name = "labBadCount";
this.labBadCount.Size = new System.Drawing.Size(688, 449);
this.labBadCount.Size = new System.Drawing.Size(690, 449);
this.labBadCount.TabIndex = 20;
this.labBadCount.Text = "0";
this.labBadCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -370,10 +370,10 @@
this.labNum.Dock = System.Windows.Forms.DockStyle.Fill;
this.labNum.Font = new System.Drawing.Font("黑体", 60F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labNum.ForeColor = System.Drawing.Color.Lime;
this.labNum.Location = new System.Drawing.Point(400, 630);
this.labNum.Location = new System.Drawing.Point(399, 630);
this.labNum.Margin = new System.Windows.Forms.Padding(2);
this.labNum.Name = "labNum";
this.labNum.Size = new System.Drawing.Size(989, 449);
this.labNum.Size = new System.Drawing.Size(988, 449);
this.labNum.TabIndex = 18;
this.labNum.Text = "152/210";
this.labNum.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -387,7 +387,7 @@
this.label10.Location = new System.Drawing.Point(3, 630);
this.label10.Margin = new System.Windows.Forms.Padding(2);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(392, 449);
this.label10.Size = new System.Drawing.Size(391, 449);
this.label10.TabIndex = 17;
this.label10.Text = "计划/完成数";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -400,7 +400,7 @@
this.label14.Location = new System.Drawing.Point(5, 1);
this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(388, 105);
this.label14.Size = new System.Drawing.Size(387, 105);
this.label14.TabIndex = 12;
this.label14.Text = "扫描本体条码";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -409,10 +409,10 @@
//
this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox1.Font = new System.Drawing.Font("黑体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox1.Location = new System.Drawing.Point(402, 5);
this.textBox1.Location = new System.Drawing.Point(401, 5);
this.textBox1.Margin = new System.Windows.Forms.Padding(4);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(985, 77);
this.textBox1.Size = new System.Drawing.Size(984, 77);
this.textBox1.TabIndex = 13;
this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
//
@ -421,11 +421,11 @@
this.labErrMessage.Dock = System.Windows.Forms.DockStyle.Fill;
this.labErrMessage.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labErrMessage.ForeColor = System.Drawing.Color.Red;
this.labErrMessage.Location = new System.Drawing.Point(1650, 1);
this.labErrMessage.Location = new System.Drawing.Point(1648, 1);
this.labErrMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labErrMessage.Name = "labErrMessage";
this.tableLayoutPanel4.SetRowSpan(this.labErrMessage, 2);
this.labErrMessage.Size = new System.Drawing.Size(684, 215);
this.labErrMessage.Size = new System.Drawing.Size(686, 215);
this.labErrMessage.TabIndex = 16;
this.labErrMessage.Text = "条码与产品不匹配，重新扫描";
this.labErrMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -438,7 +438,7 @@
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 28.52292F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 71.47708F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 253F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 691F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 693F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37F));
this.tableLayoutPanel4.Controls.Add(this.label7, 2, 0);
this.tableLayoutPanel4.Controls.Add(this.textBox2, 1, 1);
@ -478,7 +478,7 @@
this.label12.Dock = System.Windows.Forms.DockStyle.Fill;
this.label12.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ForeColor = System.Drawing.Color.White;
this.label12.Location = new System.Drawing.Point(1394, 630);
this.label12.Location = new System.Drawing.Point(1392, 630);
this.label12.Margin = new System.Windows.Forms.Padding(2);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(249, 449);
@ -491,10 +491,10 @@
this.labTime.BackColor = System.Drawing.Color.Transparent;
this.labTime.Dock = System.Windows.Forms.DockStyle.Fill;
this.labTime.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labTime.Location = new System.Drawing.Point(1802, 0);
this.labTime.Location = new System.Drawing.Point(1801, 0);
this.labTime.Margin = new System.Windows.Forms.Padding(0);
this.labTime.Name = "labTime";
this.labTime.Size = new System.Drawing.Size(545, 130);
this.labTime.Size = new System.Drawing.Size(546, 130);
this.labTime.TabIndex = 7;
this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labTime.Click += new System.EventHandler(this.labTime_Click);
@ -521,7 +521,7 @@
this.label1.Location = new System.Drawing.Point(326, 0);
this.label1.Margin = new System.Windows.Forms.Padding(0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(1476, 130);
this.label1.Size = new System.Drawing.Size(1475, 130);
this.label1.TabIndex = 1;
this.label1.Text = "装配工位信息看板";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -532,7 +532,7 @@
this.tableLayoutPanel2.ColumnCount = 3;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18.10651F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 81.89349F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 544F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 545F));
this.tableLayoutPanel2.Controls.Add(this.labTime, 2, 0);
this.tableLayoutPanel2.Controls.Add(this.pictureBox1, 0, 0);
this.tableLayoutPanel2.Controls.Add(this.label1, 1, 0);

4
InjectionPC/FrmMain2408.cs
View File

@ -3271,7 +3271,7 @@ namespace InjectionPC
productID = dt.Rows[0]["ProductID"].ToString();
nextproductID = dt.Rows[1]["InjectionPlanID"].ToString();
panel45.Visible = true;
if(lbCurrentlQtyL.Text=="0" || string.IsNullOrEmpty(lbCurrentlQtyL.Text))
if (lbCurrentlQtyL.Text == "0" || string.IsNullOrEmpty(lbCurrentlQtyL.Text))
{
lbPackageCodeL.Text = "";
}
@ -3280,7 +3280,7 @@ namespace InjectionPC
lbPackageCodeR.Text = "";
}
}
else
{

BIN
InjectionPC/Sill.grf
View File

Binary file not shown.

158
PaintingPC/FrmQuality.Designer.cs
View File

@ -62,6 +62,7 @@
this.btnRepair = new System.Windows.Forms.Button();
this.btnAbt = new System.Windows.Forms.Button();
this.lableFP = new System.Windows.Forms.Label();
this.lbForeig = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.panel1.SuspendLayout();
@ -73,10 +74,10 @@
//
this.labelVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
this.labelVersion.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labelVersion.Location = new System.Drawing.Point(2124, 197);
this.labelVersion.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.labelVersion.Location = new System.Drawing.Point(1947, 172);
this.labelVersion.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.labelVersion.Name = "labelVersion";
this.labelVersion.Size = new System.Drawing.Size(412, 139);
this.labelVersion.Size = new System.Drawing.Size(378, 122);
this.labelVersion.TabIndex = 24;
this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
@ -84,10 +85,10 @@
//
this.labStation.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
this.labStation.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labStation.Location = new System.Drawing.Point(1704, 197);
this.labStation.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.labStation.Location = new System.Drawing.Point(1562, 172);
this.labStation.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.labStation.Name = "labStation";
this.labStation.Size = new System.Drawing.Size(412, 139);
this.labStation.Size = new System.Drawing.Size(378, 122);
this.labStation.TabIndex = 23;
this.labStation.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
@ -95,10 +96,10 @@
//
this.labWorkClass.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
this.labWorkClass.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labWorkClass.Location = new System.Drawing.Point(1284, 197);
this.labWorkClass.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.labWorkClass.Location = new System.Drawing.Point(1177, 172);
this.labWorkClass.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.labWorkClass.Name = "labWorkClass";
this.labWorkClass.Size = new System.Drawing.Size(412, 139);
this.labWorkClass.Size = new System.Drawing.Size(378, 122);
this.labWorkClass.TabIndex = 22;
this.labWorkClass.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labWorkClass.Click += new System.EventHandler(this.labWorkClass_Click);
@ -107,10 +108,10 @@
//
this.rdo3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
this.rdo3.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.rdo3.Location = new System.Drawing.Point(864, 197);
this.rdo3.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5);
this.rdo3.Location = new System.Drawing.Point(792, 172);
this.rdo3.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.rdo3.Name = "rdo3";
this.rdo3.Size = new System.Drawing.Size(412, 139);
this.rdo3.Size = new System.Drawing.Size(378, 122);
this.rdo3.TabIndex = 21;
this.rdo3.Text = "项目调试";
this.rdo3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -120,10 +121,10 @@
//
this.rdo2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
this.rdo2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.rdo2.Location = new System.Drawing.Point(444, 197);
this.rdo2.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5);
this.rdo2.Location = new System.Drawing.Point(407, 172);
this.rdo2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.rdo2.Name = "rdo2";
this.rdo2.Size = new System.Drawing.Size(412, 139);
this.rdo2.Size = new System.Drawing.Size(378, 122);
this.rdo2.TabIndex = 20;
this.rdo2.Text = "量产调试";
this.rdo2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -134,10 +135,10 @@
this.rdo1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128)))));
this.rdo1.Checked = true;
this.rdo1.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.rdo1.Location = new System.Drawing.Point(24, 197);
this.rdo1.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5);
this.rdo1.Location = new System.Drawing.Point(22, 172);
this.rdo1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.rdo1.Name = "rdo1";
this.rdo1.Size = new System.Drawing.Size(412, 139);
this.rdo1.Size = new System.Drawing.Size(378, 122);
this.rdo1.TabIndex = 19;
this.rdo1.TabStop = true;
this.rdo1.Text = "正式量产";
@ -148,10 +149,10 @@
//
this.labTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labTime.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labTime.Location = new System.Drawing.Point(2037, 19);
this.labTime.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.labTime.Location = new System.Drawing.Point(1867, 17);
this.labTime.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.labTime.Name = "labTime";
this.labTime.Size = new System.Drawing.Size(498, 167);
this.labTime.Size = new System.Drawing.Size(457, 146);
this.labTime.TabIndex = 18;
this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labTime.Click += new System.EventHandler(this.labTime_Click);
@ -160,10 +161,10 @@
//
this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
this.pictureBox1.Location = new System.Drawing.Point(24, 19);
this.pictureBox1.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5);
this.pictureBox1.Location = new System.Drawing.Point(22, 17);
this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(317, 167);
this.pictureBox1.Size = new System.Drawing.Size(291, 146);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 17;
this.pictureBox1.TabStop = false;
@ -172,27 +173,27 @@
//
this.labTitle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labTitle.Font = new System.Drawing.Font("宋体", 48F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labTitle.Location = new System.Drawing.Point(323, 19);
this.labTitle.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.labTitle.Location = new System.Drawing.Point(296, 17);
this.labTitle.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.labTitle.Name = "labTitle";
this.labTitle.Size = new System.Drawing.Size(1719, 167);
this.labTitle.Size = new System.Drawing.Size(1576, 146);
this.labTitle.TabIndex = 16;
this.labTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panel2
//
this.panel2.Location = new System.Drawing.Point(24, 1341);
this.panel2.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5);
this.panel2.Location = new System.Drawing.Point(22, 1173);
this.panel2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(1995, 701);
this.panel2.Size = new System.Drawing.Size(1829, 613);
this.panel2.TabIndex = 48;
//
// pictureBox2
//
this.pictureBox2.Location = new System.Drawing.Point(24, 747);
this.pictureBox2.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5);
this.pictureBox2.Location = new System.Drawing.Point(22, 654);
this.pictureBox2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(1995, 584);
this.pictureBox2.Size = new System.Drawing.Size(1829, 511);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox2.TabIndex = 47;
this.pictureBox2.TabStop = false;
@ -201,10 +202,10 @@
//
this.label15.BackColor = System.Drawing.Color.Lime;
this.label15.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label15.Location = new System.Drawing.Point(24, 349);
this.label15.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label15.Location = new System.Drawing.Point(22, 305);
this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(319, 149);
this.label15.Size = new System.Drawing.Size(292, 130);
this.label15.TabIndex = 49;
this.label15.Text = "扫码信息";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -213,10 +214,10 @@
//
this.labProductInfo.BackColor = System.Drawing.Color.White;
this.labProductInfo.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labProductInfo.Location = new System.Drawing.Point(1536, 349);
this.labProductInfo.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.labProductInfo.Location = new System.Drawing.Point(1408, 305);
this.labProductInfo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.labProductInfo.Name = "labProductInfo";
this.labProductInfo.Size = new System.Drawing.Size(1000, 149);
this.labProductInfo.Size = new System.Drawing.Size(917, 130);
this.labProductInfo.TabIndex = 52;
this.labProductInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
@ -224,10 +225,10 @@
//
this.label2.BackColor = System.Drawing.Color.Lime;
this.label2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(1207, 349);
this.label2.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label2.Location = new System.Drawing.Point(1106, 305);
this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(319, 149);
this.label2.Size = new System.Drawing.Size(292, 130);
this.label2.TabIndex = 51;
this.label2.Text = "产品信息";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -236,10 +237,10 @@
//
this.txtBarCode.BackColor = System.Drawing.Color.White;
this.txtBarCode.Font = new System.Drawing.Font("黑体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBarCode.Location = new System.Drawing.Point(356, 373);
this.txtBarCode.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5);
this.txtBarCode.Location = new System.Drawing.Point(326, 326);
this.txtBarCode.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.txtBarCode.Name = "txtBarCode";
this.txtBarCode.Size = new System.Drawing.Size(833, 99);
this.txtBarCode.Size = new System.Drawing.Size(764, 87);
this.txtBarCode.TabIndex = 0;
this.txtBarCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.txtBarCode.DoubleClick += new System.EventHandler(this.txtBarCode_DoubleClick);
@ -249,10 +250,10 @@
//
this.labProPosition.BackColor = System.Drawing.Color.White;
this.labProPosition.Font = new System.Drawing.Font("黑体", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labProPosition.Location = new System.Drawing.Point(2029, 515);
this.labProPosition.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.labProPosition.Location = new System.Drawing.Point(1860, 451);
this.labProPosition.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.labProPosition.Name = "labProPosition";
this.labProPosition.Size = new System.Drawing.Size(507, 173);
this.labProPosition.Size = new System.Drawing.Size(465, 151);
this.labProPosition.TabIndex = 64;
this.labProPosition.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
@ -261,10 +262,10 @@
this.panel1.AutoScroll = true;
this.panel1.Controls.Add(this.groupBox1);
this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel1.Location = new System.Drawing.Point(24, 496);
this.panel1.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5);
this.panel1.Location = new System.Drawing.Point(22, 434);
this.panel1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1995, 243);
this.panel1.Size = new System.Drawing.Size(1829, 213);
this.panel1.TabIndex = 66;
//
// groupBox1
@ -276,7 +277,7 @@
this.groupBox1.Margin = new System.Windows.Forms.Padding(0);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(0);
this.groupBox1.Size = new System.Drawing.Size(1995, 243);
this.groupBox1.Size = new System.Drawing.Size(1829, 213);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "更改颜色";
@ -284,23 +285,24 @@
// panelAttchColor
//
this.panelAttchColor.AutoScroll = true;
this.panelAttchColor.Controls.Add(this.lbForeig);
this.panelAttchColor.Controls.Add(this.label1);
this.panelAttchColor.Controls.Add(this.cboxAddColor);
this.panelAttchColor.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelAttchColor.Location = new System.Drawing.Point(0, 43);
this.panelAttchColor.Location = new System.Drawing.Point(0, 37);
this.panelAttchColor.Margin = new System.Windows.Forms.Padding(0);
this.panelAttchColor.Name = "panelAttchColor";
this.panelAttchColor.Size = new System.Drawing.Size(1995, 200);
this.panelAttchColor.Size = new System.Drawing.Size(1829, 176);
this.panelAttchColor.TabIndex = 0;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(36, 39);
this.label1.Location = new System.Drawing.Point(33, 34);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(269, 78);
this.label1.Size = new System.Drawing.Size(237, 67);
this.label1.TabIndex = 1;
this.label1.Text = "附加颜色";
//
@ -309,10 +311,10 @@
this.cboxAddColor.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cboxAddColor.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cboxAddColor.FormattingEnabled = true;
this.cboxAddColor.Location = new System.Drawing.Point(324, 31);
this.cboxAddColor.Location = new System.Drawing.Point(297, 27);
this.cboxAddColor.Margin = new System.Windows.Forms.Padding(4);
this.cboxAddColor.Name = "cboxAddColor";
this.cboxAddColor.Size = new System.Drawing.Size(1361, 86);
this.cboxAddColor.Size = new System.Drawing.Size(1248, 76);
this.cboxAddColor.TabIndex = 0;
this.cboxAddColor.SelectedValueChanged += new System.EventHandler(this.cboxAddColor_SelectedValueChanged);
//
@ -320,9 +322,9 @@
//
this.btnOk.BackColor = System.Drawing.Color.LawnGreen;
this.btnOk.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOk.Location = new System.Drawing.Point(2020, 936);
this.btnOk.Location = new System.Drawing.Point(1852, 819);
this.btnOk.Name = "btnOk";
this.btnOk.Size = new System.Drawing.Size(536, 225);
this.btnOk.Size = new System.Drawing.Size(491, 197);
this.btnOk.TabIndex = 67;
this.btnOk.Text = "合 格";
this.btnOk.UseVisualStyleBackColor = false;
@ -332,9 +334,9 @@
//
this.btnNok.BackColor = System.Drawing.Color.Yellow;
this.btnNok.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNok.Location = new System.Drawing.Point(2029, 1226);
this.btnNok.Location = new System.Drawing.Point(1860, 1073);
this.btnNok.Name = "btnNok";
this.btnNok.Size = new System.Drawing.Size(536, 14);
this.btnNok.Size = new System.Drawing.Size(491, 12);
this.btnNok.TabIndex = 68;
this.btnNok.Text = "不 良";
this.btnNok.UseVisualStyleBackColor = false;
@ -345,9 +347,9 @@
//
this.btnRepair.BackColor = System.Drawing.Color.DodgerBlue;
this.btnRepair.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRepair.Location = new System.Drawing.Point(2020, 1394);
this.btnRepair.Location = new System.Drawing.Point(1852, 1220);
this.btnRepair.Name = "btnRepair";
this.btnRepair.Size = new System.Drawing.Size(536, 225);
this.btnRepair.Size = new System.Drawing.Size(491, 197);
this.btnRepair.TabIndex = 69;
this.btnRepair.Text = "返 喷";
this.btnRepair.UseVisualStyleBackColor = false;
@ -357,9 +359,9 @@
//
this.btnAbt.BackColor = System.Drawing.Color.OrangeRed;
this.btnAbt.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAbt.Location = new System.Drawing.Point(2020, 1827);
this.btnAbt.Location = new System.Drawing.Point(1852, 1599);
this.btnAbt.Name = "btnAbt";
this.btnAbt.Size = new System.Drawing.Size(536, 217);
this.btnAbt.Size = new System.Drawing.Size(491, 190);
this.btnAbt.TabIndex = 70;
this.btnAbt.Text = "报 废";
this.btnAbt.UseVisualStyleBackColor = false;
@ -370,19 +372,32 @@
this.lableFP.AutoSize = true;
this.lableFP.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lableFP.ForeColor = System.Drawing.Color.Red;
this.lableFP.Location = new System.Drawing.Point(2137, 817);
this.lableFP.Location = new System.Drawing.Point(1872, 644);
this.lableFP.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lableFP.Name = "lableFP";
this.lableFP.Size = new System.Drawing.Size(120, 48);
this.lableFP.Size = new System.Drawing.Size(106, 42);
this.lableFP.TabIndex = 71;
this.lableFP.Tag = "存在返喷";
this.lableFP.Text = " ";
//
// lbForeig
//
this.lbForeig.AutoSize = true;
this.lbForeig.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lbForeig.ForeColor = System.Drawing.Color.Red;
this.lbForeig.Location = new System.Drawing.Point(41, 149);
this.lbForeig.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbForeig.Name = "lbForeig";
this.lbForeig.Size = new System.Drawing.Size(58, 21);
this.lbForeig.TabIndex = 72;
this.lbForeig.Tag = "老外库提示";
this.lbForeig.Text = " ";
//
// FrmQuality
//
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(2565, 2045);
this.ClientSize = new System.Drawing.Size(2351, 1789);
this.Controls.Add(this.lableFP);
this.Controls.Add(this.btnAbt);
this.Controls.Add(this.btnRepair);
@ -406,7 +421,7 @@
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.labTitle);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5);
this.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
this.Name = "FrmQuality";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "喷涂质检";
@ -450,5 +465,6 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.ComboBox cboxAddColor;
private System.Windows.Forms.Label lableFP;
private System.Windows.Forms.Label lbForeig;
}
}

63
PaintingPC/FrmQuality.cs
View File

@ -92,6 +92,11 @@ namespace PaintingPC
try
{
DataTable dt = Function.GetColorByStockNo(stockNo);
if(dt.Rows.Count == 0)
{
lbForeig.Text = $"基础数据-产品颜色菜单未配置[{stockNo}]的颜色信息";
}
DataRow dr = dt.NewRow();
dr["Color"] = "";
dt.Rows.InsertAt(dr, 0);
@ -456,11 +461,18 @@ namespace PaintingPC
if (CheckColor(ref colorName, ref partName) == false) return;
#endregion
DataTable inspectTable = Function. GetInspectInfoByBarCode2(txtBarCode.Text.Trim());
if(inspectTable.Rows.Count>0)
{
if (inspectTable.Rows[0]["inspectResult"].ToString().Contains("合格"))
{
MessageBox.Show("条码已判定为合格，无法重新判定为报废");
return ;
}
}
ClearControlColor(SetControlGroup());
btnAbt.BackColor = Color.Red;
//保存
SaveInspect("报废", colorName, partName);
string id = SaveInspect("报废", colorName, partName);
#region 报废则调WMS WebService，入库
try
@ -470,11 +482,25 @@ namespace PaintingPC
//webService.Timeout = 1200000;
string errorReason = "";
webService.WMSSprayingForCS(Function.UniteBarCodeToOne(txtBarCode.Text.Trim()), 0, out errorReason);
bool rst = webService.WMSSprayingForCS(Function.UniteBarCodeToOne(txtBarCode.Text.Trim()), 0, out errorReason);
if(rst == false)
{
if (!string.IsNullOrEmpty(id))
{
LogHelper.WriteErrLogBase($"质检调用WMS接口失败,删除条码为[{txtBarCode.Text}]的质检记录", MethodBase.GetCurrentMethod().Name);
Function.DelInspectRst(id);
}
MessageBox.Show("报废操作失败,原因:"+ errorReason);
return;
}
}
catch (Exception ex)
{
LogHelper.WriteErrLogBase("工位：" + labStation.Text.Trim() + "，二次质检调用WMS接口：" + ex.ToString(), MethodBase.GetCurrentMethod().Name);
MessageBox.Show("报废操作发生异常,原因:" + ex.Message);
LogHelper.WriteErrLogBase("质检调用WMS接口：" + ex.ToString(), MethodBase.GetCurrentMethod().Name);
}
#endregion
@ -551,8 +577,14 @@ namespace PaintingPC
}
return true;
}
public void SaveInspect(string inspectResult,string colorName, string partName)
/// <summary>
/// 保存质检记录 tb_InspectResult
/// </summary>
/// <param name="inspectResult"></param>
/// <param name="colorName"></param>
/// <param name="partName"></param>
/// <returns> 返回插入记录的ID</returns>
public string SaveInspect(string inspectResult,string colorName, string partName)
{
try
{
@ -586,7 +618,7 @@ namespace PaintingPC
if (string.IsNullOrWhiteSpace(model1.damnPosition) || string.IsNullOrWhiteSpace(model1.reason))
{
MessageBox.Show("必须选择缺陷位置与缺陷原因，否则无法保存！");
return;
return "";
}
}
@ -617,12 +649,15 @@ namespace PaintingPC
{
model1.remark3 = "油漆件库"; // 喷涂质检 或 油漆件库
}
Function.InsertInspect2(model1);
return Function.InsertInspect2(model1);
}
return "";
}
catch (Exception ex)
{
LogHelper.WriteErrLogBase("二次质检提交：" + ex.ToString(), MethodBase.GetCurrentMethod().Name);
LogHelper.WriteErrLogBase("质检提交：" + ex.ToString(), MethodBase.GetCurrentMethod().Name);
MessageBox.Show("质检提交异常,原因:" + ex.Message);
return null;
}
}
@ -653,6 +688,7 @@ namespace PaintingPC
{
try
{
lbForeig.Text = "";
ClearPage();
LoadPage();
}
@ -926,8 +962,13 @@ namespace PaintingPC
#region 没有一检结果，查询老外数据库，取产品信息
if(_isWmsQuality == false)
{
string paintError = string.Empty;
//喷涂线边质检,没有质检结果,查询老外数据库，取产品信息
string[] info = Function.GetProductInfo2(barcode).Split('，');
string[] info = Function.GetProductInfo2(barcode,ref paintError).Split('，');
if (!string.IsNullOrEmpty(paintError))
{
lbForeig.Text = paintError;
}
labProductInfo.Text = info[0] + "，" + info[1];
paintId = info[2];
labProPosition.Tag = paintId;

46
PaintingPC/Function.cs
View File

@ -1703,13 +1703,28 @@ namespace PaintingPC
return res;
}
}
public static int DelInspectRst(string id)
{
int res = 0;
try
{
string sql = $"delete from tb_InspectResult where id ='{id}'";
res = SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null);
return res;
}
catch(Exception ex)
{
LogHelper.WriteLogManager(ex);
LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
return res;
}
}
/// <summary>
/// 保存检验结果
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static int InsertInspect2(InspectModel model)
public static string InsertInspect2(InspectModel model)
{
int res = 0;
try
@ -1749,20 +1764,25 @@ namespace PaintingPC
,'" + model.remark1 + @"'
,'" + model.remark2 + @"'
,'" + model.remark3 + @"'
) ";
res = SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null);
);select @@Identity ";
//res = SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null);
DataTable dt= SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
if (dt.Rows.Count > 0)
{
return dt.Rows[0][0].ToString();
}
LogHelper.WriteSysLogBase("[sql：]" + sql, MethodBase.GetCurrentMethod().Name);
return res;
return "";
}
catch (Exception ex)
{
LogHelper.WriteLogManager(ex);
LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
return res;
return "";
}
}
public static string GetProductInfo2(string barcode)
public static string GetProductInfo2(string barcode,ref string errorMsg)
{
string res = "";
//string colorNo = "";
@ -1822,6 +1842,10 @@ namespace PaintingPC
{
paintCode = dtColor.Rows[0]["paintcode"].ToString();
}
else
{
errorMsg = $"ForeignDB 没有条码[{barcode}]对应的数据";
}
//根据颜色代码查颜色
@ -1841,6 +1865,10 @@ namespace PaintingPC
//colorInfo = dt.Rows[0]["ColorName"].ToString();
paintID = dt.Rows[0]["ID"].ToString();
}
else
{
errorMsg = $"基础数据-油漆信息管理页面未配置油漆代码为{paintCode}的基础数据";
}
string sql_1 = @"select Color from tb_PaintColorInfo where StockNo='" + barcode.Substring(0, 10) + @"' and PaintID='" + paintID + @"'";
DataTable dt_1 = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql_1, null);
@ -1848,6 +1876,10 @@ namespace PaintingPC
{
colorInfo = dt_1.Rows[0]["Color"].ToString();
}
else
{
errorMsg = $"基础数据-产品颜色页面未配置存货代码代码为{barcode.Substring(0, 10)},油漆代码为[{paintCode}]的基础数据";
}
}
#endregion

75
WebService/Function.cs
View File

@ -862,7 +862,7 @@ namespace Webservice
/// <param name="partNo"></param>
/// <param name="batchNo"></param>
/// <returns></returns>
public static string WMSSpraying(string barcode, int isPass, string stcokNo, string partNo, string batchNo,ref string colorName,ref string productName,ref string carType )
public static string WMSSpraying(string barcode, int isPass, string stcokNo, string partNo, string batchNo,ref string colorName,ref string productName,ref string carType)
{
JsonModel<NoModel> model = new JsonModel<NoModel>();
model.Result = "0";
@ -1049,7 +1049,9 @@ namespace Webservice
#region 调用WMS接口前记录数据
string sql_bf = @" INSERT INTO [tb_StockIn_beif]
try
{
string sql_bf = @" INSERT INTO [tb_StockIn_beif]
([ID]
,[barcode]
,[pass]
@ -1059,31 +1061,57 @@ namespace Webservice
,'" + barcode + @"'
,'" + isPass.ToString() + @"'
,(select getdate())) ";
SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql_bf, null);
SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql_bf, null);
}
catch(Exception ex)
{
model.Result = "0";
model.ResultType = "Result";
model.ResultRowsCount = "0";
model.ErrReason = "调用接口前,保存入tb_StockIn_beif表失败,原因:"+ex.Message;
model.DataList = null;
return JSONTools.ScriptSerialize<JsonModel<NoModel>>(model);
}
#endregion
#region 调用WMS Web Service
string res = string.Empty;
try
{
WebService.WebReference.JsonService webService = new WebService.WebReference.JsonService();
webService.Url = ConfigurationManager.AppSettings["WMSWebServiceURL"].ToString();
webService.Timeout = 1200000;
WebService.WebReference.JsonService webService = new WebService.WebReference.JsonService();
webService.Url = ConfigurationManager.AppSettings["WMSWebServiceURL"].ToString();
webService.Timeout = 1200000;
string jsonParam = " [{\"ServiceType\":\"AddMesData\",\"OperName\":\"ADMIN\"}]";
string strJson = "[25," + JSONTools.ScriptSerialize<List<WMS03Model>>(list) + "]";
res = webService.AddData(jsonParam, strJson);
LogHelper.WriteSysLogBase("条码：" + barcode + "调用WMS入库接口，参数：strJson = " + strJson + "返回结果：" + res, MethodBase.GetCurrentMethod().Name);
}
catch(Exception ex)
{
model.Result = "0";
model.ResultType = "Result";
model.ResultRowsCount = "0";
model.ErrReason = $"调用WMS接口[{ConfigurationManager.AppSettings["WMSWebServiceURL"].ToString()}]异常,原因:" + ex.Message;
model.DataList = null;
string jsonParam = " [{\"ServiceType\":\"AddMesData\",\"OperName\":\"ADMIN\"}]";
string strJson = "[25," + JSONTools.ScriptSerialize<List<WMS03Model>>(list) + "]";
return JSONTools.ScriptSerialize<JsonModel<NoModel>>(model);
}
#endregion
#region 调用，返回结果
string res = webService.AddData(jsonParam, strJson);
LogHelper.WriteSysLogBase("条码：" + barcode + "调用WMS入库接口，参数：strJson = " + strJson + "返回结果：" + res, MethodBase.GetCurrentMethod().Name);
#region 调用是否成功，若成功则存入数据库,WMS调用成功则无返回结果
if (res.ToUpper() == "TRUE")
{
string sql = @" INSERT INTO [tb_StockIn]
try
{
string sql = @" INSERT INTO [tb_StockIn]
([ID]
,[barcode]
,[pass]
@ -1092,20 +1120,28 @@ namespace Webservice
((select newid())
,'" + barcode + @"'
,'" + isPass.ToString() + @"'
,(select getdate()),'"+ repaint + "') ";
SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null);
,(select getdate()),'" + repaint + "') ";
SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null);
model.Result = "1";
model.ResultType = "Result";
model.ResultRowsCount = "0";
model.ErrReason = " 成功";
model.Result = "1";
model.ResultType = "Result";
model.ResultRowsCount = "0";
model.ErrReason = " 成功";
}
catch(Exception ex)
{
model.Result = "0";
model.ResultType = "Result";
model.ResultRowsCount = "0";
model.ErrReason = "Wms接口传递成功,但是存入tb_StockIn失败,原因:" + ex.Message;
}
}
else
{
model.Result = "0";
model.ResultType = "Result";
model.ResultRowsCount = "0";
model.ErrReason = res;
model.ErrReason = "Wms接口返回错误,错误信息:"+ res;
}
#endregion
@ -1117,7 +1153,8 @@ namespace Webservice
{
LogHelper.WriteLogManager(ex);
LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
model.ErrReason = ex.Message;
model.Result = "0";
model.ErrReason =$"执行方法[WMSSpraying]发生异常,原因" + ex.Message;
return JSONTools.ScriptSerialize<JsonModel<NoModel>>(model);
}
}

29
WebService/WMSWebService.asmx.cs
View File

@ -110,9 +110,17 @@ namespace Webservice
string carType = string.Empty;
try
{
sendRst = SendToWmsService(barcode, isOK, ref stcokNo, ref batchNo, ref partNo, ref colorName, ref productName, ref carType);
errorReason = "";
return sendRst;
sendRst = SendToWmsService(barcode, isOK, ref stcokNo, ref batchNo, ref partNo, ref colorName, ref productName, ref carType,ref errorReason);
if(sendRst == true)
{
return sendRst;
}
else
{
return false;
}
}
catch (Exception ex)
{
@ -140,7 +148,8 @@ namespace Webservice
string partNo = string.Empty;
try
{
sendRst = SendToWmsService(barCode,1, ref stcokNo, ref batchNo, ref partNo, ref colorName, ref productName, ref carType);
string errorReason = "";
sendRst = SendToWmsService(barCode, 1, ref stcokNo, ref batchNo, ref partNo, ref colorName, ref productName, ref carType, ref errorReason);
if (sendRst == true)
{
@ -160,12 +169,12 @@ namespace Webservice
}
else
{
return "发送到WMS接口失败,请重新操作.";
return errorReason;
}
}
catch (Exception ex)
{
return ex.Message;
return "下线服务异常,异常原因:"+ ex.Message;
}
}
@ -179,21 +188,22 @@ namespace Webservice
return Function.ExsitBarCodeInDownRecord(barCode);
}
bool SendToWmsService(string barCode,int isPass, ref string stcokNo, ref string batchNo, ref string partNo, ref string colorName, ref string productName, ref string carType)
bool SendToWmsService(string barCode,int isPass, ref string stcokNo, ref string batchNo, ref string partNo, ref string colorName, ref string productName, ref string carType,ref string errorReason)
{
string errorMsg = string.Empty;
string errorReason = "";
//return true;
#region 参数判断
if (string.IsNullOrWhiteSpace(barCode))
{
throw new Exception("条码号不能为空");
errorReason = "条码号不能为空";
return false;
}
Function.GetCode(barCode, out stcokNo, out batchNo, out partNo);
if (string.IsNullOrWhiteSpace(stcokNo) && string.IsNullOrWhiteSpace(partNo))
{
throw new Exception("条码号无效，请检查条码是否破损缺失");
errorReason = "条码号无效，请检查条码是否破损缺失";
return false;
}
@ -204,6 +214,7 @@ namespace Webservice
if (model.Result == "0")
{
errorReason = model.ErrReason;
throw new Exception(model.ErrReason);
}
return true;

Write Preview
Loading…
Cancel
Save