|
@@ -1335,18 +1335,15 @@ namespace JLHHJSvr.Helper
|
|
|
|
|
|
foreach (var mx in diancengList)
|
|
foreach (var mx in diancengList)
|
|
{
|
|
{
|
|
- if (mx.mtrlid > 0)
|
|
|
|
|
|
+ var key = $"{mx.chastr}-{kindDict[mx.formulakind.Value]}";
|
|
|
|
+ if (mx.mtrlid > 0 && new int[] { 32, 12, 13, 14, 29 }.Contains(mx.formulakind.Value))
|
|
{
|
|
{
|
|
- var key = $"{mx.chastr}-{kindDict[mx.formulakind.Value]}";
|
|
|
|
|
|
+ this.ProcessWangMianBLPrdPf(mx, qdList, mx.chastr, kindDict[mx.formulakind.Value], ++countDict[key]);
|
|
|
|
+ }
|
|
|
|
|
|
- if (mx.formulakind == 999)
|
|
|
|
- {
|
|
|
|
- this.ProcessChuangWangPrdPf(mx, qdList, mx.chastr, ++countDict[key]);
|
|
|
|
- }
|
|
|
|
- else if (new int[] { 32, 12, 13, 14, 29 }.Contains(mx.formulakind.Value))
|
|
|
|
- {
|
|
|
|
- this.ProcessWangMianBLPrdPf(mx, qdList, mx.chastr, kindDict[mx.formulakind.Value], ++countDict[key]);
|
|
|
|
- }
|
|
|
|
|
|
+ if (mx.formulakind == 999)
|
|
|
|
+ {
|
|
|
|
+ this.ProcessChuangWangPrdPf(mx, qdList, mx.chastr, ++countDict[key]);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|