业务后台：床垫床网相关接口

JLHHJSvr/Com/Model/u_mattress.cs

@@ -9,7 +9,7 @@ namespace JLHHJSvr.Com.Model
     [PK(new[] { "mattressid" })]
     public sealed class u_mattress
     {
-        public int? mattressid { get; set; }
+        public int mattressid { get; set; }
         public int? deptid { get; set; }
         public int? mattresstypeid { get; set; }
         public int? mattress_width { get; set; }

JLHHJSvr/Com/SaveMattress.cs

@@ -29,5 +29,6 @@ namespace JLHHJSvr.Com
 
     public sealed class SaveMattressResponse : LJResponse
     {
+        public int mattressid { get; set; }
     }
 }

JLHHJSvr/DataStore/_Mapper_bednet_type_define.xml

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+	<selectstr>
+		SELECT
+		bednettypeid,
+		typename,
+		if_double_net,
+		if_double_spring,
+		if_15cm_strip,
+
+		spring_mtrl_formula,
+		spring_hr_formula,
+		fabrics1_mtrl_formula,
+		fabrics2_mtrl_formula,
+		if_part,
+		if_snake_wire,
+		snake_wire_diameter,
+		snake_wire_mtrl_formula,
+		if_hard_around,
+		hard_around_mtrl_formula,
+		hard_around_hr_formula,
+		if_pocket_around,
+		pocket_around_spring_formula,
+		pocket_around_fabrics_formula,
+		if_side_iron,
+		side_iron_mtrl_formula,
+		side_iron_hr_formula,
+		glue_mtrl_formula,
+		if_rsORwa,
+		rsORwa_mtrl_formula,
+		rsORwa_hr_formula,
+		if_sponge_drilling,
+		sponge_drilling_hr_formula,
+		fork_mtrl_formula,
+		fork_hr_formula,
+		cnail_mtrl_formula,
+		cnail_hr_formula,
+		sponge_mtrl_formula,
+		sponge_hr_formula,
+		edge_mtrl_formula,
+		edge_hr_formula,
+
+		felt_mtrl_formula,
+		felt_hr_formula,
+
+		packet_mtrl_formula,
+		packet_hr_formula,
+
+		sponge_mtrl_tc_formula,
+
+
+		createtime,
+		createby,
+
+		spring_weight_formula,
+		side_iron_weight_formula,
+		hard_around_weight_formula,
+		fabrics1_weight_formula,
+		fabrics2_weight_formula,
+		felt_weight_formula,
+		cnail_weight_formula,
+		sponge_weight_formula,
+		sponge_weight_tc_formula,
+		edge_weight_formula,
+		fork_weight_formula
+		From u_bednet_type
+	</selectstr>
+	<where>
+		<when notnull="@arg_bednettypeid">
+			bednettypeid=@arg_bednettypeid
+		</when>
+	</where>
+	<displayfields>
+		<field field="pid" compute="getrow()">序</field>
+		<field field="typename">名称</field>
+		<field field="if_double_net" datatype="checkbox">双网？</field>
+		<field field="if_double_spring" datatype="checkbox">双簧？</field>
+		<field field="if_15cm_strip" datatype="checkbox">15分布条？</field>
+		<field field="if_part" datatype="checkbox">多区袋装？</field>
+		<field field="if_snake_wire" datatype="checkbox">蛇线？</field>
+		<field field="snake_wire_diameter" datatype="number">蛇线线径MM</field>
+		<field field="snake_wire_mtrl_formula">蛇线材料成本公式</field>
+		<field field="if_hard_around" datatype="checkbox">四周加硬？</field>
+		<field field="hard_around_mtrl_formula">四周加硬材料成本公式</field>
+		<field field="hard_around_hr_formula">四周加硬人力成本公式</field>
+		<field field="if_pocket_around" datatype="checkbox">四周口袋？</field>
+		<field field="pocket_around_spring_formula">四周口袋弹簧成本公式</field>
+		<field field="pocket_around_fabrics_formula">四周口袋无纺布成本公式</field>
+		<field field="if_side_iron" datatype="checkbox">边铁？</field>
+		<field field="side_iron_mtrl_formula">边铁材料成本公式</field>
+		<field field="side_iron_hr_formula">边铁人力成本公式</field>
+		<field field="glue_mtrl_formula">胶水材料成本公式</field>
+		<field field="if_rsorwa" datatype="checkbox">胶条/包角？</field>
+		<field field="rsorwa_mtrl_formula">胶条/包角材料成本公式</field>
+		<field field="rsorwa_hr_formula">胶条/包角人力成本公式</field>
+		<field field="if_sponge_drilling" datatype="checkbox">海绵打孔？</field>
+		<field field="sponge_drilling_hr_formula">海绵打孔人力成本公式</field>
+		<field field="fork_mtrl_formula">弹叉材料成本公式</field>
+		<field field="fork_hr_formula">弹叉人力成本公式</field>
+		<field field="cnail_mtrl_formula">C钉/夹码材料成本公式</field>
+		<field field="cnail_hr_formula">C钉/夹码人力成本公式</field>
+		<field field="sponge_mtrl_formula">海绵包边材料成本公式</field>
+		<field field="sponge_hr_formula">海绵包边人力成本公式</field>
+		<field field="edge_mtrl_formula">封边材料成本公式</field>
+		<field field="edge_hr_formula">封边人力成本公式</field>
+		<field field="createby">登记人</field>
+		<field field="createtime" datatype="datetime">登记时间</field>
+		<field field="spring_mtrl_formula">Spring Mtrl Formula</field>
+		<field field="spring_hr_formula">Spring Hr Formula</field>
+		<field field="fabrics1_mtrl_formula">Fabrics1 Mtrl Formula</field>
+		<field field="fabrics2_mtrl_formula">Fabrics2 Mtrl Formula</field>
+		<field field="felt_mtrl_formula">Felt Mtrl Formula</field>
+		<field field="felt_hr_formula">Felt Hr Formula</field>
+		<field field="packet_mtrl_formula">Packet Mtrl Formula</field>
+		<field field="packet_hr_formula">Packet Hr Formula</field>
+		<field field="sponge_mtrl_tc_formula">Sponge Mtrl Tc Formula</field>
+		<field field="spring_weight_formula">Spring Weight Formula</field>
+		<field field="side_iron_weight_formula">Side Iron Weight Formula</field>
+		<field field="hard_around_weight_formula">Hard Around Weight Formula</field>
+		<field field="fabrics1_weight_formula">Fabrics1 Weight Formula</field>
+		<field field="fabrics2_weight_formula">Fabrics2 Weight Formula</field>
+		<field field="felt_weight_formula">Felt Weight Formula</field>
+		<field field="cnail_weight_formula">Cnail Weight Formula</field>
+		<field field="sponge_weight_formula">Sponge Weight Formula</field>
+		<field field="sponge_weight_tc_formula">Sponge Weight Tc Formula</field>
+		<field field="edge_weight_formula">Edge Weight Formula</field>
+		<field field="fork_weight_formula">Fork Weight Formula</field>
+	</displayfields>
+</select>

