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

网站,颜色增加的修改

master
ruoxing.wang 3 days ago
parent
cc8b4bfdbb
commit
778af9692a
21 changed files with 263 additions and 108 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. 94
      FacOneZPStation/FrmZP.Designer.cs
  2. 9
      InjectionPC/FrmMain.Designer.cs
  3. 9
      InjectionPC/FrmMain2411.Designer.cs
  4. BIN
      InjectionPC/Sill.grf
  5. 3
      MESClassLibrary/BLL/BasicInfo/PaintColorInfoBLL.cs
  6. 40
      MESClassLibrary/BLL/BasicInfo/PaintInfoBLL.cs
  7. 2
      MESClassLibrary/EFModel/BBMPT.Context.cs
  8. 64
      MESClassLibrary/EFModel/BBMPT.edmx
  9. 3
      MESClassLibrary/EFModel/tb_ForeignColorMap.cs
  10. 1
      MESClassLibrary/EFModel/tb_Injection_BoxRecord.cs
  11. 1
      MESClassLibrary/EFModel/tb_InspectResult.cs
  12. 1
      MESClassLibrary/EFModel/tb_StockIn.cs
  13. 19
      MESClassLibrary/obj/Debug/edmxResourcesToEmbed/EFModel/BBMPT.csdl
  14. 15
      MESClassLibrary/obj/Debug/edmxResourcesToEmbed/EFModel/BBMPT.msl
  15. 3
      MESWebSite/HttpHandlers/PaintColorInfoHandler.ashx.cs
  16. 10
      MESWebSite/HttpHandlers/PaintInfoHandler.ashx.cs
  17. 12
      MESWebSite/MESWebSite.csproj
  18. 10
      MESWebSite/Manage/AnalysisApi.aspx.cs
  19. 46
      MESWebSite/Manage/PaintColorInfo.aspx
  20. 26
      MESWebSite/Manage/PaintColorInfo.aspx.designer.cs
  21. 3
      MESWebSite/Manage/Product.aspx

