|
@@ -246,11 +246,12 @@ namespace JLHHJSvr.Helper
|
|
|
var mattress_type = new u_mattress_type() { mattresstypeid = mattress.mattresstypeid };
|
|
|
DbSqlHelper.SelectOne(cmd, mattress_type, "typename");
|
|
|
|
|
|
- var mxlist = mattressHelper.GetMattressMxMtrl(mattressid, new List<string>() { "u_mattress_formula.formulatype IN (0,1,2,3,99,104,103)" });
|
|
|
+ var mxlist_all = mattressHelper.GetMattressMxMtrl(mattressid, new List<string>() { "u_mattress_formula.formulatype IN (0,1,2,3,99,101,104,103)" });
|
|
|
+ mattressHelper.wf_sort_mx(ref mxlist_all);
|
|
|
|
|
|
- var mxlist_103 = mattressHelper.GetMattressMxMtrl(mattressid, new List<string>() { "u_mattress_formula.formulatype = 103" });
|
|
|
-
|
|
|
- var mxlist_101 = mattressHelper.GetMattressMxMtrl(mattressid, new List<string>() { "u_mattress_formula.formulatype = 101" });
|
|
|
+ var mxlist = mxlist_all.Where(t => new[]{ 0, 1, 2, 3, 99, 104, 103 }.Contains(t.formulatype.Value)).ToList();
|
|
|
+ var mxlist_103 = mxlist_all.Where(t => t.formulatype == 103).ToList();
|
|
|
+ var mxlist_101 = mxlist_all.Where(t => t.formulatype == 101).ToList();
|
|
|
|
|
|
// 高度
|
|
|
interfaceList.Add(InserMattressInterfacePz("床垫", "高度", 2, new string[] { $"{mattress.mattress_height}" }));
|