|
|
@@ -150,6 +150,11 @@ namespace JLHHJSvr.Helper
|
|
|
#endregion
|
|
|
|
|
|
#region 替换布套高
|
|
|
+ //if(new List<int>() { 101 }.Contains(mx.formulakind.Value))
|
|
|
+ //{
|
|
|
+ // if (mx.mattress_width != null && mx.mattress_width > 0) expression = expression.Replace("【规格宽】", $"{mx.mattress_width}");
|
|
|
+ // if (mx.mattress_length != null && mx.mattress_length > 0) expression = expression.Replace("【规格长】", $"{mx.mattress_length}");
|
|
|
+ //}
|
|
|
//内布套
|
|
|
if (new List<int>() { 101,102,103,104,105,106 }.Contains(mx.formulakind.Value))
|
|
|
{
|
|
|
@@ -803,8 +808,8 @@ namespace JLHHJSvr.Helper
|
|
|
#endregion
|
|
|
|
|
|
#region 若填写则顶替床垫尺寸
|
|
|
- if (mx.mattress_width != null && mx.mattress_width > 0 && mx.mattress_width <= mattress.mattress_width) expression = expression.Replace("【规格宽】", $"{mx.mattress_width}");
|
|
|
- if (mx.mattress_length != null && mx.mattress_length > 0 && mx.mattress_length <= mattress.mattress_length) expression = expression.Replace("【规格长】", $"{mx.mattress_length}");
|
|
|
+ if (mx.mattress_width != null && mx.mattress_width > 0) expression = expression.Replace("【规格宽】", $"{mx.mattress_width}");
|
|
|
+ if (mx.mattress_length != null && mx.mattress_length > 0) expression = expression.Replace("【规格长】", $"{mx.mattress_length}");
|
|
|
#endregion
|
|
|
|
|
|
return expression;
|
|
|
@@ -841,8 +846,8 @@ namespace JLHHJSvr.Helper
|
|
|
|
|
|
AddKeyValue("布套高", cloth_height);
|
|
|
|
|
|
- if (mx.mattress_width != null && mx.mattress_width > 0 && mx.mattress_width <= mattress.mattress_width) expression = expression.Replace("【规格宽】", $"{mx.mattress_width}");
|
|
|
- if (mx.mattress_length != null && mx.mattress_length > 0 && mx.mattress_length <= mattress.mattress_length) expression = expression.Replace("【规格长】", $"{mx.mattress_length}");
|
|
|
+ //if (mx.mattress_width != null && mx.mattress_width > 0) expression = expression.Replace("【规格宽】", $"{mx.mattress_width}");
|
|
|
+ //if (mx.mattress_length != null && mx.mattress_length > 0) expression = expression.Replace("【规格长】", $"{mx.mattress_length}");
|
|
|
|
|
|
return expression;
|
|
|
}
|
MY