核价系统：1、新增新旧弹簧筛选条件；2、床垫清单，生成金蝶清单时新增sonLossstr清单公式返回

JLHHJSvr/Com/Model/u_mattress_interface_qd.cs

@@ -45,6 +45,7 @@ namespace JLHHJSvr.Com.Model
         /// 核价清单2的领料工组
         /// </summary>
         public string wrkgrpcode2 { get; set; }
+        public string sonLossstr { get; set; }
         #endregion
     }
 }

JLHHJSvr/DataStore/_Mapper_springtypeid.xml

@@ -6,6 +6,12 @@ SELECT u_springtype.springtypeid,
 FROM u_springtype
   </selectstr>
   <where>
+	  <when notnull="@arg_newspring" arg_newspring="1">
+		  u_springtype.springtypeid > 20
+	  </when>
+	  <when notnull="@arg_newspring" arg_newspring="0">
+		  u_springtype.springtypeid < 20
+	  </when>
   </where>
   <displayfields>
   </displayfields>

JLHHJSvr/DataStore/web_spring_define_choose.xml

@@ -32,7 +32,7 @@
 					left(rtrim(cast(u_spring.cyclenum  as char(10))),4) 
 				END  
 			AS springname,
-			      u_spring.comperssion_rate,
+			u_spring.comperssion_rate,
 			u_springtype.springtypecode,
 			u_spring.height_original,
 			CASE 
@@ -70,7 +70,7 @@
 		<when>
 			his_typeid=1
 		</when>
-		<when>
+		<when notnull="@arg_newspring" arg_newspring!="0">
 			u_spring.springtypeid > 20
 		</when>
 		<when notnull="@arg_search">

JLHHJSvr/Excutor/CreatPrdPfExcutor.cs

@@ -67,10 +67,12 @@ namespace JLHHJSvr.Excutor
 	                                ,u_mattress_interface_qd.wrkgrpcode2
 	                                ,u_mattress_interface_qd.ss_rate 
 	                                ,u_mattress_interface_qd.ls_rate 
-	                                ,u_mattress_interface_qd.sh_rate 
+	                                ,u_mattress_interface_qd.sh_rate
+                                    ,ISNULL('[>0,<=5]={' + left(cast(u_mtrltype.dannum1_rate as char(10)),4) + '};[>5,<=10]={'+ + '[>0,<=100]={' + left(cast(u_mtrltype.dannum4_rate as char(10)),4) + '};[>10,<=200]={' + left(cast(u_mtrltype.dannum2_rate as char(10)),4) + '};[>200]={' + left(cast(u_mtrltype.dannum3_rate as char(10)),4) + '};', '') AS sonLossstr
                                 FROM u_mattress_interface_qd
-                                LEFT JOIN u_mtrl_price ON u_mtrl_price.mtrlid = u_mattress_interface_qd.mtrlid";
-                    var outputFields = "mattressid,printid,itemname,bj_pzname,bj_pzname_mx,bj_pzname_mx_mx,wip_type,mtrlid,erp_mtrlid,useqty,dscrp,mtrlname,actual_useqty,qd_actual_size,qd_pfgroupqty,wrkgrpid,wrkgrpid2,ss_rate,ls_rate,sh_rate,wrkgrpcode1,wrkgrpcode2";
+                                LEFT JOIN u_mtrl_price ON u_mtrl_price.mtrlid = u_mattress_interface_qd.mtrlid
+                                LEFT JOIN u_mtrltype ON u_mtrltype.mtrltypeid = u_mtrl_price.mtrltype";
+                    var outputFields = "mattressid,printid,itemname,bj_pzname,bj_pzname_mx,bj_pzname_mx_mx,wip_type,mtrlid,erp_mtrlid,useqty,dscrp,mtrlname,actual_useqty,qd_actual_size,qd_pfgroupqty,wrkgrpid,wrkgrpid2,ss_rate,ls_rate,sh_rate,wrkgrpcode1,wrkgrpcode2,sonLossstr";
                     DbSqlHelper.SelectJoin(cmd, selectStr, "mattressid = @mattressid", new Dictionary<string, object>() { { "@mattressid", mattressid } }, "printid", outputFields, 0, 0, mattress_interface_qd_list);
 
                     var interfaceHelper = HelperBase.GetHelper<InterfaceHelper>(cmd, new HelperBase.Context() { tokendata = tokendata });
@@ -174,6 +176,7 @@ namespace JLHHJSvr.Excutor
                             printid = mx.printid,
                             azcode = ls_azcode,
                             promode = mx.ss_rate.ToString(),
+                            SonLossstr = mx.sonLossstr,
                             SonLoss = mx.sh_rate,
                             SonDECLosS = 0,
                             wip_name = _name,