|
@@ -358,10 +358,29 @@ namespace JLHHJSvr.Helper
|
|
|
}
|
|
|
private void InitMattressMx(u_mattress mattress,List<u_mattress_mx_mtrl> mxlist)
|
|
|
{
|
|
|
- foreach(var mx in mxlist)
|
|
|
+ foreach (var mx in mxlist)
|
|
|
{
|
|
|
if (!new List<int>() { 0, 1, 2, 3, 104 }.Contains(mx.formulatype.Value)) continue;
|
|
|
|
|
|
+ // 垫层 wf_check_dianceng_ifright
|
|
|
+ if (mx.formulatype.Value == 1)
|
|
|
+ {
|
|
|
+ cmd.CommandText = @"SELECT TOP 1 formulaid From u_mattress_formula where formulakind = @ll_formulakind";
|
|
|
+ cmd.Parameters.Clear();
|
|
|
+ cmd.Parameters.AddWithValue("@ll_formulakind", mx.formulakind);
|
|
|
+ using (var reader = cmd.ExecuteReader())
|
|
|
+ {
|
|
|
+ if (reader.Read())
|
|
|
+ {
|
|
|
+ mx.formulaid = Convert.ToInt32(reader["formulaid"]);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ mx.formulaid = 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
var formula = new u_mattress_formula() { formulaid = mx.formulaid, };
|
|
|
DbSqlHelper.SelectOne(cmd, formula, "formulakind,formulatype,sortcode");
|
|
|
|