|
@@ -3206,6 +3206,13 @@ namespace JLHHJSvr.Helper
|
|
|
var outputFields = "mtrlid,name,if_subspecs,extra_cost";
|
|
|
DbSqlHelper.SelectJoin(cmd, selectStr, ListEx.GetWhereStr(whereList), parms, "mtrlid", outputFields, 0,0, list);
|
|
|
|
|
|
+ if(extraList.Count > 0)
|
|
|
+ {
|
|
|
+ //
|
|
|
+ var namelist = list.Select(t => t.name).ToList();
|
|
|
+ extraList.RemoveAll(t => !string.IsNullOrEmpty(t.extraname) && namelist.Contains(t.extraname));
|
|
|
+ }
|
|
|
+
|
|
|
foreach(var mtrl in list)
|
|
|
{
|
|
|
var matchItems = fuliaoList
|