94
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, 786F));
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 791F));
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(1772, 14);
this.button6.Location = new System.Drawing.Point(1768, 14);
this.button6.Margin = new System.Windows.Forms.Padding(14);
this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(760, 183);
this.button6.Size = new System.Drawing.Size(764, 183);
this.button6.TabIndex = 7;
this.button6.Text = "手动打印箱单";
this.button6.UseVisualStyleBackColor = false;
@ -119,7 +119,7 @@
this.button1.Location = new System.Drawing.Point(7, 217);
this.button1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(575, 200);
this.button1.Size = new System.Drawing.Size(574, 200);
this.button1.TabIndex = 6;
this.button1.Text = "打印标签";
this.button1.UseVisualStyleBackColor = false;
@ -131,10 +131,10 @@
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(1194, 225);
this.button5.Location = new System.Drawing.Point(1192, 225);
this.button5.Margin = new System.Windows.Forms.Padding(14);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(550, 184);
this.button5.Size = new System.Drawing.Size(548, 184);
this.button5.TabIndex = 5;
this.button5.Text = "不合格";
this.button5.UseVisualStyleBackColor = false;
@ -145,10 +145,10 @@
this.button4.BackColor = System.Drawing.Color.RoyalBlue;
this.button4.Dock = System.Windows.Forms.DockStyle.Fill;
this.button4.Font = new System.Drawing.Font("黑体", 16F);
this.button4.Location = new System.Drawing.Point(596, 6);
this.button4.Location = new System.Drawing.Point(595, 6);
this.button4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(577, 199);
this.button4.Size = new System.Drawing.Size(576, 199);
this.button4.TabIndex = 4;
this.button4.Text = "下一计划";
this.button4.UseVisualStyleBackColor = false;
@ -162,7 +162,7 @@
this.button3.Location = new System.Drawing.Point(7, 6);
this.button3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(575, 199);
this.button3.Size = new System.Drawing.Size(574, 199);
this.button3.TabIndex = 3;
this.button3.Text = "上一计划";
this.button3.UseVisualStyleBackColor = false;
@ -174,10 +174,10 @@
this.button2.Dock = System.Windows.Forms.DockStyle.Fill;
this.button2.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button2.ForeColor = System.Drawing.Color.Black;
this.button2.Location = new System.Drawing.Point(603, 225);
this.button2.Location = new System.Drawing.Point(602, 225);
this.button2.Margin = new System.Windows.Forms.Padding(14);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(563, 184);
this.button2.Size = new System.Drawing.Size(562, 184);
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(1765, 217);
this.button7.Location = new System.Drawing.Point(1761, 217);
this.button7.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(774, 200);
this.button7.Size = new System.Drawing.Size(778, 200);
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(1414, 3);
this.label7.Location = new System.Drawing.Point(1408, 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(408, 127);
this.textBox2.Location = new System.Drawing.Point(406, 127);
this.textBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(999, 87);
this.textBox2.Size = new System.Drawing.Size(995, 87);
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, 122);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(394, 124);
this.label3.Size = new System.Drawing.Size(392, 124);
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(1691, 249);
this.labOrderNo.Location = new System.Drawing.Point(1685, 249);
this.labOrderNo.Margin = new System.Windows.Forms.Padding(2);
this.labOrderNo.Name = "labOrderNo";
this.labOrderNo.Size = new System.Drawing.Size(858, 174);
this.labOrderNo.Size = new System.Drawing.Size(864, 174);
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(1414, 249);
this.label4.Location = new System.Drawing.Point(1408, 249);
this.label4.Margin = new System.Windows.Forms.Padding(2);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(272, 174);
@ -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(406, 249);
this.labStationNo.Location = new System.Drawing.Point(404, 249);
this.labStationNo.Margin = new System.Windows.Forms.Padding(2);
this.labStationNo.Name = "labStationNo";
this.labStationNo.Size = new System.Drawing.Size(1003, 174);
this.labStationNo.Size = new System.Drawing.Size(999, 174);
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, 249);
this.label2.Margin = new System.Windows.Forms.Padding(2);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(398, 174);
this.label2.Size = new System.Drawing.Size(396, 174);
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(1691, 428);
this.labPName.Location = new System.Drawing.Point(1685, 428);
this.labPName.Margin = new System.Windows.Forms.Padding(2);
this.labPName.Name = "labPName";
this.labPName.Size = new System.Drawing.Size(858, 284);
this.labPName.Size = new System.Drawing.Size(864, 284);
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(1414, 428);
this.label8.Location = new System.Drawing.Point(1408, 428);
this.label8.Margin = new System.Windows.Forms.Padding(2);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(272, 284);
@ -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(406, 428);
this.labPartNo.Location = new System.Drawing.Point(404, 428);
this.labPartNo.Margin = new System.Windows.Forms.Padding(2);
this.labPartNo.Name = "labPartNo";
this.labPartNo.Size = new System.Drawing.Size(1003, 284);
this.labPartNo.Size = new System.Drawing.Size(999, 284);
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, 428);
this.label6.Margin = new System.Windows.Forms.Padding(2);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(398, 284);
this.label6.Size = new System.Drawing.Size(396, 284);
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(1691, 717);
this.labBadCount.Location = new System.Drawing.Point(1685, 717);
this.labBadCount.Margin = new System.Windows.Forms.Padding(2);
this.labBadCount.Name = "labBadCount";
this.labBadCount.Size = new System.Drawing.Size(858, 515);
this.labBadCount.Size = new System.Drawing.Size(864, 515);
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(406, 717);
this.labNum.Location = new System.Drawing.Point(404, 717);
this.labNum.Margin = new System.Windows.Forms.Padding(2);
this.labNum.Name = "labNum";
this.labNum.Size = new System.Drawing.Size(1003, 515);
this.labNum.Size = new System.Drawing.Size(999, 515);
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, 717);
this.label10.Margin = new System.Windows.Forms.Padding(2);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(398, 515);
this.label10.Size = new System.Drawing.Size(396, 515);
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(394, 120);
this.label14.Size = new System.Drawing.Size(392, 120);
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(408, 6);
this.textBox1.Location = new System.Drawing.Point(406, 6);
this.textBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(999, 87);
this.textBox1.Size = new System.Drawing.Size(995, 87);
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(1693, 1);
this.labErrMessage.Location = new System.Drawing.Point(1687, 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(854, 245);
this.labErrMessage.Size = new System.Drawing.Size(860, 245);
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, 276F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 861F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 867F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F));
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(1414, 717);
this.label12.Location = new System.Drawing.Point(1408, 717);
this.label12.Margin = new System.Windows.Forms.Padding(2);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(272, 515);
@ -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(1912, 0);
this.labTime.Location = new System.Drawing.Point(1909, 0);
this.labTime.Margin = new System.Windows.Forms.Padding(0);
this.labTime.Name = "labTime";
this.labTime.Size = new System.Drawing.Size(648, 149);
this.labTime.Size = new System.Drawing.Size(651, 149);
this.labTime.TabIndex = 7;
this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labTime.Click += new System.EventHandler(this.labTime_Click);
@ -508,7 +508,7 @@
this.pictureBox1.Location = new System.Drawing.Point(0, 0);
this.pictureBox1.Margin = new System.Windows.Forms.Padding(0);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(346, 149);
this.pictureBox1.Size = new System.Drawing.Size(345, 149);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@ -518,10 +518,10 @@
this.label1.BackColor = System.Drawing.Color.Transparent;
this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
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(346, 0);
this.label1.Location = new System.Drawing.Point(345, 0);
this.label1.Margin = new System.Windows.Forms.Padding(0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(1566, 149);
this.label1.Size = new System.Drawing.Size(1564, 149);
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, 647F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 650F));
this.tableLayoutPanel2.Controls.Add(this.labTime, 2, 0);
this.tableLayoutPanel2.Controls.Add(this.pictureBox1, 0, 0);
this.tableLayoutPanel2.Controls.Add(this.label1, 1, 0);

9
InjectionPC/FrmMain.Designer.cs
View File

@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
GlacialComponents.Controls.GLColumn glColumn1 = new GlacialComponents.Controls.GLColumn();
GlacialComponents.Controls.GLColumn glColumn2 = new GlacialComponents.Controls.GLColumn();
GlacialComponents.Controls.GLColumn glColumn3 = new GlacialComponents.Controls.GLColumn();
@ -117,10 +118,10 @@
this.label2 = new System.Windows.Forms.Label();
this.panel3 = new System.Windows.Forms.Panel();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.timer1 = new System.Windows.Forms.Timer();
this.serialPort1 = new System.IO.Ports.SerialPort();
this.timer2 = new System.Windows.Forms.Timer();
this.timer3 = new System.Windows.Forms.Timer();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.serialPort1 = new System.IO.Ports.SerialPort(this.components);
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.timer3 = new System.Windows.Forms.Timer(this.components);
this.panel1.SuspendLayout();
this.panel7.SuspendLayout();
this.panel23.SuspendLayout();

