wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

执行代码清理，修复warning

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:59:12 +08:00
parent c6b8dfc861
commit 1dbb17f103
118 changed files with 5046 additions and 4111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

288
QcMgr/Tnb.QcMgr/QcSpcService.cs
View File

@@ -31,17 +31,19 @@ namespace Tnb.QcMgr
[HttpPost]
public async Task<dynamic> GetSpcItems(string id)
{
var datas = await _repository.AsSugarClient().Queryable<QcSpcD>().Where(p => p.mainid == id).ToListAsync();
List<SpcDataInput> SpcDataInputs = new List<SpcDataInput>();
List<QcSpcD> datas = await _repository.AsSugarClient().Queryable<QcSpcD>().Where(p => p.mainid == id).ToListAsync();
List<SpcDataInput> SpcDataInputs = new();
datas.ForEach(p =>
{
SpcDataInput SpcDataInput = new SpcDataInput();
SpcDataInput.mainid = p.mainid;
SpcDataInput.checktime = p.checktime;
SpcDataInput.batch = p.batch;
SpcDataInput.data = Array.ConvertAll(p.data!.Split(","), float.Parse);
SpcDataInput.checknum = p.checknum;
SpcDataInput.defectivenum = p.defectivenum;
SpcDataInput SpcDataInput = new()
{
mainid = p.mainid,
checktime = p.checktime,
batch = p.batch,
data = Array.ConvertAll(p.data!.Split(","), float.Parse),
checknum = p.checknum,
defectivenum = p.defectivenum
};
SpcDataInputs.Add(SpcDataInput);
});
return SpcDataInputs;
@@ -54,29 +56,34 @@ namespace Tnb.QcMgr
[HttpPost]
public async Task SaveData(List<SpcDataInput> SpcDataInput)
{
var db = _repository.AsSugarClient();
ISqlSugarClient db = _repository.AsSugarClient();
try
{
if (!string.IsNullOrEmpty(SpcDataInput.First().mainid))
await db.Deleteable<QcSpcD>(p => p.mainid == SpcDataInput.First().mainid).ExecuteCommandAsync();
List<QcSpcD> QcSpcDs = new List<QcSpcD>();
{
_ = await db.Deleteable<QcSpcD>(p => p.mainid == SpcDataInput.First().mainid).ExecuteCommandAsync();
}
List<QcSpcD> QcSpcDs = new();
SpcDataInput.ForEach(p =>
{
QcSpcD QcSpcD = new QcSpcD();
QcSpcD.mainid = p.mainid;
QcSpcD.checktime = p.checktime;
QcSpcD.batch = p.batch;
QcSpcD.data = string.Join(",", p.data);
QcSpcD.checknum = p.checknum;
QcSpcD.defectivenum = p.defectivenum;
QcSpcD.create_id = _userManager.UserId;
QcSpcD.create_time = DateTime.Now;
QcSpcD QcSpcD = new()
{
mainid = p.mainid,
checktime = p.checktime,
batch = p.batch,
data = string.Join(",", p.data),
checknum = p.checknum,
defectivenum = p.defectivenum,
create_id = _userManager.UserId,
create_time = DateTime.Now
};
QcSpcDs.Add(QcSpcD);
});
await db.Ado.BeginTranAsync();
await db.Insertable(QcSpcDs).ExecuteCommandAsync();
_ = await db.Insertable(QcSpcDs).ExecuteCommandAsync();
await db.Ado.CommitTranAsync();
}
catch (Exception)
@@ -91,41 +98,47 @@ namespace Tnb.QcMgr
/// <param name="id"></param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> GetSpcData(string id)
public async Task<dynamic?> GetSpcData(string id)
{
var QcSpcH = await _repository.AsSugarClient().Queryable<QcSpcH>().Where(p => p.id == id).FirstAsync();
var QcSpcDs = await _repository.AsSugarClient().Queryable<QcSpcD>().Where(p => p.mainid == id).ToListAsync();
var cinfigs = await _repository.AsSugarClient().Queryable<QcSpcConfig>().ToListAsync();
QcSpcH QcSpcH = await _repository.AsSugarClient().Queryable<QcSpcH>().Where(p => p.id == id).FirstAsync();
List<QcSpcD> QcSpcDs = await _repository.AsSugarClient().Queryable<QcSpcD>().Where(p => p.mainid == id).ToListAsync();
List<QcSpcConfig> cinfigs = await _repository.AsSugarClient().Queryable<QcSpcConfig>().ToListAsync();
if (QcSpcH.graphtype == "X-R控制图")
{
XRchart XRchart = new XRchart();
XRchart.xcharts = new List<XRxchart>();
XRchart.rcharts = new List<XRrchart>();
foreach (var QcSpcD in QcSpcDs)
XRchart XRchart = new()
{
xcharts = new List<XRxchart>(),
rcharts = new List<XRrchart>()
};
foreach (QcSpcD QcSpcD in QcSpcDs)
{
List<float> datas = Array.ConvertAll(QcSpcD.data!.Split(",", StringSplitOptions.RemoveEmptyEntries), float.Parse).ToList();
XRxchart xchart = new XRxchart();
xchart.x = datas.Average();
xchart.jc = datas.Max() - datas.Min();
xchart.usl = QcSpcH.uplimit;
xchart.cl = QcSpcH.target;
xchart.lsl = QcSpcH.lowerlimit;
XRrchart rchart = new XRrchart();
rchart.r = datas.Max() - datas.Min();
XRxchart xchart = new()
{
x = datas.Average(),
jc = datas.Max() - datas.Min(),
usl = QcSpcH.uplimit,
cl = QcSpcH.target,
lsl = QcSpcH.lowerlimit
};
XRrchart rchart = new()
{
r = datas.Max() - datas.Min()
};
XRchart.xcharts.Add(xchart);
XRchart.rcharts.Add(rchart);
}
var xAverage = XRchart.xcharts.Select(p => p.x).Average();
var num = XRchart.xcharts.Select(p => p.jc).Average() * cinfigs.Where(p => p.spctype == "X-R图" && p.spckey == "A2" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? xAverage = XRchart.xcharts.Select(p => p.x).Average();
float? num = XRchart.xcharts.Select(p => p.jc).Average() * cinfigs.Where(p => p.spctype == "X-R图" && p.spckey == "A2" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
XRchart.xcharts.ForEach(p =>
{
p.uclx = xAverage + num;
p.clx = xAverage;
p.lclx = xAverage - num;
});
var D4 = cinfigs.Where(p => p.spctype == "X-R图" && p.spckey == "D4" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
var D3 = cinfigs.Where(p => p.spctype == "X-R图" && p.spckey == "D3" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
var rAverage = XRchart.rcharts.Select(p => p.r).Average();
float? D4 = cinfigs.Where(p => p.spctype == "X-R图" && p.spckey == "D4" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? D3 = cinfigs.Where(p => p.spctype == "X-R图" && p.spckey == "D3" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? rAverage = XRchart.rcharts.Select(p => p.r).Average();
XRchart.rcharts.ForEach(p =>
{
p.uclr = rAverage * D4;
@@ -136,34 +149,40 @@ namespace Tnb.QcMgr
}
if (QcSpcH.graphtype == "X-S控制图")
{
XSchart XSchart = new XSchart();
XSchart.xcharts = new List<XSxchart>();
XSchart.scharts = new List<XSschart>();
foreach (var QcSpcD in QcSpcDs)
XSchart XSchart = new()
{
xcharts = new List<XSxchart>(),
scharts = new List<XSschart>()
};
foreach (QcSpcD QcSpcD in QcSpcDs)
{
List<float> datas = Array.ConvertAll(QcSpcD.data!.Split(",", StringSplitOptions.RemoveEmptyEntries), float.Parse).ToList();
XSxchart xchart = new XSxchart();
xchart.x = datas.Average();
xchart.bzc = CalculateStdDev(datas);
xchart.usl = QcSpcH.uplimit;
xchart.cl = QcSpcH.target;
xchart.lsl = QcSpcH.lowerlimit;
XSschart schart = new XSschart();
schart.s = CalculateStdDev(datas);
XSxchart xchart = new()
{
x = datas.Average(),
bzc = CalculateStdDev(datas),
usl = QcSpcH.uplimit,
cl = QcSpcH.target,
lsl = QcSpcH.lowerlimit
};
XSschart schart = new()
{
s = CalculateStdDev(datas)
};
XSchart.xcharts.Add(xchart);
XSchart.scharts.Add(schart);
}
var xAverage = XSchart.xcharts.Select(p => p.x).Average();
var num = XSchart.xcharts.Select(p => p.bzc).Average() * cinfigs.Where(p => p.spctype == "X-S图" && p.spckey == "A3" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? xAverage = XSchart.xcharts.Select(p => p.x).Average();
float? num = XSchart.xcharts.Select(p => p.bzc).Average() * cinfigs.Where(p => p.spctype == "X-S图" && p.spckey == "A3" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
XSchart.xcharts.ForEach(p =>
{
p.uclx = xAverage + num;
p.clx = xAverage;
p.lclx = xAverage - num;
});
var B4 = cinfigs.Where(p => p.spctype == "X-S图" && p.spckey == "B4" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
var B3 = cinfigs.Where(p => p.spctype == "X-S图" && p.spckey == "B3" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
var sAverage = XSchart.scharts.Select(p => p.s).Average();
float? B4 = cinfigs.Where(p => p.spctype == "X-S图" && p.spckey == "B4" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? B3 = cinfigs.Where(p => p.spctype == "X-S图" && p.spckey == "B3" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? sAverage = XSchart.scharts.Select(p => p.s).Average();
XSchart.scharts.ForEach(p =>
{
p.ucls = sAverage * B4;
@@ -174,34 +193,40 @@ namespace Tnb.QcMgr
}
if (QcSpcH.graphtype == "X中位数-R图")
{
XRchart XRchart = new XRchart();
XRchart.xcharts = new List<XRxchart>();
XRchart.rcharts = new List<XRrchart>();
foreach (var QcSpcD in QcSpcDs)
XRchart XRchart = new()
{
xcharts = new List<XRxchart>(),
rcharts = new List<XRrchart>()
};
foreach (QcSpcD QcSpcD in QcSpcDs)
{
List<float> datas = Array.ConvertAll(QcSpcD.data!.Split(",", StringSplitOptions.RemoveEmptyEntries), float.Parse).ToList();
XRxchart xchart = new XRxchart();
xchart.x = CalculateMedian(datas);
xchart.jc = datas.Max() - datas.Min();
xchart.usl = QcSpcH.uplimit;
xchart.cl = QcSpcH.target;
xchart.lsl = QcSpcH.lowerlimit;
XRrchart rchart = new XRrchart();
rchart.r = datas.Max() - datas.Min();
XRxchart xchart = new()
{
x = CalculateMedian(datas),
jc = datas.Max() - datas.Min(),
usl = QcSpcH.uplimit,
cl = QcSpcH.target,
lsl = QcSpcH.lowerlimit
};
XRrchart rchart = new()
{
r = datas.Max() - datas.Min()
};
XRchart.xcharts.Add(xchart);
XRchart.rcharts.Add(rchart);
}
var xAverage = XRchart.xcharts.Select(p => p.x).Average();
var num = XRchart.xcharts.Select(p => p.jc).Average() * cinfigs.Where(p => p.spctype == "中位数图" && p.spckey == "A2" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? xAverage = XRchart.xcharts.Select(p => p.x).Average();
float? num = XRchart.xcharts.Select(p => p.jc).Average() * cinfigs.Where(p => p.spctype == "中位数图" && p.spckey == "A2" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
XRchart.xcharts.ForEach(p =>
{
p.uclx = xAverage + num;
p.clx = xAverage;
p.lclx = xAverage - num;
});
var D4 = cinfigs.Where(p => p.spctype == "中位数图" && p.spckey == "D4" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
var D3 = cinfigs.Where(p => p.spctype == "中位数图" && p.spckey == "D3" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
var rAverage = XRchart.rcharts.Select(p => p.r).Average();
float? D4 = cinfigs.Where(p => p.spctype == "中位数图" && p.spckey == "D4" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? D3 = cinfigs.Where(p => p.spctype == "中位数图" && p.spckey == "D3" && p.subcapacity == QcSpcH.samplesize).Select(p => p.spcdata).First();
float? rAverage = XRchart.rcharts.Select(p => p.r).Average();
XRchart.rcharts.ForEach(p =>
{
p.uclr = rAverage * D4;
@@ -212,27 +237,33 @@ namespace Tnb.QcMgr
}
if (QcSpcH.graphtype == "X-MR控制图")
{
XMRchart XMRchart = new XMRchart();
XMRchart.xmrxcharts = new List<XMRxchart>();
XMRchart.xmrmrcharts = new List<XMRmrschart>();
foreach (var QcSpcD in QcSpcDs)
XMRchart XMRchart = new()
{
xmrxcharts = new List<XMRxchart>(),
xmrmrcharts = new List<XMRmrschart>()
};
foreach (QcSpcD QcSpcD in QcSpcDs)
{
List<float> datas = Array.ConvertAll(QcSpcD.data!.Split(",", StringSplitOptions.RemoveEmptyEntries), float.Parse).ToList();
XMRxchart xchart = new XMRxchart();
xchart.x = datas.Average();
xchart.usl = QcSpcH.uplimit;
xchart.cl = QcSpcH.target;
xchart.lsl = QcSpcH.lowerlimit;
XMRxchart xchart = new()
{
x = datas.Average(),
usl = QcSpcH.uplimit,
cl = QcSpcH.target,
lsl = QcSpcH.lowerlimit
};
if (XMRchart.xmrxcharts.Count > 0)
{
XMRmrschart rchart = new XMRmrschart();
rchart.mr = Math.Abs((float)(xchart.x - XMRchart.xmrxcharts.Last().x)!);
XMRmrschart rchart = new()
{
mr = Math.Abs((float)(xchart.x - XMRchart.xmrxcharts.Last().x)!)
};
XMRchart.xmrmrcharts.Add(rchart);
}
XMRchart.xmrxcharts.Add(xchart);
}
var xAverage = XMRchart.xmrxcharts.Select(p => p.x).Average();
var mrAverage = XMRchart.xmrmrcharts.Select(p => p.mr).Average();
float? xAverage = XMRchart.xmrxcharts.Select(p => p.x).Average();
float? mrAverage = XMRchart.xmrmrcharts.Select(p => p.mr).Average();
XMRchart.xmrxcharts.ForEach(p =>
{
p.uclx = xAverage + (float)(2.66 * mrAverage)!;
@@ -249,17 +280,19 @@ namespace Tnb.QcMgr
}
if (QcSpcH.graphtype == "P图")
{
List<Pchart> pcharts = new List<Pchart>();
foreach (var QcSpcD in QcSpcDs)
List<Pchart> pcharts = new();
foreach (QcSpcD QcSpcD in QcSpcDs)
{
Pchart pchart = new Pchart();
pchart.p = QcSpcD.defectivenum / QcSpcD.checknum;
pchart.n = QcSpcD.checknum;
Pchart pchart = new()
{
p = QcSpcD.defectivenum / QcSpcD.checknum,
n = QcSpcD.checknum
};
pcharts.Add(pchart);
}
var pAverage = (pcharts.Select(p => p.n * p.p).Sum()) / (pcharts.Select(p => p.n).Sum());
var nAverage = pcharts.Select(p => p.n).Average();
float? pAverage = pcharts.Select(p => p.n * p.p).Sum() / pcharts.Select(p => p.n).Sum();
float? nAverage = pcharts.Select(p => p.n).Average();
pcharts.ForEach(p =>
{
p.cl = pAverage;
@@ -270,16 +303,18 @@ namespace Tnb.QcMgr
}
if (QcSpcH.graphtype == "U图")
{
List<Uchart> ucharts = new List<Uchart>();
foreach (var QcSpcD in QcSpcDs)
List<Uchart> ucharts = new();
foreach (QcSpcD QcSpcD in QcSpcDs)
{
Uchart uchart = new Uchart();
uchart.u = QcSpcD.defectivenum / QcSpcD.checknum;
uchart.n = QcSpcD.checknum;
Uchart uchart = new()
{
u = QcSpcD.defectivenum / QcSpcD.checknum,
n = QcSpcD.checknum
};
ucharts.Add(uchart);
}
var uAverage = (ucharts.Select(p => p.u).Sum()) / (ucharts.Count());
var nAverage = ucharts.Select(p => p.n).Average();
float? uAverage = ucharts.Select(p => p.u).Sum() / ucharts.Count();
float? nAverage = ucharts.Select(p => p.n).Average();
ucharts.ForEach(p =>
{
p.cl = uAverage;
@@ -290,15 +325,17 @@ namespace Tnb.QcMgr
}
if (QcSpcH.graphtype == "nP图")
{
List<NPchart> npcharts = new List<NPchart>();
foreach (var QcSpcD in QcSpcDs)
List<NPchart> npcharts = new();
foreach (QcSpcD QcSpcD in QcSpcDs)
{
NPchart npchart = new NPchart();
npchart.np = QcSpcD.defectivenum;
NPchart npchart = new()
{
np = QcSpcD.defectivenum
};
npcharts.Add(npchart);
}
var npAverage = (npcharts.Select(p => p.np).Sum()) / (npcharts.Count());
var pAverage = npcharts.Select(p => p.np).Sum() / (npcharts.Count() * QcSpcH.subcapacity);
float? npAverage = npcharts.Select(p => p.np).Sum() / npcharts.Count();
float? pAverage = npcharts.Select(p => p.np).Sum() / (npcharts.Count() * QcSpcH.subcapacity);
npcharts.ForEach(p =>
{
p.cl = npAverage;
@@ -309,14 +346,16 @@ namespace Tnb.QcMgr
}
if (QcSpcH.graphtype == "C图")
{
List<Cchart> ccharts = new List<Cchart>();
foreach (var QcSpcD in QcSpcDs)
List<Cchart> ccharts = new();
foreach (QcSpcD QcSpcD in QcSpcDs)
{
Cchart cchart = new Cchart();
cchart.c = QcSpcD.defectivenum;
Cchart cchart = new()
{
c = QcSpcD.defectivenum
};
ccharts.Add(cchart);
}
var cAverage = (ccharts.Select(p => p.c).Sum()) / (ccharts.Count());
float? cAverage = ccharts.Select(p => p.c).Sum() / ccharts.Count();
ccharts.ForEach(p =>
{
p.cl = cAverage;
@@ -346,25 +385,20 @@ namespace Tnb.QcMgr
private static float CalculateMedian(IEnumerable<float> values)
{
float ret = 0;
var floats = values.OrderBy(d => d).ToArray();
if (floats.Count() % 2 == 0)
{
ret = (floats[floats.Count() / 2 - 1] + floats[(floats.Count() + 2) / 2 - 1]) / 2;
}
else
{
ret = floats[(floats.Count() + 1) / 2 - 1];
}
float[] floats = values.OrderBy(d => d).ToArray();
ret = floats.Count() % 2 == 0
? (floats[(floats.Count() / 2) - 1] + floats[((floats.Count() + 2) / 2) - 1]) / 2
: floats[((floats.Count() + 1) / 2) - 1];
return ret;
}
//移动极差平均值计算
private static float CalculateMovRange(IEnumerable<float> values)
{
List<float> floats = new List<float>();
var arr = values.ToArray();
List<float> floats = new();
float[] arr = values.ToArray();
for (int i = 0; i < arr.Length - 1; i++)
{
floats.Add(Math.Abs((arr[i + 1] - arr[i])));
floats.Add(Math.Abs(arr[i + 1] - arr[i]));
}
return floats.Average();
}