Merge branch 'qy0227' of http://115.159.85.185:8098/r/MeiXinLaiRui/NiuJuKon...

yanjinhui

2025-03-31 543f0a71b763660a1b5d12ac2bc0e1259e1ea4cb

Merge branch 'qy0227' of http://115.159.85.185:8098/r/MeiXinLaiRui/NiuJuKongZhi into qy0227

 ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/SerialPortService/ProcessServer.cs

@@ -360,7 +360,7 @@
                {
                    var now = maxproce + 1;
                    proNow = process.Where(x => x.SetpNum == now).First();
                    var finish= process.Where(x => x.SetpNum > now); //表示剩下未执行的步骤。
                    var finish= process.Where(x => x.SetpNum > now);
                    return new WebResponseContent { Status = true, Data = new { proNow, maxproce, now, finish } };
                }

@@ -378,7 +378,7 @@
                    {
                        var now = nowNum + 1;
                        proNow = process.Where(x => x.SetpNum == now).First();
                        var finish = process.Where(x => x.SetpNum < now);//表示一完成的
                        var finish = process.Where(x => x.SetpNum < now);
                        return new WebResponseContent { Status = true, Message = "返回当前任务做到的大步骤", Data = new { proNow, maxproce, finish } };
                    }
                }
@@ -472,14 +472,13 @@
                // æŸ¥è¯¢å½“前步骤的 TorqueOp è®°å½•ï¼ŒåŒ¹é… ProcessSte和组，任务号，检查是否达到要求（实际数量）
                int practiceCount = _torqueOpRepository.QueryData(x => x.ProcessSte == setpDTO.setnum && x.GroupOp == setpDTO.group && x.TakeId == setpDTO.takeid).Count();
                //查到有该条数据了(更具分组和步骤找到该条数据)
                var nowdate = process.Where(x => x.SetpNum == setpDTO.setnum);
                var nowdate = process.Where(x => x.CraftType == setpDTO.group && x.SetpNum == setpDTO.setnum);

                //返回当前工艺的最大步骤
                var maxproce = process.Max(x => x.SetpNum);
                int num = setpDTO.setnum - 1;
                var nex = process.Where(x => x.SetpNum == num).FirstOrDefault();
                var nex = process.Where(x => x.CraftType == setpDTO.group && x.SetpNum == num).FirstOrDefault();
                var finish = process.Where(x => x.SetpNum < num).ToList();

                return new WebResponseContent { Status = true, Message = $"上一步{setpDTO.setnum}", Data = new { nex, maxproce, finish } };
            }
            catch (Exception ex)

 ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/WIDESEAWCS_Model/Models/SerialPort/Dt_ArticleInfom.cs

@@ -9,7 +9,7 @@

namespace WIDESEAWCS_Model.Models
{
    [SugarTable("Dt_ArticleInfom", "套筒信息表"), MultiTenant]
    [SugarTable("Dt_ArticleInfom", "信息表"), MultiTenant]
    public class Dt_ArticleInfom:BaseEntity
    {
        [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "主键")]

 ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/WIDESEAWCS_Server/appsettings.json

@@ -30,6 +30,6 @@
  "QuartzJobAutoStart": true,
  "PrintSql": false,
  "WebSocketEnable": true,
  "WebSocketPort": 0,
  "WebSocketPort": 5000,
  "LogDeubgEnable": true
}