9
InjectionPC/FrmMain2411.Designer.cs
View File

@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
GlacialComponents.Controls.GLColumn glColumn1 = new GlacialComponents.Controls.GLColumn();
GlacialComponents.Controls.GLColumn glColumn2 = new GlacialComponents.Controls.GLColumn();
GlacialComponents.Controls.GLColumn glColumn3 = new GlacialComponents.Controls.GLColumn();
@ -123,10 +124,10 @@
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.label35 = new System.Windows.Forms.Label();
this.label39 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer();
this.serialPort1 = new System.IO.Ports.SerialPort();
this.timer2 = new System.Windows.Forms.Timer();
this.timer3 = new System.Windows.Forms.Timer();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.serialPort1 = new System.IO.Ports.SerialPort(this.components);
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.timer3 = new System.Windows.Forms.Timer(this.components);
this.panel1.SuspendLayout();
this.panel7.SuspendLayout();
this.panel23.SuspendLayout();

BIN
InjectionPC/Sill.grf
View File

Binary file not shown.

3
MESClassLibrary/BLL/BasicInfo/PaintColorInfoBLL.cs
View File

@ -54,10 +54,11 @@ namespace MESClassLibrary.BLL.BasicInfo
{
//初始化要更新的字段
string[] proNames = new string[3];
string[] proNames = new string[4];
proNames[0] = "Color";
proNames[1] = "Paint_No";
proNames[2] = "StockNo";
proNames[3] = "PaintID";
//必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
//如果没有初始化必填字段，更新会报错

40
MESClassLibrary/BLL/BasicInfo/PaintInfoBLL.cs
View File

@ -185,6 +185,46 @@ namespace MESClassLibrary.BLL.BasicInfo
}
}
public string GetComboboxData2(string color)
{
try
{
if (color.Contains("底漆"))
{
color = "底漆";
}
else
{
if (color.Length > 3)
{
color = color.Substring(0, 3);
}
}
string jsonStr = "[]";
var list = db.SearchAllInfo().Where(p=>p.PaintName.Contains(color) ).ToList();//判断是否有重复数据
List<SelectModel> sl = new List<SelectModel>();
foreach (var item in list)
{
SelectModel md = new SelectModel();
md.textField = item.PaintCode + "--" + item.PaintName;
md.valueField = item.ID;
sl.Add(md);
}
jsonStr = JSONTools.ScriptSerialize(sl);
return jsonStr;
}
catch (Exception ex)
{
LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
return "";
}
}

2
MESClassLibrary/EFModel/BBMPT.Context.cs
View File

@ -184,6 +184,6 @@ namespace MESClassLibrary.EFModel
public virtual DbSet<tb_ZPTagTest> tb_ZPTagTest { get; set; }
public virtual DbSet<test1> test1 { get; set; }
public virtual DbSet<View_1> View_1 { get; set; }
public virtual DbSet<tb_ForeignColorMap> tb_ForeignColorMapSet { get; set; }
public virtual DbSet<tb_ForeignColorMap> tb_ForeignColorMap { get; set; }
}
}

64
MESClassLibrary/EFModel/BBMPT.edmx
View File