JLHHJSvr/DataStore/_Mapper_deptid.xml

@@ -5,12 +5,13 @@ SELECT u_dept.deptid,
 	u_dept.deptname,
 	moneyrate,
 	discount,
-	pricelistid
+	pricelistid,
+	profitrate
 FROM u_dept
   </selectstr>
   <where>
-	  <when notnull="@arg_deptid">
-		  u_dept.deptid = @arg_deptid
+	  <when notnull="@deptid">
+		  u_dept.deptid = @deptid
 	  </when>
   </where>
   <displayfields>

JLHHJSvr/DataStore/_Mapper_mattresstypeid.xml

@@ -9,7 +9,10 @@
 		if_button_sdie,
 		if_big_side ,
 		if_small_side,
-		if_v_side
+		if_v_side,
+		formula_big_side,
+		formula_small_side,
+		formula_v_side
 		from
 		u_mattress_type
 	</selectstr>

JLHHJSvr/DataStore/_Mapper_mtrl0.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+	<selectstr>
+		select u_mtrl_price.mtrlid,
+		u_mtrl_price.name as mtrlname
+		from u_mtrl_price
+		where u_mtrl_price.mtrltype = 0
+	</selectstr>
+	<displayfields>
+	</displayfields>
+</select>

JLHHJSvr/DataStore/_Mapper_mtrl2.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+	<selectstr>
+		select u_mtrl_price.mtrlid,
+		u_mtrl_price.name as mtrlname
+		from u_mtrl_price
+		where u_mtrl_price.mtrltype = 2
+	</selectstr>
+	<displayfields>
+	</displayfields>
+</select>

JLHHJSvr/DataStore/_Mapper_spring.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+	<selectstr>
+		SELECT u_spring.springid,
+			left(rtrim(cast(u_spring.line_diameter as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.height as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.caliber  as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.center_diameter  as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.cyclenum  as char(10))),4)   as name
+		FROM u_spring
+	</selectstr>
+	<where>
+		<when notnull="@mapper_search">
+			left(rtrim(cast(u_spring.line_diameter as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.height as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.caliber  as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.center_diameter  as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.cyclenum  as char(10))),4) LIKE '%' + @mapper_search + '%'
+		</when>
+	</where>
+	<displayfields>
+	</displayfields>
+</select>

JLHHJSvr/DataStore/web_bednet_define.xml

