业务后台：1、修复床垫报价用量计算为0情况；2、床网报价保存后返回关键信息

JLHHJSvr/DataStore/web_bednet_choose.xml

@@ -26,6 +26,9 @@
 			u_bednet_type.bednettypeid=@arg_bednettypeid
 		</when>
 	</where>
+	<orderstr>
+		bednetid DESC
+	</orderstr>
 	<displayfields>
 		<field field="pid" compute="getrow()">序</field>
 		<field field="bednetname" table="u_bednet">床网名称</field>

JLHHJSvr/Excutor/SaveBedNetExcutor.cs

@@ -114,7 +114,15 @@ namespace JLHHJSvr.Excutor
 
                         cmd.Transaction.Commit();
 
-                        rslt.bednet = new u_bednet() { bednetid = request.bednet.bednetid, bednetcode = request.bednet.bednetcode };
+                        rslt.bednet = new u_bednet() { 
+                            bednetid = request.bednet.bednetid, 
+                            bednetcode = request.bednet.bednetcode,
+                            typename = request.bednet.typename,
+                            mattress_width = request.bednet.mattress_width,
+                            mattress_length = request.bednet.mattress_length,
+                            mattress_height = request.bednet.mattress_height,
+                            nottax_factory_cost = request.bednet.nottax_factory_cost
+                        };
                     }
                     catch (Exception e)
                     {

JLHHJSvr/Helper/MattressHelper.cs

@@ -310,8 +310,8 @@ namespace JLHHJSvr.Helper
                         if(mx.if_inputqty == 1) mx.thickness = Convert.ToDecimal(reader["thickness"]);
                         string price_formula = Convert.ToString(reader["price_formula"]);
                         string qty_formula = Convert.ToString(reader["qty_formula"]);
-                        mx.formula = string.IsNullOrEmpty(price_formula) ? "" : price_formula;
-                        mx.useformula = string.IsNullOrEmpty(qty_formula) ? "" : qty_formula;
+                        mx.formula = string.IsNullOrEmpty(price_formula) ? mx.formula : price_formula;
+                        mx.useformula = string.IsNullOrEmpty(qty_formula) ? mx.useformula : qty_formula;
                     }
                 }
             }
@@ -570,7 +570,7 @@ namespace JLHHJSvr.Helper
             }
             
 
-            if(thickness > 0)
+            if(thickness >= 0)
             {
                 cmd.CommandText = @"SELECT TOP 1 shrinkage
                                     FROM u_shrinkage
@@ -870,6 +870,7 @@ namespace JLHHJSvr.Helper
                 string field = butaoJd ? "num_4" : (butaoFz ? "num_5" : "");
 
                 // 查找点数
+                var workmanship = new u_workmanship_add() { deptid = mattress.deptid, mattresstypeid = mattress.mattresstypeid, workmanshipname = field };
                 mattress.butao_point = GetWorkmanshipRate(mattress, field);
             }
             AddKeyValue("内布套点数", mattress.butao_point);