@ -561,8 +561,6 @@
<Property Name="CarTypeID" Type="varchar" MaxLength="50" Nullable="false" />
<Property Name="ColorID" Type="varchar" MaxLength="50" Nullable="false" />
</EntityType>
<!--生成过程中发现错误:
警告 6002: 表/视图“BBMPT1.dbo.tb_ChainDown”未定义主键。已推断出该键，并将定义创建为只读的表/视图。-->
<EntityType Name="tb_ChainDown">
<Key>
<PropertyRef Name="ID" />
@ -845,6 +843,17 @@
<Property Name="FinishProductName" Type="nvarchar" MaxLength="500" />
<Property Name="Des" Type="nchar" MaxLength="10" />
</EntityType>
<EntityType Name="tb_ForeignColorMap">
<Key>
<PropertyRef Name="ID" />
</Key>
<Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
<Property Name="TypeCode" Type="varchar" MaxLength="50" Nullable="false" />
<Property Name="PartCode" Type="varchar" MaxLength="50" Nullable="false" />
<Property Name="PartName" Type="varchar" MaxLength="50" />
<Property Name="Color" Type="varchar" MaxLength="20" Nullable="false" />
<Property Name="StockNo" Type="varchar" MaxLength="100" Nullable="false" />
</EntityType>
<EntityType Name="tb_ImgVideo">
<Key>
<PropertyRef Name="ID" />
@ -880,6 +889,7 @@
<Property Name="Mould" Type="int" />
<Property Name="IsPrint" Type="int" />
<Property Name="PrintTime" Type="datetime" />
<Property Name="Remark" Type="varchar" MaxLength="128" />
</EntityType>
<EntityType Name="tb_Injection_DownRecord">
<Key>
@ -1048,6 +1058,7 @@
<Property Name="remark1" Type="nvarchar" MaxLength="100" />
<Property Name="remark2" Type="nvarchar" MaxLength="100" />
<Property Name="remark3" Type="nvarchar" MaxLength="100" />
<Property Name="CarType" Type="varchar" MaxLength="20" />
</EntityType>
<EntityType Name="tb_JbCylinderAndRaw">
<Key>
@ -1942,6 +1953,7 @@
<Property Name="createTime" Type="datetime" />
<Property Name="paintCode" Type="nvarchar" MaxLength="50" />
<Property Name="ZcCode" Type="nvarchar" MaxLength="50" />
<Property Name="Repaint" Type="varchar" MaxLength="10" />
</EntityType>
<EntityType Name="tb_StockIn_beif">
<Key>
@ -2351,6 +2363,7 @@
<EntitySet Name="tb_BucketInfo" EntityType="Self.tb_BucketInfo" Schema="dbo" store:Type="Tables" />
<EntitySet Name="tb_CarType" EntityType="Self.tb_CarType" Schema="dbo" store:Type="Tables" />
<EntitySet Name="tb_CarTypeColor" EntityType="Self.tb_CarTypeColor" Schema="dbo" store:Type="Tables" />
<EntitySet Name="tb_ChainDown" EntityType="Self.tb_ChainDown" Schema="dbo" store:Type="Tables" />
<EntitySet Name="tb_ChainUp" EntityType="Self.tb_ChainUp" Schema="dbo" store:Type="Tables" />
<EntitySet Name="tb_ChainUpBarcode" EntityType="Self.tb_ChainUpBarcode" Schema="dbo" store:Type="Tables" />
<EntitySet Name="tb_CheckItem" EntityType="Self.tb_CheckItem" Schema="dbo" store:Type="Tables" />
@ -2367,6 +2380,7 @@
<EntitySet Name="tb_DeviceKeepItems" EntityType="Self.tb_DeviceKeepItems" Schema="dbo" store:Type="Tables" />
<EntitySet Name="tb_Factory" EntityType="Self.tb_Factory" Schema="dbo" store:Type="Tables" />
<EntitySet Name="tb_FinishProduct" EntityType="Self.tb_FinishProduct" Schema="dbo" store:Type="Tables" />
<EntitySet Name="tb_ForeignColorMap" EntityType="Self.tb_ForeignColorMap" Schema="dbo" store:Type="Tables" />
<EntitySet Name="tb_ImgVideo" EntityType="Self.tb_ImgVideo" Schema="dbo" store:Type="Tables" />
<EntitySet Name="tb_Inhection_DownReason" EntityType="Self.tb_Inhection_DownReason" Schema="dbo" store:Type="Tables" />
<EntitySet Name="tb_Injection_BoxRecord" EntityType="Self.tb_Injection_BoxRecord" Schema="dbo" store:Type="Tables" />
@ -2661,18 +2675,6 @@
[tb_BucketInfo_bak].[CreateTime] AS [CreateTime],
[tb_BucketInfo_bak].[UserID] AS [UserID]
FROM [dbo].[tb_BucketInfo_bak] AS [tb_BucketInfo_bak]</DefiningQuery>
</EntitySet>
<EntitySet Name="tb_ChainDown" EntityType="Self.tb_ChainDown" store:Type="Tables" store:Schema="dbo">
<DefiningQuery>SELECT
[tb_ChainDown].[ID] AS [ID],
[tb_ChainDown].[barcode] AS [barcode],
[tb_ChainDown].[carType] AS [carType],
[tb_ChainDown].[color] AS [color],
[tb_ChainDown].[flag] AS [flag],
[tb_ChainDown].[createTime] AS [createTime],
[tb_ChainDown].[boxNum] AS [boxNum],
[tb_ChainDown].[productName] AS [productName]
FROM [dbo].[tb_ChainDown] AS [tb_ChainDown]</DefiningQuery>
</EntitySet>
<EntitySet Name="tb_ChainDown_bak" EntityType="Self.tb_ChainDown_bak" store:Type="Tables" store:Schema="dbo">
<DefiningQuery>SELECT
@ -3231,6 +3233,7 @@
<End Role="T_Sys_Power" EntitySet="T_Sys_Power" />
<End Role="T_Sys_RoleLinkPower" EntitySet="T_Sys_RoleLinkPower" />
</AssociationSet>
<EntitySet Name="tb_ForeignColorMap" EntityType="BBMPTModel.tb_ForeignColorMap" />
</EntityContainer>
<EntityType Name="LogErr">
<Key>
@ -3769,6 +3772,7 @@
<Property Name="Mould" Type="Int32" />
<Property Name="IsPrint" Type="Int32" />
<Property Name="PrintTime" Type="DateTime" Precision="3" />
<Property Name="Remark" Type="String" MaxLength="128" FixedLength="false" Unicode="false" />
</EntityType>
<EntityType Name="tb_Injection_DownRecord">
<Key>
@ -3912,6 +3916,7 @@
<Property Name="remark1" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
<Property Name="remark2" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
<Property Name="remark3" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
<Property Name="CarType" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
</EntityType>
<EntityType Name="tb_JbCylinderAndRaw">
<Key>
@ -4294,7 +4299,7 @@
<Property Name="Cols" Type="Int32" />
<Property Name="Layers" Type="Int32" />
<Property Name="PicturePath" Type="String" MaxLength="500" FixedLength="false" Unicode="true" />
<Property Name="Des" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
<Property Name="Des" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
<Property Name="isImport" Type="Int32" />
<Property Name="PackCount" Type="Int32" />
<Property Name="OpenFailNum" Type="Int32" />
@ -4316,7 +4321,7 @@
<Property Name="ProgramNo" Type="Int32" />
<Property Name="Side" Type="Int32" />
<Property Name="IsSend" Type="Int32" />
<Property Name="PackCountSize" Type="String" Nullable="false" />
<Property Name="PackCountSize" Type="String" Unicode="false" FixedLength="false" MaxLength="100" />
</EntityType>
<EntityType Name="tb_Product_Color">
<Key>
@ -4560,6 +4565,7 @@
<Property Name="createTime" Type="DateTime" Precision="3" />
<Property Name="paintCode" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
<Property Name="ZcCode" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
<Property Name="Repaint" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
</EntityType>
<EntityType Name="tb_StockIn_beif">
<Key>
@ -5472,6 +5478,17 @@
</Dependent>
</ReferentialConstraint>
</Association>
<EntityType Name="tb_ForeignColorMap">
<Key>
<PropertyRef Name="ID" />
</Key>
<Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
<Property Name="TypeCode" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="PartCode" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="PartName" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="Color" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
<Property Name="StockNo" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
</EntityType>
</Schema>
</edmx:ConceptualModels>
<!-- C-S mapping content -->
@ -6045,6 +6062,7 @@
<EntitySetMapping Name="tb_Injection_BoxRecord">
<EntityTypeMapping TypeName="BBMPTModel.tb_Injection_BoxRecord">
<MappingFragment StoreEntitySet="tb_Injection_BoxRecord">
<ScalarProperty Name="Remark" ColumnName="Remark" />
<ScalarProperty Name="PrintTime" ColumnName="PrintTime" />
<ScalarProperty Name="IsPrint" ColumnName="IsPrint" />
<ScalarProperty Name="Mould" ColumnName="Mould" />
@ -6192,6 +6210,7 @@
<EntitySetMapping Name="tb_InspectResult">
<EntityTypeMapping TypeName="BBMPTModel.tb_InspectResult">
<MappingFragment StoreEntitySet="tb_InspectResult">
<ScalarProperty Name="CarType" ColumnName="CarType" />
<ScalarProperty Name="remark3" ColumnName="remark3" />
<ScalarProperty Name="remark2" ColumnName="remark2" />
<ScalarProperty Name="remark1" ColumnName="remark1" />
@ -6897,6 +6916,7 @@
<EntitySetMapping Name="tb_StockIn">
<EntityTypeMapping TypeName="BBMPTModel.tb_StockIn">
<MappingFragment StoreEntitySet="tb_StockIn">
<ScalarProperty Name="Repaint" ColumnName="Repaint" />
<ScalarProperty Name="ZcCode" ColumnName="ZcCode" />
<ScalarProperty Name="paintCode" ColumnName="paintCode" />
<ScalarProperty Name="createTime" ColumnName="createTime" />
@ -7854,6 +7874,18 @@
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
<EntitySetMapping Name="tb_ForeignColorMap">
<EntityTypeMapping TypeName="BBMPTModel.tb_ForeignColorMap">
<MappingFragment StoreEntitySet="tb_ForeignColorMap">
<ScalarProperty Name="StockNo" ColumnName="StockNo" />
<ScalarProperty Name="Color" ColumnName="Color" />
<ScalarProperty Name="PartName" ColumnName="PartName" />
<ScalarProperty Name="PartCode" ColumnName="PartCode" />
<ScalarProperty Name="TypeCode" ColumnName="TypeCode" />
<ScalarProperty Name="ID" ColumnName="ID" />
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
</EntityContainerMapping>
</Mapping>
</edmx:Mappings>

