SoftwareGroup/1440WGJ
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

采集项更改

Browse Source
This commit is contained in:
liming 蔡
2026-08-14 13:38:34 +08:00
parent 8e9656a2b5
commit c89efa6461
10 changed files with 218 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JY.DAL/OpSqlDataBase.cs
+2 -2
View File
@@ -393,12 +393,12 @@ namespace JY.DAL
foreach (var propName in ConstValue.CCD_FDict.Keys) foreach (var propName in ConstValue.CCD_FDict.Keys)
{ {
sb.Append($",[{propName}] '{ConstValue.CCD_SDict[propName]}'"); sb.Append($",[{propName}] '{ConstValue.CCD_FDict[propName]}'");
} }
foreach (var propName in ConstValue.CCD_IDict.Keys) foreach (var propName in ConstValue.CCD_IDict.Keys)
{ {
sb.Append($",[{propName}] '{ConstValue.CCD_SDict[propName]}'"); sb.Append($",[{propName}] '{ConstValue.CCD_IDict[propName]}'");
} }
string formatSql = sb.ToString(); string formatSql = sb.ToString();
JY.DAL/Service/FeedingDataService.cs
+4 -1
View File
@@ -1,5 +1,7 @@
using JY.DAL.Repository; using JY.DAL.Repository;
using JY.Model; using JY.Model;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace JY.DAL.Service namespace JY.DAL.Service
@@ -19,7 +21,8 @@ namespace JY.DAL.Service
public List<FeedingData> GetFeedingData(string barCode) public List<FeedingData> GetFeedingData(string barCode)
{ {
return _repository.GetList(x => x.BarCode == barCode); return _repository.Db.Queryable<FeedingData>().Where(x => x.BarCode == barCode)
.OrderByDescending(x => x.CreateTime).ToList();
} }
public int AddFeedingData(FeedingData data) public int AddFeedingData(FeedingData data)
JY.Inspection/Config/采集项参照表.xlsx
BIN
View File
Binary file not shown.
JY.Inspection/HomeForm.cs
+26
View File
@@ -361,6 +361,30 @@ namespace JY.Inspection
colDefList.Add(col); colDefList.Add(col);
} }
foreach (var propName in ConstValue.CCD_FDict.Keys)
{
DataGridViewColumn col = new DataGridViewTextBoxColumn();
col.DataPropertyName = propName;
col.HeaderText = ConstValue.CCD_FDict[propName];
col.MinimumWidth = 6;
col.Name = $"Col_ccd_{propName}";
col.ReadOnly = true;
colDefList.Add(col);
}
foreach (var propName in ConstValue.CCD_IDict.Keys)
{
DataGridViewColumn col = new DataGridViewTextBoxColumn();
col.DataPropertyName = propName;
col.HeaderText = ConstValue.CCD_IDict[propName];
col.MinimumWidth = 6;
col.Name = $"Col_ccd_{propName}";
col.ReadOnly = true;
colDefList.Add(col);
}
#endregion #endregion
DataGridViewTextBoxColumn Column22 = new System.Windows.Forms.DataGridViewTextBoxColumn(); DataGridViewTextBoxColumn Column22 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -2377,6 +2401,8 @@ namespace JY.Inspection
if (listEntity.Count() > 0) if (listEntity.Count() > 0)
{ {
m.TDGroup = listEntity.First().TDGroup; m.TDGroup = listEntity.First().TDGroup;
m.InTime = listEntity.First().CreateTime;
m.IsRepeat = listEntity.Count > 1;
} }
// 处理空条码 // 处理空条码
JY.Inspection/HomeForm.designer.cs
Generated
+135 -135
View File
File diff suppressed because it is too large Load Diff
JY.Inspection/HomeForm.resx
+1 -76
View File
@@ -331,7 +331,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAE ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAE
CgAAAk1TRnQBSQFMAgEBAwEAAaABCAGgAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo CgAAAk1TRnQBSQFMAgEBAwEAAbABCAGwAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -382,81 +382,6 @@
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>137, 17</value> <value>137, 17</value>
</metadata> </metadata>
<metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column31.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column26.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column27.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column25.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column13.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column15.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column17.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column18.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column19.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column20.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column21.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column23.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column28.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column29.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column22.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column24.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
JY.Inspection/Mes/MESDataCombin.cs
+32 -34
View File
@@ -204,43 +204,41 @@ namespace JY.Inspection.Mes
} }
} }
//tag1 = new TagDataVOListItem() { tagCode = "WGJA001", tagValue = m.ArrivalBarCode, tagTime = m.OutTime, tagCalculateResult = "Y", tagRemark = "入站条码" }; tdvls.Add(tag1); #region 手动赋值
//tag1 = new TagDataVOListItem() { tagCode = "WGJA002", tagValue = m.DepartureBarCode, tagTime = m.OutTime, tagCalculateResult = "Y", tagRemark = "出站条码" }; tdvls.Add(tag1); tdvls.Add(new TagDataVOListItem()
//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); tagCode = "VIM_OPERATION_PROCESS",
tagValue = "外观检",
tagTime = m.OutTime,
tagCalculateResult = "Y",
tagRemark = "工艺流程"
});
//foreach (var item in m.PLCValDic) tdvls.Add(new TagDataVOListItem() {
//{ tagCode = "VIM_MODEL",
// // TODO 获取采集项配置 tagValue = Global.systemConfig.productType,
// var cfgItem = Global.systemConfig.CollectItemCfgList tagTime = m.OutTime,
// .Where(it => it.IsEnable && it.PLCRelAddress == item.Key) tagCalculateResult = "Y",
// .FirstOrDefault(); tagRemark = "型号"
});
// if (cfgItem == null) tdvls.Add(new TagDataVOListItem() {
// { tagCode = "VIM_RETEST_MARK",
// continue; tagValue = m.IsRepeat ? "1" : "0",
// } tagTime = m.OutTime,
tagCalculateResult = "Y",
tagRemark = "复测标记"
});
// // 生成TagDataVoListItem tdvls.Add(new TagDataVOListItem()
// tdvls.Add(new TagDataVOListItem() {
// { tagCode = "VIM_RETEST_TIME",
// tagCode = cfgItem.MesItemCode, tagValue = m.OutTime,
// tagValue = item.Value, tagTime = m.OutTime,
// tagTime = m.OutTime, tagCalculateResult = "Y",
// tagCalculateResult = "Y", tagRemark = "复测时间"
// tagRemark = cfgItem.MesItemName });
// }); #endregion
//}
//tdvls.Add(new TagDataVOListItem()
//{
// tagCode = "WGJA021",
// tagValue = m.Result,
// tagTime = m.OutTime,
// tagCalculateResult = "Y",
// tagRemark = "电池总结果"
//});
//多个
pl.tagDataVOList = tdvls; pl.tagDataVOList = tdvls;
prp.payload = JsonHelper.Serialize(pl); prp.payload = JsonHelper.Serialize(pl);
JY.Model/DB.Entity/BlankingData.cs
+12
View File
@@ -52,6 +52,12 @@ namespace JY.Model
[Name("条码对比")] [Name("条码对比")]
public string TMDB { get; set; } public string TMDB { get; set; }
/// <summary>
/// 进站时间
/// </summary>
[SugarColumn(ColumnName = "InTime")]
public string InTime { set; get; }
/// <summary> /// <summary>
/// 出站时间 /// 出站时间
/// </summary> /// </summary>
@@ -59,6 +65,12 @@ namespace JY.Model
[Name("出站时间")] [Name("出站时间")]
public string OutTime { set; get; } public string OutTime { set; get; }
/// <summary>
/// 是否复投
/// </summary>
[SugarColumn(ColumnName = "IsRepeat")]
public bool IsRepeat { get; set; }
/// <summary> /// <summary>
/// 正面(2W/3W) /// 正面(2W/3W)
/// </summary> /// </summary>
JY.Model/Excel/CollectItemCfg.cs
+2 -2
View File
@@ -9,8 +9,8 @@ namespace JY.Model.Excel
{ {
public class CollectItemCfg public class CollectItemCfg
{ {
[Description("PLC相对地址")] //[Description("PLC相对地址")]
public int? PLCRelAddress { get; set; } //public int? PLCRelAddress { get; set; }
[Description("PLC采集数据含义")] [Description("PLC采集数据含义")]
public string PLCItemName { get; set; } public string PLCItemName { get; set; }
数据库/20260814.sql
+4
View File
@@ -7,3 +7,7 @@ ALTER TABLE S1270.dbo.BlankingData ADD CCDI3 int NULL;
ALTER TABLE S1270.dbo.BlankingData ADD CCDI4 int NULL; ALTER TABLE S1270.dbo.BlankingData ADD CCDI4 int NULL;
ALTER TABLE S1270.dbo.BlankingData ADD CCDI5 int NULL; ALTER TABLE S1270.dbo.BlankingData ADD CCDI5 int NULL;
ALTER TABLE S1270.dbo.BlankingData ADD CCDI6 int NULL; ALTER TABLE S1270.dbo.BlankingData ADD CCDI6 int NULL;
ALTER TABLE S1270.dbo.BlankingData ADD InTime datetime NULL;
ALTER TABLE S1270.dbo.BlankingData ADD IsRepeat int NULL;