From 6d2e1f4873e059f291f864da090b885a7c583fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?liming=20=E8=94=A1?= Date: Mon, 20 Jul 2026 11:02:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=8E=A5=E5=8F=A3:=20?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=B1=9E=E6=80=A7=E5=90=8D=E4=B8=8Emes?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E5=AF=B9=E5=BA=94=EF=BC=8C=E4=B8=8D=E4=BD=BF?= =?UTF-8?q?=E7=94=A8PLC=E7=9B=B8=E5=AF=B9=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JY.Inspection/Common/UserHelper.cs | 4 +- JY.Inspection/Config/采集项参照表.xlsx | Bin 10278 -> 10417 bytes JY.Inspection/Frm/FrmHistoricalDataQuery.cs | 19 +++- JY.Inspection/Frm/LoginForm.cs | 25 ++++-- JY.Inspection/Frm/LoginForm.designer.cs | 64 +++++++------- JY.Inspection/HomeForm.cs | 54 ++++++------ JY.Inspection/JY.Inspection.csproj.user | 4 + JY.Inspection/Mes/MESDataCombin.cs | 91 ++++++++++++-------- JY.Model/DB.Entity/BlankingData.cs | 4 +- 9 files changed, 154 insertions(+), 111 deletions(-) diff --git a/JY.Inspection/Common/UserHelper.cs b/JY.Inspection/Common/UserHelper.cs index 71ffab9..1e3e360 100644 --- a/JY.Inspection/Common/UserHelper.cs +++ b/JY.Inspection/Common/UserHelper.cs @@ -299,7 +299,7 @@ namespace JY.Inspection.Common /// 使用MES员工信息接口校验登录信息 /// /// - public User CheckMesUserLogin(string userName, string passWord, ref string strErr) + public User CheckMesUserLogin(string userName, string passWord, string icCardNum, ref string strErr) { User user = null; @@ -310,7 +310,7 @@ namespace JY.Inspection.Common EquipNum = Global.systemConfig.equipCode, UserName = userName, PassWord = passWord, - UserCardID = string.Empty + UserCardID = icCardNum }; string strJson = JsonConvert.SerializeObject(req); diff --git a/JY.Inspection/Config/采集项参照表.xlsx b/JY.Inspection/Config/采集项参照表.xlsx index 3c0a6c0c151e70889bfa6af4814e1459c961f415..1ebc654149f6ebc3b52084eba33dd7db5d959dd3 100644 GIT binary patch delta 2745 zcmZ9OX*kpi8^&iW85v`jN*c=yvXepfF|uZ9Q8;5A%Rz)R*7HY}A%rQr$kwqGW^B#G zu`?o4_L(eMlVk~5@;c|dAKvTz`aI8l-@h;SbvGP?J~#z6dy4cEI_& zrmr2sIM?|-$>k+$yx5(2UOtb@Ej&$A=j=^EYddSDYc{I|dypmi#U*;G94ts6A~MLW zIIzrm{fp+C!*r2K}yQZP*KyH-jZ2T?RTg1%%hnzMS8<2X2jy= z-8jCvc@eMKxtSq-I;ufX2M}IM5fYv5gc+k(@;=VQ@;ao#2m{6#$&z&O;WtwiY*HqL z(dX*$F+{SV)lFs{}(<8HvjtWs}qbe65_j zj;E$aCYqbb%R#2cUD%z33A`#9?l`ggW>qm;t2OI)*}v@UbsX4pVdyR0AU1(mr|>`h zZJvFgF1W`g#vrB3RQl67UGoOiORE`M(~H!?4#SAk8@m1}D*_hFameti8qL|catf6-D5<86*hGuubi;lDJU(}a zMQ7}nFL}`E%#Zh)_3A#1-8SvqK`iKQW_7l@+Gv>3M!bU9nR4E+-o({qsFv~163sti z%CZIhG(An8ReZI@hz&OS^2&-DO;6fxhh?>|FV#%rw`x&p1>PPCu)`;nfbrrnE-Z*n z!TXNwywC!;Cq7%Zxnzi#!!0ijnr={o1vQ}K6d7&nOMzCg1r}*5NmPqA$Nv3fmzwVx zJ7$u#t;=|KM{Hcj zy6;{x-nDtAty$z-?tmxI=plC}btKM)C|i?@v4nGvA{Jw|+Mdlgo-FQOCtH90z)r1i+rAoy-NM&LYXEDLJu*Bc5W6Opc1UF&3WYhRRbUiKrIYYl`Dm(M}K3^hdPds61k1CnTMYKtTzzim569eFC@3)xNQ1QU@ZHPW^s*rxb(0>sKzfL_kdS7+oA^{hzX@h9Ig6NZ2m7*~y z{nTFN^AWU0U3pX&RKGi^L3 z3LBX@e<)^7bMMUJU0}IU)X$x-%%U3f@4h5{zkr|jpF zL92fUofms_nwbh$papU}o4WA1nlfeoOW`KLq-YP#NvnhBcMNApu4N1bR1Xy3$us8+z-1Hx7eW5OQ9lNgv3_9Ra zWnw38PMbY39hb=Bb&Fg6m~ONhqTVR8lQXZ>{zTX}Njl+Lw6wK5!9p&i&L#fddABuX znrqC-G-*Y#x}0_*ir_#2{hCnKHbu4Di~BgPOex2ZXKj8F%qu0EH_@`&cx00B54*Of z*Pp5O1qDBQ8<@4VX@U>RDb@mHD~bCOIdQrelum?t|{7odgZ%) zH@U@4dqHdbXmd?s#P9gmetZadBaF1M5jw-mrq+7FmNgKV`{8=Z?rMNP=%Naj&aqcu z&uGhSl9&DSd)mgV_(X=IQPZTrJ&(&vX5C|0P zqY&un9N>n#aX;X9Uynff;JZHg8Fwu|Sn>Bv=k8s|X=y(*{J=nuoIHavPU>aK>dJJZ z)^xwh-+h3IP<7}H?wRr&T^I(vuzOt)To~_~#yk$6xBf&+9SV zX5YOyc?AM9ZZ(OTNDvJ|o^I!`;(}#Vknbup@QEIX>#fEE>B49mhfFkyuCQ=xfIBwH z_OfhsbrAvmen^DhI?wPFPDxPIPByw(eBmgyr#%m-XuNJHElA6vB(Q2}UJx*n*LkTZ zqQv=Vq3aelw>zgG?}n288Gi(QEYU>gV`8aqk9hjXmE&WZ`|E~V;Tw+mc_XeA06hj< z4qd^Ul?NrftkzAim#0>8>}*D1CyMLy7ilUPdy?fLhi^h0YR4>AX5+AvW%Z{Elrr*g zLXCj`TzJ@u&pUiyP31^|E^H4quAMjEqu^(ViLINBcSw!z~Z1ef;})`-d5Wu#@h>&$yts^;wuap~n zNW3he$KnPDfrv1qATdSa98&_ESRs-A?<=W?=mFOfAxIQ>oT!VG6aN2hoYVsZ2A!xu w(mX^0Qjh79Ah8dr0iGbTNTQfP97HWiU8b}A#0W|3|2|Ull3J&pNc=7S51_jur2qf` delta 2610 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 it.IsEnable && it.PLCRelAddress != null) + // .OrderBy(it => it.PLCRelAddress).ToList(); + + //for (int k = 0; k < cfgList.Count; k++) + //{ + // var item = cfgList[k]; + + // var prop = data.GetType().GetProperty(item.HCPropName); + + // if (prop != null) + // { + // var code = prop.GetValue(data)?.ToString(); + // data.PLCValDic.Add((int)item.PLCRelAddress, code); + // } + //} + return data; } diff --git a/JY.Inspection/Frm/LoginForm.cs b/JY.Inspection/Frm/LoginForm.cs index b6feaca..d6f2bc6 100644 --- a/JY.Inspection/Frm/LoginForm.cs +++ b/JY.Inspection/Frm/LoginForm.cs @@ -19,8 +19,8 @@ namespace JY.Inspection.Frm pLogin_card.Location = new System.Drawing.Point(81, 282); chkIsSK.CheckedChanged += chkIsSK_CheckedChanged; - txtPassword2.KeyUp += txtPassWord_KeyUp; - txtPassword2.KeyDown += txtPassword2_KeyDown; + txtICCard.KeyUp += txtPassWord_KeyUp; + txtICCard.KeyDown += txtPassword2_KeyDown; btLogin.Click += btLogin_Click; } @@ -43,26 +43,26 @@ namespace JY.Inspection.Frm TimeSpan ts = _tempDt.Subtract(_dt); if (ts.Milliseconds > 100) { - txtPassword2.Text = "";//清空 + txtICCard.Text = "";//清空 } else { if (e.KeyCode == Keys.Enter) { - if (txtPassword2.Text == string.Empty) + if (txtICCard.Text == string.Empty) { - txtPassword2.Focus(); + txtICCard.Focus(); MessageBox.Show("IC卡号为空", "系统提示"); return; } UserHelper helper = new UserHelper(""); string strErr = ""; - var res = helper.CheckUserLogin("user.pt", "", txtPassword2.Text.Trim(), ref strErr); + var res = helper.CheckUserLogin("user.pt", "", txtICCard.Text.Trim(), ref strErr); if (res == null) { - txtPassword2.Text = ""; - txtPassword2.Focus(); + txtICCard.Text = ""; + txtICCard.Focus(); MessageBox.Show("IC卡号不正确" + strErr, "系统提示"); return; } @@ -87,7 +87,14 @@ namespace JY.Inspection.Frm if (check_isMesLogin.Checked) { - res = helper.CheckMesUserLogin(txtUserID.Text.Trim(), txtPassWord.Text.Trim(), ref strErr); + if (chkIsSK.Checked) + { + res = helper.CheckMesUserLogin(string.Empty, string.Empty, txtICCard.Text.Trim(), ref strErr); + } + else + { + res = helper.CheckMesUserLogin(txtUserID.Text.Trim(), txtPassWord.Text.Trim(), string.Empty, ref strErr); + } } else { diff --git a/JY.Inspection/Frm/LoginForm.designer.cs b/JY.Inspection/Frm/LoginForm.designer.cs index dfcc4a0..d1a18ba 100644 --- a/JY.Inspection/Frm/LoginForm.designer.cs +++ b/JY.Inspection/Frm/LoginForm.designer.cs @@ -41,7 +41,7 @@ namespace JY.Inspection.Frm this.pLogin_pwd = new System.Windows.Forms.Panel(); this.pLogin_card = new System.Windows.Forms.Panel(); this.lblICCard = new MetroFramework.Controls.MetroLabel(); - this.txtPassword2 = new MetroFramework.Controls.MetroTextBox(); + this.txtICCard = new MetroFramework.Controls.MetroTextBox(); this.check_isMesLogin = new MetroFramework.Controls.MetroCheckBox(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.pLogin_pwd.SuspendLayout(); @@ -197,7 +197,7 @@ namespace JY.Inspection.Frm // pLogin_card // this.pLogin_card.Controls.Add(this.lblICCard); - this.pLogin_card.Controls.Add(this.txtPassword2); + this.pLogin_card.Controls.Add(this.txtICCard); this.pLogin_card.Location = new System.Drawing.Point(81, 207); this.pLogin_card.Name = "pLogin_card"; this.pLogin_card.Size = new System.Drawing.Size(333, 50); @@ -213,39 +213,39 @@ namespace JY.Inspection.Frm this.lblICCard.TabIndex = 25; this.lblICCard.Text = "IC卡："; // - // txtPassword2 + // txtICCard // // // // - this.txtPassword2.CustomButton.Image = null; - this.txtPassword2.CustomButton.Location = new System.Drawing.Point(177, 1); - this.txtPassword2.CustomButton.Margin = new System.Windows.Forms.Padding(4); - this.txtPassword2.CustomButton.Name = ""; - this.txtPassword2.CustomButton.Size = new System.Drawing.Size(27, 27); - this.txtPassword2.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; - this.txtPassword2.CustomButton.TabIndex = 1; - this.txtPassword2.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; - this.txtPassword2.CustomButton.UseSelectable = true; - this.txtPassword2.CustomButton.Visible = false; - this.txtPassword2.Lines = new string[0]; - this.txtPassword2.Location = new System.Drawing.Point(105, 17); - this.txtPassword2.Margin = new System.Windows.Forms.Padding(4); - this.txtPassword2.MaxLength = 32767; - this.txtPassword2.Name = "txtPassword2"; - this.txtPassword2.PasswordChar = '*'; - this.txtPassword2.PromptText = "请刷卡"; - this.txtPassword2.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.txtPassword2.SelectedText = ""; - this.txtPassword2.SelectionLength = 0; - this.txtPassword2.SelectionStart = 0; - this.txtPassword2.ShortcutsEnabled = true; - this.txtPassword2.Size = new System.Drawing.Size(205, 29); - this.txtPassword2.TabIndex = 24; - this.txtPassword2.UseSelectable = true; - this.txtPassword2.WaterMark = "请刷卡"; - this.txtPassword2.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - this.txtPassword2.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); + this.txtICCard.CustomButton.Image = null; + this.txtICCard.CustomButton.Location = new System.Drawing.Point(177, 1); + this.txtICCard.CustomButton.Margin = new System.Windows.Forms.Padding(4); + this.txtICCard.CustomButton.Name = ""; + this.txtICCard.CustomButton.Size = new System.Drawing.Size(27, 27); + this.txtICCard.CustomButton.Style = MetroFramework.MetroColorStyle.Blue; + this.txtICCard.CustomButton.TabIndex = 1; + this.txtICCard.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light; + this.txtICCard.CustomButton.UseSelectable = true; + this.txtICCard.CustomButton.Visible = false; + this.txtICCard.Lines = new string[0]; + this.txtICCard.Location = new System.Drawing.Point(105, 17); + this.txtICCard.Margin = new System.Windows.Forms.Padding(4); + this.txtICCard.MaxLength = 32767; + this.txtICCard.Name = "txtICCard"; + this.txtICCard.PasswordChar = '*'; + this.txtICCard.PromptText = "请刷卡"; + this.txtICCard.ScrollBars = System.Windows.Forms.ScrollBars.None; + this.txtICCard.SelectedText = ""; + this.txtICCard.SelectionLength = 0; + this.txtICCard.SelectionStart = 0; + this.txtICCard.ShortcutsEnabled = true; + this.txtICCard.Size = new System.Drawing.Size(205, 29); + this.txtICCard.TabIndex = 24; + this.txtICCard.UseSelectable = true; + this.txtICCard.WaterMark = "请刷卡"; + this.txtICCard.WaterMarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + this.txtICCard.WaterMarkFont = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel); // // check_isMesLogin // @@ -304,7 +304,7 @@ namespace JY.Inspection.Frm private System.Windows.Forms.Panel pLogin_pwd; private System.Windows.Forms.Panel pLogin_card; private MetroFramework.Controls.MetroLabel lblICCard; - private MetroFramework.Controls.MetroTextBox txtPassword2; + private MetroFramework.Controls.MetroTextBox txtICCard; private MetroFramework.Controls.MetroCheckBox check_isMesLogin; } } \ No newline at end of file diff --git a/JY.Inspection/HomeForm.cs b/JY.Inspection/HomeForm.cs index 58eded6..b48b8e1 100644 --- a/JY.Inspection/HomeForm.cs +++ b/JY.Inspection/HomeForm.cs @@ -1942,7 +1942,7 @@ namespace JY.Inspection LineCode = Global.systemConfig.lineCode, EquipNum = Global.systemConfig.equipCode, MaterialCode = Global.systemConfig.materialCode, - UserName = "Test_HC", + UserName = Global.systemConfig.userName, Identification = m.BarCode, ProductType = Global.systemConfig.productType }; @@ -2130,22 +2130,22 @@ namespace JY.Inspection m.CCD15 = lstBarResult[14] == 1 ? "OK" : "NG"; m.CCD16 = lstBarResult[15] == 1 ? "OK" : "NG"; - var cfgList = Global.systemConfig.CollectItemCfgList - .Where(it => it.IsEnable && it.PLCRelAddress != null) - .OrderBy(it => it.PLCRelAddress).ToList(); + //var cfgList = Global.systemConfig.CollectItemCfgList + // .Where(it => it.IsEnable && it.PLCRelAddress != null) + // .OrderBy(it => it.PLCRelAddress).ToList(); - for (int k = 0; k < cfgList.Count; k++) - { - var item = cfgList[k]; + //for (int k = 0; k < cfgList.Count; k++) + //{ + // var item = cfgList[k]; - int index = (int)item.PLCRelAddress - 1; + // int index = (int)item.PLCRelAddress - 1; - if (index < listBar2Result.Count) - { - var code = listBar2Result[index] == 1 ? "OK" : "NG"; - m.PLCValDic.Add((int)item.PLCRelAddress, code); - } - } + // if (index < listBar2Result.Count) + // { + // var code = listBar2Result[index] == 1 ? "OK" : "NG"; + // m.PLCValDic.Add((int)item.PLCRelAddress, code); + // } + //} #endregion string levelresult = null; string strErr = ""; @@ -3625,22 +3625,22 @@ namespace JY.Inspection m.CCD14 = listBar2Result[13] == 1 ? "OK" : "NG"; } - var cfgList = Global.systemConfig.CollectItemCfgList - .Where(it => it.IsEnable && it.PLCRelAddress != null) - .OrderBy(it => it.PLCRelAddress).ToList(); + //var cfgList = Global.systemConfig.CollectItemCfgList + // .Where(it => it.IsEnable && it.PLCRelAddress != null) + // .OrderBy(it => it.PLCRelAddress).ToList(); - for (int k = 0; k < cfgList.Count; k++) - { - var item = cfgList[k]; + //for (int k = 0; k < cfgList.Count; k++) + //{ + // var item = cfgList[k]; - int index = (int)item.PLCRelAddress - 1; + // int index = (int)item.PLCRelAddress - 1; - if (index < listBar2Result.Count) - { - var code = listBar2Result[index] == 1 ? "OK" : "NG"; - m.PLCValDic.Add((int)item.PLCRelAddress, code); - } - } + // if (index < listBar2Result.Count) + // { + // var code = listBar2Result[index] == 1 ? "OK" : "NG"; + // m.PLCValDic.Add((int)item.PLCRelAddress, code); + // } + //} #endregion string strErr = ""; diff --git a/JY.Inspection/JY.Inspection.csproj.user b/JY.Inspection/JY.Inspection.csproj.user index 0b24643..db75c16 100644 --- a/JY.Inspection/JY.Inspection.csproj.user +++ b/JY.Inspection/JY.Inspection.csproj.user @@ -3,4 +3,8 @@ ProjectFiles + + Program + D:\JY.Inspection\JY.Inspection.exe + \ No newline at end of file diff --git a/JY.Inspection/Mes/MESDataCombin.cs b/JY.Inspection/Mes/MESDataCombin.cs index af91265..411f2e3 100644 --- a/JY.Inspection/Mes/MESDataCombin.cs +++ b/JY.Inspection/Mes/MESDataCombin.cs @@ -7,6 +7,7 @@ using JY.Model; using JY.Utility; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; +using NPOI.OpenXmlFormats.Spreadsheet; using System; using System.Collections.Generic; using System.Diagnostics; @@ -81,7 +82,7 @@ namespace JY.Inspection.Mes { siteCode = Global.systemConfig.siteCode, lineCode = Global.systemConfig.lineCode, - userName = "admin", + userName = Global.systemConfig.userName, equipCode = Global.systemConfig.equipCode, recordDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), qty = 1, @@ -160,7 +161,7 @@ namespace JY.Inspection.Mes Payload pl = new Payload(); pl.siteCode = Global.systemConfig.siteCode; pl.lineCode = Global.systemConfig.lineCode; - pl.userName = "admin"; + pl.userName = Global.systemConfig.userName; pl.materialCode = Global.systemConfig.materialCode; pl.carCode = ""; pl.collection = "JS"; @@ -179,44 +180,61 @@ namespace JY.Inspection.Mes TagDataVOListItem tag1; // 结果采集项 - - - tag1 = new TagDataVOListItem() { tagCode = "WGJA001", tagValue = m.ArrivalBarCode, tagTime = m.OutTime, tagCalculateResult = "Y", tagRemark = "入站条码" }; tdvls.Add(tag1); - tag1 = new TagDataVOListItem() { tagCode = "WGJA002", tagValue = m.DepartureBarCode, tagTime = m.OutTime, tagCalculateResult = "Y", tagRemark = "出站条码" }; tdvls.Add(tag1); - tag1 = new TagDataVOListItem() { tagCode = "WGJA003", tagValue = m.WorkShift, tagTime = m.OutTime, tagCalculateResult = "Y", tagRemark = "班次" }; tdvls.Add(tag1); - tag1 = new TagDataVOListItem() { tagCode = "WGJA004", tagValue = m.OutTime, tagTime = m.OutTime, tagCalculateResult = "Y", tagRemark = "出站时间" }; tdvls.Add(tag1); - - foreach (var item in m.PLCValDic) + var otherCfgList = Global.systemConfig.CollectItemCfgList + .Where(it => it.IsEnable && !string.IsNullOrEmpty(it.HCPropName)).ToList(); + foreach (var item in otherCfgList) { - // TODO 获取采集项配置 - var cfgItem = Global.systemConfig.CollectItemCfgList - .Where(it => it.IsEnable && it.PLCRelAddress == item.Key) - .FirstOrDefault(); - - if (cfgItem == null) + // 判断m中的属性名是否存在it.HCPropName + // 如果存在生成TagDataVoListItem + var prop = m.GetType().GetProperty(item.HCPropName); + if (prop != null) { - continue; + tdvls.Add(new TagDataVOListItem() { + tagCode = item.MesItemCode, + tagValue = prop.GetValue(m).ToString(), + tagTime = m.OutTime, + tagCalculateResult = "Y", + tagRemark = item.MesItemName + }); } - - // 生成TagDataVoListItem - tdvls.Add(new TagDataVOListItem() - { - tagCode = cfgItem.MesItemCode, - tagValue = item.Value, - tagTime = m.OutTime, - tagCalculateResult = "Y", - tagRemark = cfgItem.MesItemName - }); } - tdvls.Add(new TagDataVOListItem() - { - tagCode = "WGJA021", - tagValue = m.Result, - tagTime = m.OutTime, - tagCalculateResult = "Y", - tagRemark = "电池总结果" - }); + //tag1 = new TagDataVOListItem() { tagCode = "WGJA001", tagValue = m.ArrivalBarCode, tagTime = m.OutTime, tagCalculateResult = "Y", tagRemark = "入站条码" }; tdvls.Add(tag1); + //tag1 = new TagDataVOListItem() { tagCode = "WGJA002", tagValue = m.DepartureBarCode, tagTime = m.OutTime, tagCalculateResult = "Y", tagRemark = "出站条码" }; tdvls.Add(tag1); + //tag1 = new TagDataVOListItem() { tagCode = "WGJA003", tagValue = m.WorkShift, tagTime = m.OutTime, tagCalculateResult = "Y", tagRemark = "班次" }; tdvls.Add(tag1); + //tag1 = new TagDataVOListItem() { tagCode = "WGJA004", tagValue = m.OutTime, tagTime = m.OutTime, tagCalculateResult = "Y", tagRemark = "出站时间" }; tdvls.Add(tag1); + + //foreach (var item in m.PLCValDic) + //{ + // // TODO 获取采集项配置 + // var cfgItem = Global.systemConfig.CollectItemCfgList + // .Where(it => it.IsEnable && it.PLCRelAddress == item.Key) + // .FirstOrDefault(); + + // if (cfgItem == null) + // { + // continue; + // } + + // // 生成TagDataVoListItem + // tdvls.Add(new TagDataVOListItem() + // { + // tagCode = cfgItem.MesItemCode, + // tagValue = item.Value, + // tagTime = m.OutTime, + // tagCalculateResult = "Y", + // tagRemark = cfgItem.MesItemName + // }); + //} + + //tdvls.Add(new TagDataVOListItem() + //{ + // tagCode = "WGJA021", + // tagValue = m.Result, + // tagTime = m.OutTime, + // tagCalculateResult = "Y", + // tagRemark = "电池总结果" + //}); //多个 pl.tagDataVOList = tdvls; @@ -247,9 +265,6 @@ namespace JY.Inspection.Mes } #endregion - #region 登录 - #endregion - public RespArrivalStation PostProductArrivalStationData(ReqArrivalStation req) { if (req == null) diff --git a/JY.Model/DB.Entity/BlankingData.cs b/JY.Model/DB.Entity/BlankingData.cs index f4fb354..2401067 100644 --- a/JY.Model/DB.Entity/BlankingData.cs +++ b/JY.Model/DB.Entity/BlankingData.cs @@ -194,7 +194,7 @@ namespace JY.Model /// /// CCD列表(依据采集项参照表添加) /// - [SugarColumn(IsIgnore = true)] - public Dictionary PLCValDic { get; set; } = new Dictionary(); + //[SugarColumn(IsIgnore = true)] + //public Dictionary PLCValDic { get; set; } = new Dictionary(); } }