3
MESClassLibrary/EFModel/tb_ForeignColorMap.cs
View File

@ -14,10 +14,11 @@ namespace MESClassLibrary.EFModel
public partial class tb_ForeignColorMap
{
public int Id { get; set; }
public int ID { get; set; }
public string TypeCode { get; set; }
public string PartCode { get; set; }
public string PartName { get; set; }
public string Color { get; set; }
public string StockNo { get; set; }
}
}

1
MESClassLibrary/EFModel/tb_Injection_BoxRecord.cs
View File

@ -26,5 +26,6 @@ namespace MESClassLibrary.EFModel
public Nullable<int> Mould { get; set; }
public Nullable<int> IsPrint { get; set; }
public Nullable<System.DateTime> PrintTime { get; set; }
public string Remark { get; set; }
}
}

1
MESClassLibrary/EFModel/tb_InspectResult.cs
View File

@ -31,5 +31,6 @@ namespace MESClassLibrary.EFModel
public string remark1 { get; set; }
public string remark2 { get; set; }
public string remark3 { get; set; }
public string CarType { get; set; }
}
}

1
MESClassLibrary/EFModel/tb_StockIn.cs
View File

@ -20,5 +20,6 @@ namespace MESClassLibrary.EFModel
public Nullable<System.DateTime> createTime { get; set; }
public string paintCode { get; set; }
public string ZcCode { get; set; }
public string Repaint { get; set; }
}
}

19
MESClassLibrary/obj/Debug/edmxResourcesToEmbed/EFModel/BBMPT.csdl
View File

