CPL
/
banboshi_V2
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 1 Wiki Activity
Browse Source

V2.0.7 通威新要求修改2

TongWei
CPL 1 year ago
parent
66bfdb61d5
commit
bb8e74668f
2 changed files with 79 additions and 1 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +77
    -0
      halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs
  2. +2
    -1
      halftoneproject-master/Service/OrderService.cs

+ 77
- 0
halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs View File

@@ -202,6 +202,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
dataGridView1.Columns.Clear();
//记录数据类型列数
Dictionary<string, int> dataCnt = new Dictionary<string, int>();
List<Product> products = new List<Product>();
DataTable dt = new DataTable(); //建立个数据表
//通用列
DataGridViewCheckBoxColumn chk = new DataGridViewCheckBoxColumn();
@@ -448,6 +449,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
//插入列
foreach (var item in dataCnt)
{
dt.Columns.Add(new DataColumn($"{item.Key}上下限", typeof(string)));
//按步骤名称插入列
for (int i = 0; i < item.Value; i++)
dt.Columns.Add(new DataColumn($"{item.Key}-{i + 1}", typeof(string)));
@@ -642,6 +644,27 @@ namespace MaiMuAOI.SysUI.DefectPicShow
foreach (var tdata in dataCnt)
{
tempd = item.SizeDefectInfoList.Where(q => q.StepName == tdata.Key).ToList();
var tempstep = item.StepInfo.ProcessList.Where(q => q.ProcessName == tdata.Key).FirstOrDefault();
if (tempstep != null)
{
JObject processParam = JObject.Parse(tempstep.ProcessParams);
double vMax = processParam.Value<double>("MaxLimit");
double vMin = processParam.Value<double>("MinLimit");
bool isOpenLimit = processParam.Value<bool>("OpenUseLimit");
string limit = "";
if (vMax == vMin)
limit = $"±{vMax}";
else
limit = $"(+{vMax},-{vMin})";
if (isOpenLimit)
{
dr[$"{tdata.Key}上下限"] = $"{processParam.Value<double>("StandardValues")}{limit}";
}
else
dr[$"{tdata.Key}上下限"] = $"";
}
List<double> dataList = new List<double>();
for (int i = 0; i < tempd.Count; i++)
{
@@ -1068,6 +1091,9 @@ namespace MaiMuAOI.SysUI.DefectPicShow
points = new List<Point>();
//记录数据类型列数
Dictionary<string, int> dataCnt = new Dictionary<string, int>();
List<Product> products = new List<Product>();
DataTable dt = new DataTable(); //建立个数据表
//通用列
dt.Columns.Add(new DataColumn("检验日期", typeof(string)));//在表中添加string类型的列
@@ -1300,6 +1326,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#else //固定写死
#region 张力
dt.Columns.Add(new DataColumn($"张力测量(N)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"张力测量(N)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"张力测量(N)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"张力测量(N)-3", typeof(string)));
@@ -1309,6 +1336,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 厚度
dt.Columns.Add(new DataColumn($"厚度测量(um)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"厚度测量(um)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"厚度测量(um)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"厚度测量(um)-3", typeof(string)));
@@ -1318,6 +1346,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region Y-PT检测(mm)
dt.Columns.Add(new DataColumn($"Y-PT检测(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"Y-PT检测(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"Y-PT检测(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"Y-PT检测(mm)-3", typeof(string)));
@@ -1327,6 +1356,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 主栅长1(mm)
dt.Columns.Add(new DataColumn($"主栅长1(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅长1(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅长1(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅长1(mm)-3", typeof(string)));
@@ -1336,6 +1366,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 主栅长2(mm)
dt.Columns.Add(new DataColumn($"主栅长2(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅长2(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅长2(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅长2(mm)-3", typeof(string)));
@@ -1345,6 +1376,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 主栅间距(mm)
dt.Columns.Add(new DataColumn($"主栅间距(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅间距(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅间距(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅间距(mm)-3", typeof(string)));
@@ -1354,6 +1386,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 主栅宽度(mm)
dt.Columns.Add(new DataColumn($"主栅宽度(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅宽度(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅宽度(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅宽度(mm)-3", typeof(string)));
@@ -1363,6 +1396,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 主栅宽(mm)
dt.Columns.Add(new DataColumn($"主栅宽(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅宽(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅宽(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅宽(mm)-3", typeof(string)));
@@ -1372,6 +1406,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 主栅宽(um)
dt.Columns.Add(new DataColumn($"主栅宽(um)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅宽(um)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅宽(um)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"主栅宽(um)-3", typeof(string)));
@@ -1379,6 +1414,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 细栅宽度
dt.Columns.Add(new DataColumn($"细栅宽度(um)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"细栅宽度(um)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"细栅宽度(um)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"细栅宽度(um)-3", typeof(string)));
@@ -1388,6 +1424,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 细栅间距
dt.Columns.Add(new DataColumn($"细栅间距(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"细栅间距(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"细栅间距(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"细栅间距(mm)-3", typeof(string)));
@@ -1397,6 +1434,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 焊点长1(mm)
dt.Columns.Add(new DataColumn($"焊点长1(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点长1(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点长1(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点长1(mm)-3", typeof(string)));
@@ -1406,6 +1444,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 焊点长2(mm)
dt.Columns.Add(new DataColumn($"焊点长2(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点长2(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点长2(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点长2(mm)-3", typeof(string)));
@@ -1415,6 +1454,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 焊点宽1(mm)
dt.Columns.Add(new DataColumn($"焊点宽1(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点宽1(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点宽1(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点宽1(mm)-3", typeof(string)));
@@ -1424,6 +1464,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 焊点宽2(mm)
dt.Columns.Add(new DataColumn($"焊点宽2(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点宽2(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点宽2(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点宽2(mm)-3", typeof(string)));
@@ -1433,6 +1474,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 焊点间隔1(mm)
dt.Columns.Add(new DataColumn($"焊点间隔1(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点间隔1(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点间隔1(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点间隔1(mm)-3", typeof(string)));
@@ -1442,6 +1484,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 焊点间隔2(mm)
dt.Columns.Add(new DataColumn($"焊点间隔2(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点间隔2(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点间隔2(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点间隔2(mm)-3", typeof(string)));
@@ -1451,6 +1494,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 焊点间隔3(mm)
dt.Columns.Add(new DataColumn($"焊点间隔3(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点间隔3(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点间隔3(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点间隔3(mm)-3", typeof(string)));
@@ -1460,6 +1504,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 焊点间隔4(mm)
dt.Columns.Add(new DataColumn($"焊点间隔4(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点间隔4(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点间隔4(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"焊点间隔4(mm)-3", typeof(string)));
@@ -1469,6 +1514,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 鱼叉口长(mm)
dt.Columns.Add(new DataColumn($"鱼叉口长(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"鱼叉口长(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"鱼叉口长(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"鱼叉口长(mm)-3", typeof(string)));
@@ -1478,6 +1524,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 鱼叉口宽(mm)
dt.Columns.Add(new DataColumn($"鱼叉口宽(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"鱼叉口宽(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"鱼叉口宽(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"鱼叉口宽(mm)-3", typeof(string)));
@@ -1487,6 +1534,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 鱼叉口间距(mm)
dt.Columns.Add(new DataColumn($"鱼叉口间距(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"鱼叉口间距(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"鱼叉口间距(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"鱼叉口间距(mm)-3", typeof(string)));
@@ -1496,6 +1544,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 蜈蚣脚长(mm)
dt.Columns.Add(new DataColumn($"蜈蚣脚长(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"蜈蚣脚长(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"蜈蚣脚长(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"蜈蚣脚长(mm)-3", typeof(string)));
@@ -1505,6 +1554,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 蜈蚣脚宽(mm)
dt.Columns.Add(new DataColumn($"蜈蚣脚宽(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"蜈蚣脚宽(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"蜈蚣脚宽(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"蜈蚣脚宽(mm)-3", typeof(string)));
@@ -1514,6 +1564,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 分片间隔(mm)
dt.Columns.Add(new DataColumn($"分片间隔(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"分片间隔(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"分片间隔(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"分片间隔(mm)-3", typeof(string)));
@@ -1523,16 +1574,19 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region Mark-X(mm)
dt.Columns.Add(new DataColumn($"Mark-X(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"Mark-X(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"Mark-X(mm)均值", typeof(string)));
#endregion
#region Mark-Y(mm)
dt.Columns.Add(new DataColumn($"Mark-Y(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"Mark-Y(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"Mark-Y(mm)均值", typeof(string)));
#endregion
#region 3道鱼叉口宽(mm)
dt.Columns.Add(new DataColumn($"3道鱼叉口宽(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"3道鱼叉口宽(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"3道鱼叉口宽(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"3道鱼叉口宽(mm)-3", typeof(string)));
@@ -1542,6 +1596,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 3道鱼叉口间隔(mm)
dt.Columns.Add(new DataColumn($"3道鱼叉口间隔(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"3道鱼叉口间隔(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"3道鱼叉口间隔(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"3道鱼叉口间隔(mm)-3", typeof(string)));
@@ -1551,6 +1606,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow
#endregion
#region 断点间距(mm)
dt.Columns.Add(new DataColumn($"断点间距(mm)上下限", typeof(string)));
dt.Columns.Add(new DataColumn($"断点间距(mm)-1", typeof(string)));
dt.Columns.Add(new DataColumn($"断点间距(mm)-2", typeof(string)));
dt.Columns.Add(new DataColumn($"断点间距(mm)-3", typeof(string)));
@@ -1602,6 +1658,27 @@ namespace MaiMuAOI.SysUI.DefectPicShow
try
{
tempd = item.SizeDefectInfoList.Where(q => q.StepName == tdata.Key).ToList();
var tempstep = item.StepInfo.ProcessList.Where(q => q.ProcessName == tdata.Key).FirstOrDefault();
if (tempstep != null)
{
JObject processParam = JObject.Parse(tempstep.ProcessParams);
double vMax = processParam.Value<double>("MaxLimit");
double vMin = processParam.Value<double>("MinLimit");
bool isOpenLimit = processParam.Value<bool>("OpenUseLimit");
string limit = "";
if (vMax == vMin)
limit = $"±{vMax}";
else
limit = $"(+{vMax},-{vMin})";
if (isOpenLimit)
{
dr[$"{tdata.Key}上下限"] = $"{processParam.Value<double>("StandardValues")}{limit}";
}
else
dr[$"{tdata.Key}上下限"] = $"";
}
List<double> dataList = new List<double>();
//for (int i = 0; i < tempd.Count; i++)
// dr[$"{tdata.Key}-{i + 1}"] = tempd[i].Data.ToString("0.0000");


+ 2
- 1
halftoneproject-master/Service/OrderService.cs View File

@@ -64,7 +64,8 @@ namespace Service
public List<Order> GetListEx(string fields, string domain, string orderby, int pageNum, int pageSize, ref int totalCount)
{
var sql = base.AsSugarClient().Queryable<Order>()
.Includes(m => m.StepInfo)
//.Includes(m => m.StepInfo)
.Includes(m => m.StepInfo, info => info.ProcessList.OrderBy(x => x.Order).ToList())
.Includes(m => m.ProductInfo).Includes(m => m.ProductInfo.AttachmentList)
.Includes(m => m.DefectInfoList)
.Includes(m => m.OrderHistoryList)


Write Preview
Loading…
Cancel
Save