@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+	<selectstr>
+		SELECT
+		bednetid,
+		u_bednet.deptid,
+		flag,
+		bednetcode,
+		bednetname,
+		bednettypeid,
+		mattress_width,
+		mattress_length,
+		mattress_height,
+		if_doublenet,
+		if_doublespring,
+		snake_wire_diameter,
+		snake_wire_mtrl_formula,
+		snake_wire_mtrl_cost,
+		pocket_around_spring_formula,
+		pocket_around_spring_cost,
+		pocket_around_fabrics_formula,
+		pocket_around_fabrics_cost,
+		hard_around_mtrl_formula,
+		hard_around_mtrl_cost,
+		hard_around_hr_formula,
+		hard_around_hr_cost,
+		spring_mtrl_cost,
+		spring_hr_cost,
+		glue_price,
+		glue_mtrl_formula,
+		glue_mtrl_cost,
+		fabrics1_mtrl_formula,
+		fabrics1_mtrl_cost,
+		fabrics2_mtrl_formula,
+		fabrics2_mtrl_cost,
+		if_side_iron,
+		side_iron_lossrate,
+		side_iron_price,
+		side_iron_mtrl_formula,
+		side_iron_mtrl_cost,
+		side_iron_hr_formula,
+		side_iron_hr_cost,
+		cnail_price,
+		cnail_mtrl_formula,
+		cnail_mtrl_cost,
+		cnail_hr_formula,
+		cnail_hr_cost,
+		sponge_mtrlid,
+		sponge_thickness,
+		sponge_height,
+		sponge_price,
+		sponge_mtrl_formula,
+		sponge_mtrl_cost,
+		sponge_hr_formula,
+		sponge_hr_cost,
+		sponge_tc_mtrlid,
+		sponge_tc_thickness,
+		sponge_tc_height,
+		edge_mtrlid,
+		edge_price,
+		edge_mtrl_formula,
+		edge_mtrl_cost,
+		edge_hr_formula,
+		edge_hr_cost,
+		edge_height,
+		iffork,
+		fork_qty,
+		fork_price,
+		fork_mtrl_formula,
+		fork_mtrl_cost,
+		fork_hr_formula,
+		fork_hr_cost,
+		if_rsORwa,
+		rsORwa_price,
+		rsORwa_mtrl_formula,
+		rsORwa_mtrl_cost,
+		rsORwa_hr_formula,
+		rsORwa_hr_cost,
+		if_sponge_drilling,
+		sponge_drilling_hr_formula,
+		sponge_drilling_hr_cost,
+		total_hr_cost,
+		total_mtrl_cost ,
+		total_fees_cost,
+		total_cost,
+		u_bednet.createtime as createtime ,
+		u_bednet.createby as createby,
+		u_mtrl_sponge.name as mtrl_sponge_name,
+		u_mtrl_sponge_tc.name as mtrl_sponge_tc_name,
+		u_mtrl_edge.name as mtrl_edge_name,
+		u_mtrl_felt.name as mtrl_felt_name,
+		u_mtrl_felt_x.name as mtrl_felt_x_name,
+		felt_mtrlid,
+		felt_x_mtrlid,
+		nottax_factory_cost,
+		nottax_dept_cost,
+		dept_cost,
+		foreign_cost,
+		sum_weight,
+		total_cost - sponge_mtrl_cost - felt_mtrl_cost - felt_mtrl_x_cost - packet_mtrl_cost - packet_hr_cost as planprice,
+		ifsaleout,
+		duo_qv_str,
+		if_jb,
+		felt_qty,
+		felt_x_qty,
+		felt_dscrp,
+		extras_cost_dscrp,
+		packtype,
+		packqty,
+		packmtrl,
+		transport_type,
+		commission,
+		other_rate,
+		fob,
+		taxrate,
+		extras_cost,
+		moneyrate
+		From u_bednet
+		left join u_mtrl_price u_mtrl_sponge on   u_bednet.sponge_mtrlid=u_mtrl_sponge.mtrlid
+		left join u_mtrl_price u_mtrl_sponge_tc on   u_bednet.sponge_tc_mtrlid=u_mtrl_sponge_tc.mtrlid
+		left join u_mtrl_price u_mtrl_edge on   u_bednet.edge_mtrlid=u_mtrl_edge.mtrlid
+		left join u_mtrl_price u_mtrl_felt on   u_bednet.felt_mtrlid=u_mtrl_felt.mtrlid
+		left join u_mtrl_price u_mtrl_felt_x on   u_bednet.felt_x_mtrlid=u_mtrl_felt_x.mtrlid
+	</selectstr>
+	<where>
+		<when>
+			u_bednet.autotype = 0
+		</when>
+		<when notnull="@arg_bednetid">
+			u_bednet.bednetid = @arg_bednetid
+		</when>
+		<when notnull="@arg_deptid">
+			u_bednet.deptid = @arg_deptid
+		</when>
+		<when notempty="@@arg_arry_outrepstr@@">
+			u_bednet.createby IN (@@arg_arry_outrepstr@@) OR ( u_bednet.createby = '' OR u_bednet.createby = '管理员' )
+		</when>
+		<when notnull="@arg_search">
+			u_bednet.bednetcode LIKE '%' + @arg_search + '%' OR u_bednet.bednetname LIKE '%' + @arg_search + '%'
+		</when>
+	</where>
+	<displayfields>
+		<field field="pid" compute="getrow()"> 序</field>
+		<field field="flag" datatype="checkbox">审核</field>
+		<field field="deptid" mapper="" ddd="ddd_mattress_dept_choose" align="left">部门</field>
+		<field field="bednetcode">床网编码</field>
+		<field field="bednetname">床网名称</field>
+		<field field="dept_cost" datatype="number">部门售价</field>
+		<field field="foreign_cost" datatype="number">外币价</field>
+		<field field="bednettypeid" mapper="" ddd="ddd_bednettypeid_choose">
+			床网
+			类别
+		</field>
+		<field field="mattress_width" datatype="number">
+			床垫
+			宽/CM
+		</field>
+		<field field="mattress_length" datatype="number">
+			床垫
+			长/CM
+		</field>
+		<field field="mattress_height" datatype="number">
+			床垫
+			高/CM
+		</field>
+		<field field="if_doublenet" datatype="checkbox">
+			双网
+			？
+		</field>
+		<field field="if_doublespring" datatype="checkbox">
+			双簧
+			？
+		</field>
+		<field field="snake_wire_diameter" datatype="number">
+			蛇线
+			线径MM
+		</field>
+		<field field="if_side_iron" datatype="checkbox">
+			边铁？
+		</field>
+		<field field="side_iron_lossrate">
+			边铁
+			损耗率
+		</field>
+		<field field="mtrl_sponge_name">
+			海绵包边
+			物料
+		</field>
+		<field field="sponge_thickness" dattype="number">
+			海绵
+			厚度CM
+		</field>
+		<field field="sponge_height" dattype="number">
+			海绵
+			高CM
+		</field>
+		<field field="mtrl_sponge_tc_name">
+			填充海绵
+			物料
+		</field>
+		<field field="sponge_tc_thickness" dattype="number">
+			填充海绵
+			厚度CM
+		</field>
+		<field field="sponge_tc_height" dattype="number">
+			填充海绵
+			高CM
+		</field>
+		<field field="mtrl_edge_name">
+			封边
+			物料
+		</field>
+		<field field="edge_height" dattype="number">
+			封边高
+		</field>
+		<field field="mtrl_felt_name">上垫层材料</field>
+		<field field="mtrl_felt_x_name">下垫层材料</field>
+		<field field="felt_qty" dattype="number">
+			数量
+		</field>
+		<field field="felt_x_qty" dattype="number">
+			数量
+		</field>
+		<field field="felt_dscrp">做法</field>
+		<field field="if_jb" datatype="checkbox">卷包</field>
+		<field field="iffork" datatype="checkbox">弹叉</field>
+		<field field="fork_qty" datatype="number">
+			弹叉
+			数量
+		</field>
+		<field field="if_rsorwa" datatype="checkbox">
+			胶条？
+			包角？
+		</field>
+		<field field="if_sponge_drilling" datatype="checkbox">
+			海绵
+			打孔？
+		</field>
+		<field field="createby">
+			登记人
+		</field>
+		<field field="createtime" datatype="datetime">
+			登记时间
+		</field>
+		<field field="sum_weight" datatype="number">总重量</field>
+		<field field="planprice" datatype="number">计划价</field>
+		<field field="ifsaleout" datatype="checkbox">床网独立销售</field>
+		<field field="packtype">包装方式</field>
+		<field field="packqty">包装数量</field>
+		<field field="transport_type">运输方式</field>
+		<field field="commission">佣金点数</field>
+		<field field="other_rate">额外点数</field>
+		<field field="fob">FOB</field>
+		<field field="taxrate">税率</field>
+		<field field="extras_cost">额外费用</field>
+		<field field="moneyrate">汇率</field>
+		<field field="extras_cost_dscrp">额外费用备注</field>
+		<field field="duo_qv_str">多区</field>
+	</displayfields>
+</select>