@ -164,6 +164,7 @@
<End Role="T_Sys_Power" EntitySet="T_Sys_Power" />
<End Role="T_Sys_RoleLinkPower" EntitySet="T_Sys_RoleLinkPower" />
</AssociationSet>
<EntitySet Name="tb_ForeignColorMap" EntityType="BBMPTModel.tb_ForeignColorMap" />
</EntityContainer>
<EntityType Name="LogErr">
<Key>
@ -702,6 +703,7 @@
<Property Name="Mould" Type="Int32" />
<Property Name="IsPrint" Type="Int32" />
<Property Name="PrintTime" Type="DateTime" Precision="3" />
<Property Name="Remark" Type="String" MaxLength="128" FixedLength="false" Unicode="false" />
</EntityType>
<EntityType Name="tb_Injection_DownRecord">
<Key>
@ -845,6 +847,7 @@
<Property Name="remark1" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
<Property Name="remark2" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
<Property Name="remark3" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
<Property Name="CarType" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
</EntityType>
<EntityType Name="tb_JbCylinderAndRaw">
<Key>
@ -1227,7 +1230,7 @@
<Property Name="Cols" Type="Int32" />
<Property Name="Layers" Type="Int32" />
<Property Name="PicturePath" Type="String" MaxLength="500" FixedLength="false" Unicode="true" />
<Property Name="Des" Type="String" MaxLength="100" FixedLength="false" Unicode="false" />
<Property Name="Des" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
<Property Name="isImport" Type="Int32" />
<Property Name="PackCount" Type="Int32" />
<Property Name="OpenFailNum" Type="Int32" />
@ -1249,7 +1252,7 @@
<Property Name="ProgramNo" Type="Int32" />
<Property Name="Side" Type="Int32" />
<Property Name="IsSend" Type="Int32" />
<Property Name="PackCountSize" Type="String" Nullable="false" />
<Property Name="PackCountSize" Type="String" Unicode="false" FixedLength="false" MaxLength="100" />
</EntityType>
<EntityType Name="tb_Product_Color">
<Key>
@ -1493,6 +1496,7 @@
<Property Name="createTime" Type="DateTime" Precision="3" />
<Property Name="paintCode" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
<Property Name="ZcCode" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
<Property Name="Repaint" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
</EntityType>
<EntityType Name="tb_StockIn_beif">
<Key>
@ -2405,4 +2409,15 @@
</Dependent>
</ReferentialConstraint>
</Association>
<EntityType Name="tb_ForeignColorMap">
<Key>
<PropertyRef Name="ID" />
</Key>
<Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
<Property Name="TypeCode" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="PartCode" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="PartName" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="Color" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
<Property Name="StockNo" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
</EntityType>
</Schema>

15
MESClassLibrary/obj/Debug/edmxResourcesToEmbed/EFModel/BBMPT.msl
View File

@ -568,6 +568,7 @@
<EntitySetMapping Name="tb_Injection_BoxRecord">
<EntityTypeMapping TypeName="BBMPTModel.tb_Injection_BoxRecord">
<MappingFragment StoreEntitySet="tb_Injection_BoxRecord">
<ScalarProperty Name="Remark" ColumnName="Remark" />
<ScalarProperty Name="PrintTime" ColumnName="PrintTime" />
<ScalarProperty Name="IsPrint" ColumnName="IsPrint" />
<ScalarProperty Name="Mould" ColumnName="Mould" />
@ -715,6 +716,7 @@
<EntitySetMapping Name="tb_InspectResult">
<EntityTypeMapping TypeName="BBMPTModel.tb_InspectResult">
<MappingFragment StoreEntitySet="tb_InspectResult">
<ScalarProperty Name="CarType" ColumnName="CarType" />
<ScalarProperty Name="remark3" ColumnName="remark3" />
<ScalarProperty Name="remark2" ColumnName="remark2" />
<ScalarProperty Name="remark1" ColumnName="remark1" />
@ -1420,6 +1422,7 @@
<EntitySetMapping Name="tb_StockIn">
<EntityTypeMapping TypeName="BBMPTModel.tb_StockIn">
<MappingFragment StoreEntitySet="tb_StockIn">
<ScalarProperty Name="Repaint" ColumnName="Repaint" />
<ScalarProperty Name="ZcCode" ColumnName="ZcCode" />
<ScalarProperty Name="paintCode" ColumnName="paintCode" />
<ScalarProperty Name="createTime" ColumnName="createTime" />
@ -2377,5 +2380,17 @@
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
<EntitySetMapping Name="tb_ForeignColorMap">
<EntityTypeMapping TypeName="BBMPTModel.tb_ForeignColorMap">
<MappingFragment StoreEntitySet="tb_ForeignColorMap">
<ScalarProperty Name="StockNo" ColumnName="StockNo" />
<ScalarProperty Name="Color" ColumnName="Color" />
<ScalarProperty Name="PartName" ColumnName="PartName" />
<ScalarProperty Name="PartCode" ColumnName="PartCode" />
<ScalarProperty Name="TypeCode" ColumnName="TypeCode" />
<ScalarProperty Name="ID" ColumnName="ID" />
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
</EntityContainerMapping>
</Mapping>

3
MESWebSite/HttpHandlers/PaintColorInfoHandler.ashx.cs
View File

