From 66bfdb61d59616ceb125b3dcb396e22243088e27 Mon Sep 17 00:00:00 2001
From: CPL <1179393954@qq.com>
Date: Mon, 29 Jul 2024 09:31:38 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"V2.0.7=20=E9=80=9A=E5=A8=81=E6=96=B0?=
=?UTF-8?q?=E8=A6=81=E6=B1=82=E4=BF=AE=E6=94=B9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit bd2d6c78c0762e08efe7287e7eed8d873518f180.
---
.../BanBoShi/BanBoShi.csproj | 4 +--
.../SysUI/DefectPicShow/DataQueryFrm.cs | 27 +------------------
.../Service/OrderService.cs | 3 +--
3 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/halftoneproject-master/BanBoShi/BanBoShi.csproj b/halftoneproject-master/BanBoShi/BanBoShi.csproj
index 8aa0f141..a8a9a4ca 100644
--- a/halftoneproject-master/BanBoShi/BanBoShi.csproj
+++ b/halftoneproject-master/BanBoShi/BanBoShi.csproj
@@ -102,9 +102,9 @@
Dlls\HZH_Controls.dll
-
+
False
- ..\..\..\..\..\..\模块化\MMImageBox\ImageBox\bin\x64\Debug\ImageBox.dll
+ ..\..\..\..\..\..\模块化\MMImageBox\ImageBox\bin\Debug\ImageBox.dll
..\packages\K4os.Compression.LZ4.1.3.5\lib\net462\K4os.Compression.LZ4.dll
diff --git a/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs b/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs
index bad75490..cddfa140 100644
--- a/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs
+++ b/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs
@@ -202,7 +202,6 @@ namespace MaiMuAOI.SysUI.DefectPicShow
dataGridView1.Columns.Clear();
//记录数据类型列数
Dictionary dataCnt = new Dictionary();
- List products = new List();
DataTable dt = new DataTable(); //建立个数据表
//通用列
DataGridViewCheckBoxColumn chk = new DataGridViewCheckBoxColumn();
@@ -225,9 +224,8 @@ namespace MaiMuAOI.SysUI.DefectPicShow
foreach(var item in list)
{
- products.Add(item.ProductInfo);
//老流程
- if (item.StepInfo == null ||item.StepInfo.ProcessType != "快速流程")
+ if(item.StepInfo == null ||item.StepInfo.ProcessType != "快速流程")
{
//加入数据表
if(item.SizeDefectInfoList == null)
@@ -450,7 +448,6 @@ 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)));
@@ -645,28 +642,6 @@ 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("MaxLimit");
- double vMin = processParam.Value("MinLimit");
- bool isOpenLimit = processParam.Value("OpenUseLimit");
- string limit = "";
- if (vMax == vMin)
- limit = $"±{vMax}";
- else
- limit = $"(+{vMax},-{vMin})";
- if (isOpenLimit)
- {
- dr[$"{tdata.Key}上下限"] = $"{processParam.Value("StandardValues")}{limit}";
- }
- else
- dr[$"{tdata.Key}上下限"] = $"";
- }
-
List dataList = new List();
for (int i = 0; i < tempd.Count; i++)
{
diff --git a/halftoneproject-master/Service/OrderService.cs b/halftoneproject-master/Service/OrderService.cs
index 1e4b2b53..1a95a5a7 100644
--- a/halftoneproject-master/Service/OrderService.cs
+++ b/halftoneproject-master/Service/OrderService.cs
@@ -64,8 +64,7 @@ namespace Service
public List GetListEx(string fields, string domain, string orderby, int pageNum, int pageSize, ref int totalCount)
{
var sql = base.AsSugarClient().Queryable()
- //.Includes(m => m.StepInfo)
- .Includes(m => m.StepInfo, info => info.ProcessList.OrderBy(x => x.Order).ToList())
+ .Includes(m => m.StepInfo)
.Includes(m => m.ProductInfo).Includes(m => m.ProductInfo.AttachmentList)
.Includes(m => m.DefectInfoList)
.Includes(m => m.OrderHistoryList)