JLHHJSvr/DataStore/web_bednet_mx.xml

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+	<selectstr>
+		SELECT
+		bednetmxid,
+		bednetid,
+		spring_qty_width,
+		spring_qty_length,
+		bednet_height,
+		wire_mtrlid,
+		u_bednetmx.springid,
+		ISNULL(vv_spring.name, '') as springname,
+		if_part,
+		if_15strip,
+		if_pocket_around,
+		pocket_around_springid,
+		ISNULL(vv_pocket_spring.name, '') as pocket_around_springname,
+		pocket_around_row,
+		pocket_around_wire_price,
+		pocket_around_spring_cost,
+		pocket_around_fabrics_cost,
+		if_hard_around,
+		hard_around_springid,
+		hard_around_row,
+		hard_around_wire_price,
+		hard_around_mtrl_cost,
+		hard_around_hr_cost,
+		fabrics1_mtrlid,
+		fabrics1_price,
+		fabrics1_mtrl_cost,
+		fabrics2_mtrlid,
+		fabrics2_price,
+		fabrics2_mtrl_cost,
+		if_side_iron,
+		side_iron_qty,
+		side_iron_mtrl_cost,
+		side_iron_hr_cost
+		From u_bednetmx
+		left outer join (
+			SELECT u_spring.springid,
+			left(rtrim(cast(u_spring.line_diameter as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.height as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.caliber  as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.center_diameter  as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.cyclenum  as char(10))),4)   as name
+		FROM u_spring
+		) vv_spring on vv_spring.springid = u_bednetmx.springid
+		left outer join (
+			SELECT u_spring.springid,
+			left(rtrim(cast(u_spring.line_diameter as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.height as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.caliber  as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.center_diameter  as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.cyclenum  as char(10))),4)   as name
+			FROM u_spring
+		) as vv_pocket_spring on vv_pocket_spring.springid = u_bednetmx.pocket_around_springid
+	</selectstr>
+	<where>
+		<when notnull="@arg_bednetid">
+			u_bednetmx.bednetid = @arg_bednetid
+		</when>
+	</where>
+	<displayfields>
+		<field field="pid" compute="getrow()">序</field>
+		<field field="springname" ddd="dddw_spring">
+			弹簧
+		</field>
+		<field field="spring_qty_width" datatype="number">
+			弹簧排列
+			个数-宽
+		</field>
+		<field field="spring_qty_length" datatype="number">
+			弹簧排列
+			个数-长
+		</field>
+		<field field="bednet_height" datatype="number">
+			床网高
+			CM
+		</field>
+		<field field="wire_mtrlid" mapper="u_bednetmx.mtrl0" ddd="dddw_mtrl0">
+			拉丝网
+			线径物料
+		</field>
+		<field field="if_part" datatype="checkbox">
+			多区
+			袋装
+		</field>
+		<field field="if_15strip" datatype="checkbox">
+			15分
+			布条？
+		</field>
+		<field field="if_pocket_around" datatype="checkbox">
+			四周
+			口袋？
+		</field>
+		<field field="pocket_around_springname" ddd="dddw_spring">
+			四周口袋
+			弹簧
+		</field>
+		<field field="pocket_around_row">
+			四周口袋
+			排数
+		</field>
+		<field field="if_hard_around" datatype="checkbox">
+			四周
+			加硬？
+		</field>
+		<field field="hard_around_springid">
+			四周加硬
+			弹簧
+		</field>
+		<field field="hard_around_row" datatype="number">
+			四周加硬
+			排数
+		</field>
+		<field field="fabrics1_mtrlid">入袋无纺布</field>
+		<field field="fabrics2_mtrlid">底面无纺布</field>
+		<field field="if_side_iron" datatype="checkbox">
+			边铁
+			？
+		</field>
+		<field field="side_iron_qty" datatype="number">
+			边铁
+			条数
+		</field>
+	</displayfields>
+</select>