@ -85,6 +85,7 @@ namespace MESWebSite.HttpHandlers
string Color = Request.Params["Color"];
string Paint_No = Request.Params["Paint_No"];
string StockNo = Request.Params["StockNo"];
string paintID = Request.Params["PaintID"];
PaintColorInfoBLL bll = new PaintColorInfoBLL();
tb_PaintColorInfo md = new tb_PaintColorInfo();
@ -92,7 +93,7 @@ namespace MESWebSite.HttpHandlers
md.Color = Color;
md.Paint_No = Paint_No;
md.StockNo = StockNo;
md.PaintID = paintID;
if (ID == "0")
{

10
MESWebSite/HttpHandlers/PaintInfoHandler.ashx.cs
View File

@ -20,6 +20,7 @@ namespace MESWebSite.HttpHandlers
Response = context.Response;
string method = Request.Params["method"];
string filter = Request.Params["filter"];
switch (method)
{
@ -35,6 +36,9 @@ namespace MESWebSite.HttpHandlers
case "QueryForCombobox":
QueryForCombobox();
break;
case "QueryList2":
QueryForCombobox2(filter);
break;
default:
break;
@ -135,6 +139,12 @@ namespace MESWebSite.HttpHandlers
Response.End();
}
void QueryForCombobox2(string filter)
{
PaintInfoBLL bll = new PaintInfoBLL();
Response.Write(bll.GetComboboxData2(filter));
Response.End();
}
}
}

12
MESWebSite/MESWebSite.csproj
View File

@ -155,7 +155,6 @@
<Content Include="Manage\Record_247.aspx" />
<Content Include="Manage\RepairRecord.aspx" />
<Content Include="Manage\RetrospectSearch.aspx" />
<Content Include="Manage\ForeignColorMap.aspx" />
<Content Include="Manage\StockIn.aspx" />
<Content Include="Manage\ZpBadInjectionSearch.aspx" />
<Content Include="Manage\ZPBom.aspx" />
@ -817,7 +816,6 @@
<Content Include="HttpHandlers\RetrospectSearchHandler.ashx" />
<Content Include="HttpHandlers\ChaimUpRecordHandler.ashx" />
<Content Include="HttpHandlers\ChaimDownRecordHandler.ashx" />
<Content Include="HttpHandlers\ForeignColorMapHandler.ashx" />
<None Include="Properties\PublishProfiles\BBMPT1.pubxml" />
<None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
<None Include="Properties\PublishProfiles\Web.config.pubxml" />
@ -1245,9 +1243,6 @@
<Compile Include="HttpHandlers\RetrospectSearchHandler.ashx.cs">
<DependentUpon>RetrospectSearchHandler.ashx</DependentUpon>
</Compile>
<Compile Include="HttpHandlers\ForeignColorMapHandler.ashx.cs">
<DependentUpon>ForeignColorMapHandler.ashx</DependentUpon>
</Compile>
<Compile Include="HttpHandlers\StationHandler.ashx.cs">
<DependentUpon>StationHandler.ashx</DependentUpon>
</Compile>
@ -1735,13 +1730,6 @@
<Compile Include="Manage\RetrospectSearch.aspx.designer.cs">
<DependentUpon>RetrospectSearch.aspx</DependentUpon>
</Compile>
<Compile Include="Manage\ForeignColorMap.aspx.cs">
<DependentUpon>ForeignColorMap.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Manage\ForeignColorMap.aspx.designer.cs">
<DependentUpon>ForeignColorMap.aspx</DependentUpon>
</Compile>
<Compile Include="Manage\Station.aspx.cs">
<DependentUpon>Station.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

10
MESWebSite/Manage/AnalysisApi.aspx.cs
View File

@ -115,7 +115,7 @@ namespace MESWebSite.Manage
if (t != null && t.Count > 0)
{
double r = (double)t.Where(p => p.inspectResult.Equals("合格")).Count() / (double)t.Count;
double r = (double)t.Where(p => p.inspectResult.Equals("[合格]")).Count() / (double)t.Count;
data.Add(Math.Round(r * 100, 2).ToString());
}
else
@ -136,7 +136,7 @@ namespace MESWebSite.Manage
if (t != null && t.Count > 0)
{
double r = (double)t.Where(p => p.inspectResult.Equals("合格")).Count() / (double)t.Count;
double r = (double)t.Where(p => p.inspectResult.Equals("[合格]")).Count() / (double)t.Count;
data.Add(Math.Round(r * 100, 2).ToString());
}
else
@ -158,7 +158,7 @@ namespace MESWebSite.Manage
if (t != null && t.Count > 0)
{
double r = (double)t.Where(p => p.inspectResult.Equals("合格")).Count() / (double)t.Count;
double r = (double)t.Where(p => p.inspectResult.Equals("[合格]")).Count() / (double)t.Count;
data.Add(Math.Round(r * 100, 2).ToString());
}
else
@ -261,7 +261,7 @@ namespace MESWebSite.Manage
colorList.Add(pinfo, 0);
}
if ("合格".Equals(item.inspectResult))
if ("[合格]".Equals(item.inspectResult))
{
colorList[pinfo] = colorList[pinfo] + 1;
}
@ -308,7 +308,7 @@ namespace MESWebSite.Manage
if (info.Count() > 0)
{
cnum = info.Count();
num = info.Where(p => p.inspectResult.Equals("合格")).Count();
num = info.Where(p => p.inspectResult.Equals("[合格]")).Count();
r = num / cnum;
listModel.Add(Math.Round(r * 100, 2).ToString() + "%");
}

