Revert "V2.0.7 通威新要求修改"

This reverts commit bd2d6c78c0.

halftoneproject-master/BanBoShi/BanBoShi.csproj

@@ -102,9 +102,9 @@
     <Reference Include="HZH_Controls">
       <HintPath>Dlls\HZH_Controls.dll</HintPath>
     </Reference>
-    <Reference Include="ImageBox, Version=2.2.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ImageBox, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\模块化\MMImageBox\ImageBox\bin\x64\Debug\ImageBox.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\模块化\MMImageBox\ImageBox\bin\Debug\ImageBox.dll</HintPath>
     </Reference>
     <Reference Include="K4os.Compression.LZ4, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
       <HintPath>..\packages\K4os.Compression.LZ4.1.3.5\lib\net462\K4os.Compression.LZ4.dll</HintPath>

halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DataQueryFrm.cs

@@ -202,7 +202,6 @@ 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();
@@ -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<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++)
                     {

halftoneproject-master/Service/OrderService.cs

@@ -64,8 +64,7 @@ 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, 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)