JLHHJSvr/DataStore/web_bednet_mx_add.xml

@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+	<selectstr>
+		SELECT
+			bednetmxid,
+			bednetid,
+			spring_qty_width,
+			spring_qty_length,
+			bednet_height,
+			u_bednetmx.springid,
+			ISNULL(vv_spring.name, u_bednetmx.springid) as springname,
+			if_part,
+			if_15strip,
+			if_pocket_around,
+			pocket_around_springid,
+			ISNULL(vv_pocket_spring.name, '') as pocket_around_springname,
+			pocket_around_row,
+			pocket_around_wire_price,
+			pocket_around_spring_cost,
+			pocket_around_fabrics_cost,
+			if_hard_around,
+			hard_around_springid,
+			ISNULL(vv_hard_spring.name, '') as hard_around_springname,
+			hard_around_row,
+			hard_around_wire_price,
+			hard_around_mtrl_cost,
+			hard_around_hr_cost,
+			fabrics1_mtrlid,
+			fabrics1_price,
+			fabrics1_mtrl_cost,
+			fabrics2_mtrlid,
+			fabrics2_price,
+			fabrics2_mtrl_cost,
+			if_side_iron,
+			side_iron_qty,
+			side_iron_mtrl_cost,
+			side_iron_hr_cost,
+
+			pocket_around_spring_cost_replace_formula,
+			pocket_around_fabrics_cost_replace_formula,
+			hard_around_mtrl_cost_replace_formula,
+			hard_around_hr_cost_replace_formula,
+			fabrics1_mtrl_cost_replace_formula,
+			fabrics2_mtrl_cost_replace_formula,
+			side_iron_mtrl_cost_replace_formula,
+			side_iron_hr_cost_replace_formula,
+			cnail_mtrl_cost_replace_formula,
+			cnail_mtrl_cost,
+			cnail_hr_cost_replace_formula,
+			cnail_hr_cost,
+			glue_mtrl_cost_replace_formula,
+			glue_mtrl_cost,
+
+			spring_mtrl_cost,
+			spring_hr_cost,
+			spring_mtrl_cost_replace_formula,
+			spring_hr_cost_replace_formula,
+
+			spring_weight_replace_formula
+		From u_bednetmx
+		left outer join (
+			SELECT u_spring.springid,
+			left(rtrim(cast(u_spring.line_diameter as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.height as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.caliber  as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.center_diameter  as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.cyclenum  as char(10))),4)   as name
+			FROM u_spring
+		) vv_spring on vv_spring.springid = u_bednetmx.springid
+		left outer join (
+			SELECT u_spring.springid,
+			left(rtrim(cast(u_spring.line_diameter as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.height as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.caliber  as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.center_diameter  as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.cyclenum  as char(10))),4)   as name
+			FROM u_spring
+		) as vv_pocket_spring on vv_pocket_spring.springid = u_bednetmx.pocket_around_springid
+		left outer join (
+			SELECT u_spring.springid,
+			left(rtrim(cast(u_spring.line_diameter as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.height as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.caliber  as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.center_diameter  as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.cyclenum  as char(10))),4)   as name
+			FROM u_spring
+		) as vv_hard_spring on vv_hard_spring.springid = u_bednetmx.hard_around_springid
+	</selectstr>
+	<where>
+		<when notnull="@arg_bednetid">
+			u_bednetmx.bednetid = @arg_bednetid
+		</when>
+	</where>
+	<displayfields>
+		<field field="pid" compute="getrow()">序</field>
+		<field field="if_part" datatype="checkbox">
+			多区
+			袋装
+		</field>
+		<field field="bednet_height" datatype="number">
+			床网高
+			CM
+		</field>
+		<field field="springname" ddd="dddw_spring">
+			弹簧
+			线径/高度/口径/中心直径/圈数
+		</field>
+		<field field="spring_qty_width" datatype="number">
+			弹簧排列
+			个数-宽
+		</field>
+		<field field="spring_qty_length" datatype="number">
+			弹簧排列
+			个数-长
+		</field>
+		<!--<field field="wire_mtrlid" mapper="u_bednetmx.mtrl0" ddd="dddw_mtrl0">
+			拉丝网
+			线径物料
+		</field>-->
+		<field field="if_side_iron" datatype="checkbox">
+			边铁
+			？
+		</field>
+		<field field="side_iron_qty" datatype="number">
+			边铁
+			条数
+		</field>
+		<field field="fabrics2_mtrlid" mapper="u_bednetmx.mtrl2" ddd="dddw_mtrl2">底面无纺布</field>
+		<field field="fabrics1_mtrlid" mapper="u_bednetmx.mtrl2" ddd="dddw_mtrl2">入袋无纺布</field>
+		<field field="if_pocket_around" datatype="checkbox">
+			四周
+			口袋？
+		</field>
+		<field field="pocket_around_springname" ddd="dddw_spring">
+			四周口袋
+			弹簧
+		</field>
+		<field field="pocket_around_row" datatype="number">
+			四周口袋
+			排数
+		</field>
+		<field field="if_hard_around" datatype="checkbox">
+			四周
+			加硬？
+		</field>
+		<field field="hard_around_springname" ddd="dddw_spring">
+			四周加硬
+			弹簧
+		</field>
+		<field field="hard_around_row" datatype="number">
+			四周加硬
+			排数
+		</field>
+		<field field="if_15strip" datatype="checkbox">
+			15分
+			布条？
+		</field>
+		<field field="spring_mtrl_cost" datatype="number">弹簧总材料成本</field>
+		<field field="spring_hr_cost" datatype="number">弹簧总人力成本</field>
+		<field field="pocket_around_wire_price" datatype="number">
+			四周口袋
+			弹簧钢丝单价
+		</field>
+		<field field="pocket_around_spring_cost" datatype="number">
+			四周口袋
+			弹簧成本
+		</field>
+		<field field="pocket_around_fabrics_cost" datatype="number">
+			四周口袋
+			无纺布成本
+		</field>
+		<field field="hard_around_mtrl_cost" datatype="number">
+			四周加硬
+			材料成本
+		</field>
+		<field field="hard_around_hr_cost" datatype="number">
+			四周加硬
+			人力成本
+		</field>
+		<field field="hard_around_wire_price" datatype="number">
+			四周加硬
+			弹簧钢丝单价
+		</field>
+		<field field="fabrics1_mtrl_cost" datatype="number">
+			入袋无纺布
+			材料成本
+		</field>
+		<field field="fabrics1_price" datatype="number">
+			入袋无纺布
+			单价
+		</field>
+		<field field="fabrics2_price" datatype="number">
+			底面无纺布
+			单价
+		</field>
+		<field field="fabrics2_mtrl_cost" datatype="number">
+			底面无纺布
+			材料成本
+		</field>
+		<field field="side_iron_mtrl_cost" datatype="number">
+			边铁
+			材料成本
+		</field>
+		<field field="side_iron_hr_cost" datatype="number">
+			边铁
+			人力成本
+		</field>
+		<field field="glue_mtrl_cost" datatype="number" usermode_notequals="1">胶水材料成本</field>
+		<field field="cnail_mtrl_cost" datatype="number" usermode_notequals="1">C钉/夹码材料成本</field>
+		<field field="cnail_hr_cost" datatype="number" usermode_notequals="1">C钉/夹码人力成本</field>
+		<field field="spring_mtrl_cost_replace_formula" usermode_notequals="1">弹簧总材料成本替换公式</field>
+		<field field="spring_hr_cost_replace_formula" usermode_notequals="1">弹簧总人力成本替换公式</field>
+		<field field="glue_mtrl_cost_replace_formula" usermode_notequals="1">胶水材料成本替换公式</field>
+		<field field="pocket_around_spring_cost_replace_formula" usermode_notequals="1">四周口袋弹簧成本替换公式</field>
+		<field field="pocket_around_fabrics_cost_replace_formula" usermode_notequals="1">四周口袋无纺布成本替换公式</field>
+		<field field="hard_around_mtrl_cost_replace_formula" usermode_notequals="1">四周加硬材料成本替换公式</field>
+		<field field="hard_around_hr_cost_replace_formula" usermode_notequals="1">四周加硬人力成本替换公式</field>
+		<field field="fabrics1_mtrl_cost_replace_formula" usermode_notequals="1">入袋无纺布材料成本替换公式</field>
+		<field field="fabrics2_mtrl_cost_replace_formula" usermode_notequals="1">底面无纺布材料成本替换公式</field>
+		<field field="side_iron_mtrl_cost_replace_formula" usermode_notequals="1">边铁材料成本替换公式</field>
+		<field field="side_iron_hr_cost_replace_formula" usermode_notequals="1">边铁人力成本替换公式</field>
+		<field field="cnail_mtrl_cost_replace_formula" usermode_notequals="1">C钉/夹码材料成本替换公式</field>
+		<field field="cnail_hr_cost_replace_formula" usermode_notequals="1">C钉/夹码人力成本替换公式</field>
+	</displayfields>
+</select>