46
MESWebSite/Manage/PaintColorInfo.aspx
View File

@ -51,6 +51,12 @@
</style>
<title>油漆件信息</title>
</head>
<%-- 1.截取颜色名前3位查询喷涂信息下拉列表
2.没有颜色名,查询全部
3.带底漆二字的特殊处理.--%>
<body>
<form id="form1" runat="server">
<div class="top">
@ -63,6 +69,10 @@
<input type="text" id="Paint_No_s" style="width: 140px;" /></td>
<td style="width: 400px;">塑件存货代码：
<input type="text" id="StockNo_s" style="width: 140px;" /></td>
<%-- <td style="width: 235px;">漆件信息：
<select id="fl_id_s" class="easyui-combobox" style="width: 160px; height: 30px;"
data-options="valueField: 'PaintID',textField: 'PaintName'">
</select></td>--%>
<td style="width: 80px"><a class="topsearchBtn">查询</a></td>
<td style="width: 80px">
@ -118,6 +128,18 @@
<input id="StockNo" type="text" class="text" style="width: 230px; height: 30px;" /><span style="color: red; font-size: 18px; vertical-align: middle;">*</span>
</td>
</tr>
<tr>
<td class="title" style="width: 110px;">
<p>
漆件信息：
</p>
</td>
<td colspan="2">
<select id="fl_id" class="easyui-combobox" style="width: 234px; height: 36px;"
data-options="valueField: 'valueField',textField: 'textField'">
</select><span style="color: red; font-size: 18px; vertical-align: middle;">*</span>
</td>
</tr>
</table>
</div>
<!-- 编辑窗口 - footer -->
@ -199,6 +221,16 @@
SaveInfo(isEdit);
});
//保存按钮
$('#Color').bind('change', function () {
var colour = $('#Color').val();
if (colour.length > 2) {
reloadfl_id();
}
});
//编辑窗口加载
$('#w').window({
modal: true,
@ -213,6 +245,7 @@
onBeforeClose: function () { clearw(); },
onBeforeOpen: function () {
$('#w').css('visibility', 'visible'); $('#ft').css('visibility', 'visible');
reloadfl_id();
}
});
@ -231,6 +264,7 @@
{ field: 'Color', title: '颜色', sortable: 'true', width: 10 },
{ field: 'Paint_No', title: '油漆零件号', sortable: 'true', width: 10 },
{ field: 'StockNo', title: '塑件存货代码', sortable: 'true', width: 10 }
/* { field: 'PaintName', title: '塑件存货代码', sortable: 'true', width: 10 }*/
]],
pagination: true,//表示在datagrid设置分页
@ -273,6 +307,9 @@
$('#cexcel').bind('click', function () {
$('#input01').click();
});
$('#wexcel').window({
modal: true,
closed: true,
@ -299,12 +336,14 @@
var Color = $('#Color').val();
var Paint_No = $('#Paint_No').val();
var StockNo = $('#StockNo').val();
var PaintID = $('#fl_id').combo('getValue');
var model = {
ID: ID,
Color: Color,
Paint_No: Paint_No,
StockNo: StockNo,
PaintID: PaintID,
method: 'SaveInfo'
};
SaveModel(model);
@ -365,6 +404,7 @@
$('#Color').val(row.Color);
$('#Paint_No').val(row.Paint_No);
$('#StockNo').val(row.StockNo);
$('#fl_id').combobox('select', row.PaintID);
$('#w').window('open');
}
@ -413,6 +453,7 @@
$('#Color').val('');
$('#Paint_No').val('');
$('#StockNo').val('');
$('#fl_id').combo('clear');
}
function post(url, PARAMS) {
@ -430,6 +471,11 @@
temp_form.submit();
}
function reloadfl_id() {
//var paintID = $('#fl_id').combo('getValue');
var Color = $('#Color').val();
$('#fl_id').combobox('reload', '/HttpHandlers/PaintInfoHandler.ashx?method=QueryList2&filter=' + Color +'');
}
</script>
</form>
</body>

26
MESWebSite/Manage/PaintColorInfo.aspx.designer.cs
View File

@ -2,16 +2,18 @@
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace MESWebSite.Manage {
public partial class PaintColorInfo {
namespace MESWebSite.Manage
{
public partial class PaintColorInfo
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace MESWebSite.Manage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// lblMessage 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace MESWebSite.Manage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblMessage;
/// <summary>
/// Label1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace MESWebSite.Manage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// ImportExcel 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace MESWebSite.Manage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Button ImportExcel;
/// <summary>
/// input01 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace MESWebSite.Manage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputFile input01;
/// <summary>
/// UserID 控件。
/// </summary>

3
MESWebSite/Manage/Product.aspx
View File

@ -322,7 +322,7 @@
<input id="PackCount" type="text" class="text" style="width: 230px; height: 30px;" />
</td>
</tr>
<tr>
<tr>
<td class="title" style="width: 110px;">
<p>
包装范围(例:24,36,48)：
@ -639,7 +639,6 @@
var CustomerNo = $('#CustomerNo').val();
var CarModelCode = $('#CarModelCode').val();
var ColorCodeB = $('#ColorCodeB').val();
//if (StockNo == "") {

Write Preview
Loading…
Cancel
Save