JLHHJSvr/DataStore/web_bednet_mx_spring.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+	<selectstr>
+		SELECT
+		bednetmx_partid,
+		u_bednetmx_spring.bednetmxid,
+		u_bednetmx_spring.springid,
+		ISNULL(vv_spring.name, '') as springname,
+		u_bednetmx_spring.spring_qty_width,
+		u_bednetmx_spring.spring_qty_length,
+		u_bednetmx_spring.fabrics1_mtrl_cost
+		From u_bednetmx_spring
+
+		left outer join u_bednetmx on u_bednetmx.bednetmxid = u_bednetmx_spring.bednetmxid
+		left outer join (
+		SELECT u_spring.springid,
+		left(rtrim(cast(u_spring.line_diameter as char(10))),4) + '/'+
+		left(rtrim(cast(u_spring.height as char(10))),4) + '/'+
+		left(rtrim(cast(u_spring.caliber  as char(10))),4) + '/'+
+		left(rtrim(cast(u_spring.center_diameter  as char(10))),4) + '/'+
+		left(rtrim(cast(u_spring.cyclenum  as char(10))),4)   as name
+		FROM u_spring
+		) vv_spring on vv_spring.springid = u_bednetmx_spring.springid
+	</selectstr>
+	<where>
+		<when notnull="@arg_bednetmxid">
+			u_bednetmx_spring.bednetmxid = @arg_bednetmxid
+		</when>
+		<when notnull="@arg_bednetid">
+			u_bednetmx.bednetid = @arg_bednetid
+		</when>
+	</where>
+	<displayfields>
+		<field field="pid" compute="getrow()">
+			序
+		</field>
+		<field field="springname">
+			弹簧
+		</field>
+		<field field="spring_qty_width" datatype="number">
+			弹簧排列
+			个数-宽
+		</field>
+		<field field="spring_qty_length" datatype="number">
+			弹簧排列
+			个数-长
+		</field>
+	</displayfields>
+</select>

JLHHJSvr/DataStore/web_factory_profitratelist.xml

@@ -23,6 +23,12 @@ RIGHT OUTER JOIN (
 	<when>
 		ISNULL(u_factory_profitrate.bednet_or_mattress,@kind) = @kind
 	</when>
+	<when notnull="@arg_deptid">
+		u_factory_profitrate.deptid = @arg_deptid
+	</when>
+	<when notnull="@arg_bednettypeid_mattresstypeid">
+		u_factory_profitrate.bednettypeid_mattresstypeid = @arg_bednettypeid_mattresstypeid
+	</when>
   </where>
   <orderstr>
   </orderstr>

JLHHJSvr/DataStore/web_mattress.xml

@@ -90,7 +90,7 @@
 		<when notnull="@arg_deptid">
 			u_mattress.deptid = @arg_deptid
 		</when>
-		<when notnull="@@arg_arry_outrepstr@@">
+		<when notempty="@@arg_arry_outrepstr@@">
 			u_mattress.createby in (@@arg_arry_outrepstr@@) or  @arg_empid = 0
 		</when>
 		<when notnull="@arg_qr_flag">

JLHHJSvr/DataStore/web_spring_define_choose.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+	<selectstr>
+		SELECT
+			springid,
+			line_diameter,
+			Height,
+			caliber,
+			center_diameter,
+			cyclenum,
+			gram_weight,
+			dscrp,
+			createtime,
+			createby,
+			springtypeid,
+			left(rtrim(cast(u_spring.line_diameter as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.height as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.caliber  as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.center_diameter  as char(10))),4) + '/'+
+			left(rtrim(cast(u_spring.cyclenum  as char(10))),4)   as name
+		From u_spring
+	</selectstr>
+	<where>
+		<when notnull="@arg_line_diameter" arg_line_diameter!="-1">
+			line_diameter LIKE '%' + @arg_line_diameter + '%'
+		</when>
+		<when notnull="@arg_height" arg_height!="-1">
+			Height=@arg_height
+		</when>
+		<when notnull="@arg_caliber" arg_caliber!="-1">
+			caliber=@arg_caliber
+		</when>
+		<when notnull="@arg_center_diameter" arg_center_diameter!="-1">
+			center_diameter=@arg_center_diameter
+		</when>
+		<when notnull="@arg_cyclenum" arg_cyclenum!="-1">
+			cyclenum=@arg_cyclenum
+		</when>
+		<when notnull="@arg_bedtypeid" arg_bedtypeid!="-1">
+			bedtypeid=@arg_bedtypeid
+		</when>
+		<when notnull="@arg_springtypeid" arg_springtypeid!="-1">
+			springtypeid=@arg_springtypeid
+		</when>
+		<when>
+			his_typeid=1
+		</when>
+		<when notnull="@arg_search">
+			u_spring.line_diameter LIKE '%' + @arg_search + '%' OR
+			u_spring.height LIKE '%' + @arg_search + '%' OR
+			u_spring.caliber LIKE '%' + @arg_search + '%' OR
+			u_spring.center_diameter LIKE '%' + @arg_search + '%' OR
+			u_spring.cyclenum LIKE '%' + @arg_search + '%'
+		</when>
+	</where>
+	<displayfields>
+		<field field="pid" compute="getrow()">序</field>
+		<field field="line_diameter" datatype="number">线径MM</field>
+		<field field="height" datatype="number">高度CM</field>
+		<field field="caliber" datatype="number">口经CM</field>
+		<field field="center_diameter" datatype="number">中心直径CM</field>
+		<field field="cyclenum" datatype="number">圈数</field>
+		<field field="gram_weight" datatype="number">克重KG</field>
+		<field field="dscrp">备注</field>
+		<field field="createby">等记人</field>
+		<field field="createtime" datatype="datetime">登记时间</field>
+		<field field="springtypeid" mapper="">弹簧分类</field>
+	</displayfields>
+</select>

JLHHJSvr/Excutor/CommonDynamicSelectExcutor.cs

@@ -907,6 +907,14 @@ namespace JLHHJSvr.Excutor
                     visibleLimited = true;
                 }
             }
+            if (col.ContainsKey("usermode_notequals"))
+            {
+                var usermode = Convert.ToInt32(col.GetValue("usermode_notequals").ToString());
+                if (tokenData.usermode == usermode)
+                {
+                    visibleLimited = true;
+                }
+            }
             if (visibleLimited)
             {
                 col.Add("limited", true);