|
|
@@ -260,112 +260,118 @@ namespace JLHHJSvr.Excutor
|
|
|
_bednet_fork_qty = Convert.ToInt32(submx["bednet_fork_qty_" + bednetIndex]);
|
|
|
}
|
|
|
|
|
|
- if (_bednetMx.Count > 0)
|
|
|
- {
|
|
|
-
|
|
|
- cmd.CommandText = @"SELECT TOP 1 u_bednet.bednetid
|
|
|
- ,u_bednet_type.typename
|
|
|
- ,bednetcode
|
|
|
- ,mattress_width
|
|
|
- ,mattress_length
|
|
|
- ,mattress_height
|
|
|
- ,nottax_factory_cost
|
|
|
- FROM u_bednetmx
|
|
|
- INNER JOIN u_bednet on u_bednet.bednetid = u_bednetmx.bednetid
|
|
|
- INNER JOIN u_bednet_type on u_bednet_type.bednettypeid = u_bednet.bednettypeid
|
|
|
- WHERE u_bednet.bednettypeid = @bednettypeid
|
|
|
- AND u_bednet.mattress_width = @mattress_width
|
|
|
- AND u_bednet.mattress_length = @mattress_length
|
|
|
- AND u_bednet.if_doublenet = @if_doublenet
|
|
|
- AND u_bednet.if_doublespring = @if_doublespring
|
|
|
- AND u_bednet.snake_wire_diameter = @snake_wire_diameter
|
|
|
- AND u_bednet.if_rsorwa = @if_rsorwa
|
|
|
- AND u_bednet.if_sponge_drilling = @if_sponge_drilling
|
|
|
- AND u_bednet.ifsaleout = 0
|
|
|
- AND u_bednet.sponge_mtrlid = @sponge_mtrlid
|
|
|
- AND u_bednet.sponge_thickness = @sponge_thickness
|
|
|
- AND u_bednet.sponge_height = @sponge_height
|
|
|
- AND u_bednet.sponge_tc_mtrlid = @sponge_tc_mtrlid
|
|
|
- AND u_bednet.sponge_tc_thickness = @sponge_tc_thickness
|
|
|
- AND u_bednet.sponge_tc_height = @sponge_tc_height
|
|
|
- AND u_bednet.edge_mtrlid = @edge_mtrlid
|
|
|
- AND u_bednet.edge_height = @edge_height
|
|
|
- AND u_bednet.felt_mtrlid = @felt_mtrlid
|
|
|
- AND u_bednet.felt_qty = @felt_qty
|
|
|
- AND u_bednet.felt_x_mtrlid = @felt_x_mtrlid
|
|
|
- AND u_bednet.felt_x_qty = @felt_x_qty
|
|
|
- AND u_bednet.fork_qty = @fork_qty
|
|
|
- AND u_bednet.felt_dscrp = @felt_dscrp
|
|
|
- AND u_bednet.duo_qv_str = @duo_qv_str
|
|
|
- AND u_bednetmx.bednet_height = @bednet_height
|
|
|
- AND u_bednetmx.springid = @springid
|
|
|
- AND u_bednetmx.spring_qty_width = @spring_qty_width
|
|
|
- AND u_bednetmx.spring_qty_length = @spring_qty_length
|
|
|
- AND u_bednetmx.if_side_iron = @if_side_iron
|
|
|
- AND u_bednetmx.side_iron_qty = @side_iron_qty
|
|
|
- AND u_bednetmx.fabrics2_mtrlid = @fabrics2_mtrlid
|
|
|
- AND u_bednetmx.fabrics1_mtrlid = @fabrics1_mtrlid
|
|
|
- AND u_bednetmx.if_hard_around = @if_hard_around
|
|
|
- AND u_bednetmx.hard_around_springid = @hard_around_springid
|
|
|
- AND u_bednetmx.hard_around_row = @hard_around_row
|
|
|
- AND u_bednetmx.if_15strip = @if_15strip
|
|
|
- ";
|
|
|
- cmd.Parameters.Clear();
|
|
|
- cmd.Parameters.AddWithValue("@bednettypeid", _bednet.bednettypeid);
|
|
|
- cmd.Parameters.AddWithValue("@mattress_width", _bednet.mattress_width);
|
|
|
- cmd.Parameters.AddWithValue("@mattress_length", _bednet.mattress_length);
|
|
|
- cmd.Parameters.AddWithValue("@if_doublenet", _bednet.if_doublenet);
|
|
|
- cmd.Parameters.AddWithValue("@if_doublespring", _bednet.if_doublespring);
|
|
|
- cmd.Parameters.AddWithValue("@snake_wire_diameter", _bednet.snake_wire_diameter);
|
|
|
- cmd.Parameters.AddWithValue("@if_rsorwa", _bednet.if_rsorwa);
|
|
|
- cmd.Parameters.AddWithValue("@if_sponge_drilling", _bednet.if_sponge_drilling);
|
|
|
- cmd.Parameters.AddWithValue("@sponge_mtrlid", _bednet.sponge_mtrlid);
|
|
|
- cmd.Parameters.AddWithValue("@sponge_thickness", _bednet.sponge_thickness);
|
|
|
- cmd.Parameters.AddWithValue("@sponge_height", _bednet.sponge_height);
|
|
|
- cmd.Parameters.AddWithValue("@sponge_tc_mtrlid", _bednet.sponge_tc_mtrlid);
|
|
|
- cmd.Parameters.AddWithValue("@sponge_tc_thickness", _bednet.sponge_tc_thickness);
|
|
|
- cmd.Parameters.AddWithValue("@sponge_tc_height", _bednet.sponge_tc_height);
|
|
|
- cmd.Parameters.AddWithValue("@edge_mtrlid", _bednet.edge_mtrlid);
|
|
|
- cmd.Parameters.AddWithValue("@edge_height", _bednet.edge_height);
|
|
|
- cmd.Parameters.AddWithValue("@felt_mtrlid", _bednet.felt_mtrlid);
|
|
|
- cmd.Parameters.AddWithValue("@felt_qty", _bednet.felt_qty);
|
|
|
- cmd.Parameters.AddWithValue("@felt_x_mtrlid", _bednet.felt_x_mtrlid);
|
|
|
- cmd.Parameters.AddWithValue("@felt_x_qty", _bednet.felt_x_qty);
|
|
|
- cmd.Parameters.AddWithValue("@felt_dscrp", _bednet.felt_dscrp);
|
|
|
- cmd.Parameters.AddWithValue("@duo_qv_str", _bednet.duo_qv_str);
|
|
|
- cmd.Parameters.AddWithValue("@fork_qty", _bednet.iffork == 1 ? _bednet_fork_qty : 0);
|
|
|
- cmd.Parameters.AddWithValue("@bednet_height", _bednetMx[0].bednet_height);
|
|
|
- cmd.Parameters.AddWithValue("@springid", _bednetMx[0].springid);
|
|
|
- cmd.Parameters.AddWithValue("@spring_qty_width", _spring_qty_width);
|
|
|
- cmd.Parameters.AddWithValue("@spring_qty_length", _spring_qty_length);
|
|
|
- cmd.Parameters.AddWithValue("@if_side_iron", _bednetMx[0].if_side_iron);
|
|
|
- cmd.Parameters.AddWithValue("@side_iron_qty", _bednetMx[0].side_iron_qty);
|
|
|
- cmd.Parameters.AddWithValue("@fabrics2_mtrlid", _bednetMx[0].fabrics2_mtrlid);
|
|
|
- cmd.Parameters.AddWithValue("@fabrics1_mtrlid", _bednetMx[0].fabrics1_mtrlid);
|
|
|
- cmd.Parameters.AddWithValue("@if_hard_around", _bednetMx[0].if_hard_around);
|
|
|
- cmd.Parameters.AddWithValue("@hard_around_springid", _bednetMx[0].hard_around_springid);
|
|
|
- cmd.Parameters.AddWithValue("@hard_around_row", _bednetMx[0].hard_around_row);
|
|
|
- cmd.Parameters.AddWithValue("@if_15strip", _bednetMx[0].if_15strip);
|
|
|
- using (var reader = cmd.ExecuteReader())
|
|
|
- {
|
|
|
- if (reader.Read())
|
|
|
- {
|
|
|
- oBednet = new u_bednet() {
|
|
|
- bednetid = Convert.ToInt32(reader["bednetid"]),
|
|
|
- typename = Convert.ToString(reader["typename"]),
|
|
|
- bednetcode = Convert.ToString(reader["bednetcode"]),
|
|
|
- mattress_width = Convert.ToInt32(reader["mattress_width"]),
|
|
|
- mattress_length = Convert.ToInt32(reader["mattress_length"]),
|
|
|
- mattress_height = Convert.ToInt32(reader["mattress_height"]),
|
|
|
- nottax_factory_cost = Convert.ToDecimal(reader["nottax_factory_cost"])
|
|
|
- };
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- // 匹配失败，自动新建
|
|
|
- if (oBednet.bednetid == null)
|
|
|
- {
|
|
|
+ //if (_bednetMx.Count > 0)
|
|
|
+ //{
|
|
|
+
|
|
|
+ // cmd.CommandText = @"SELECT TOP 1 u_bednet.bednetid
|
|
|
+ // ,u_bednet_type.typename
|
|
|
+ // ,bednetcode
|
|
|
+ // ,mattress_width
|
|
|
+ // ,mattress_length
|
|
|
+ // ,mattress_height
|
|
|
+ // ,nottax_factory_cost
|
|
|
+ // FROM u_bednetmx
|
|
|
+ // INNER JOIN u_bednet on u_bednet.bednetid = u_bednetmx.bednetid
|
|
|
+ // INNER JOIN u_bednet_type on u_bednet_type.bednettypeid = u_bednet.bednettypeid
|
|
|
+ // WHERE u_bednet.bednettypeid = @bednettypeid
|
|
|
+ // AND u_bednet.mattress_width = @mattress_width
|
|
|
+ // AND u_bednet.mattress_length = @mattress_length
|
|
|
+ // AND u_bednet.if_doublenet = @if_doublenet
|
|
|
+ // AND u_bednet.if_doublespring = @if_doublespring
|
|
|
+ // AND u_bednet.snake_wire_diameter = @snake_wire_diameter
|
|
|
+ // AND u_bednet.if_rsorwa = @if_rsorwa
|
|
|
+ // AND u_bednet.if_sponge_drilling = @if_sponge_drilling
|
|
|
+ // AND u_bednet.ifsaleout = 0
|
|
|
+ // AND u_bednet.sponge_mtrlid = @sponge_mtrlid
|
|
|
+ // AND u_bednet.sponge_thickness = @sponge_thickness
|
|
|
+ // AND u_bednet.sponge_height = @sponge_height
|
|
|
+ // AND u_bednet.sponge_tc_mtrlid = @sponge_tc_mtrlid
|
|
|
+ // AND u_bednet.sponge_tc_thickness = @sponge_tc_thickness
|
|
|
+ // AND u_bednet.sponge_tc_height = @sponge_tc_height
|
|
|
+ // AND u_bednet.edge_mtrlid = @edge_mtrlid
|
|
|
+ // AND u_bednet.edge_height = @edge_height
|
|
|
+ // AND u_bednet.felt_mtrlid = @felt_mtrlid
|
|
|
+ // AND u_bednet.felt_qty = @felt_qty
|
|
|
+ // AND u_bednet.felt_x_mtrlid = @felt_x_mtrlid
|
|
|
+ // AND u_bednet.felt_x_qty = @felt_x_qty
|
|
|
+ // AND u_bednet.fork_qty = @fork_qty
|
|
|
+ // AND u_bednet.felt_dscrp = @felt_dscrp
|
|
|
+ // AND u_bednet.duo_qv_str = @duo_qv_str
|
|
|
+ // AND u_bednetmx.bednet_height = @bednet_height
|
|
|
+ // AND u_bednetmx.springid = @springid
|
|
|
+ // AND u_bednetmx.spring_qty_width = @spring_qty_width
|
|
|
+ // AND u_bednetmx.spring_qty_length = @spring_qty_length
|
|
|
+ // AND u_bednetmx.if_side_iron = @if_side_iron
|
|
|
+ // AND u_bednetmx.side_iron_qty = @side_iron_qty
|
|
|
+ // AND u_bednetmx.fabrics2_mtrlid = @fabrics2_mtrlid
|
|
|
+ // AND u_bednetmx.fabrics1_mtrlid = @fabrics1_mtrlid
|
|
|
+ // AND u_bednetmx.if_hard_around = @if_hard_around
|
|
|
+ // AND u_bednetmx.hard_around_springid = @hard_around_springid
|
|
|
+ // AND u_bednetmx.hard_around_row = @hard_around_row
|
|
|
+ // AND u_bednetmx.if_15strip = @if_15strip
|
|
|
+ // ";
|
|
|
+ // cmd.Parameters.Clear();
|
|
|
+ // cmd.Parameters.AddWithValue("@bednettypeid", _bednet.bednettypeid);
|
|
|
+ // cmd.Parameters.AddWithValue("@mattress_width", _bednet.mattress_width);
|
|
|
+ // cmd.Parameters.AddWithValue("@mattress_length", _bednet.mattress_length);
|
|
|
+ // cmd.Parameters.AddWithValue("@if_doublenet", _bednet.if_doublenet);
|
|
|
+ // cmd.Parameters.AddWithValue("@if_doublespring", _bednet.if_doublespring);
|
|
|
+ // cmd.Parameters.AddWithValue("@snake_wire_diameter", _bednet.snake_wire_diameter);
|
|
|
+ // cmd.Parameters.AddWithValue("@if_rsorwa", _bednet.if_rsorwa);
|
|
|
+ // cmd.Parameters.AddWithValue("@if_sponge_drilling", _bednet.if_sponge_drilling);
|
|
|
+ // cmd.Parameters.AddWithValue("@sponge_mtrlid", _bednet.sponge_mtrlid);
|
|
|
+ // cmd.Parameters.AddWithValue("@sponge_thickness", _bednet.sponge_thickness);
|
|
|
+ // cmd.Parameters.AddWithValue("@sponge_height", _bednet.sponge_height);
|
|
|
+ // cmd.Parameters.AddWithValue("@sponge_tc_mtrlid", _bednet.sponge_tc_mtrlid);
|
|
|
+ // cmd.Parameters.AddWithValue("@sponge_tc_thickness", _bednet.sponge_tc_thickness);
|
|
|
+ // cmd.Parameters.AddWithValue("@sponge_tc_height", _bednet.sponge_tc_height);
|
|
|
+ // cmd.Parameters.AddWithValue("@edge_mtrlid", _bednet.edge_mtrlid);
|
|
|
+ // cmd.Parameters.AddWithValue("@edge_height", _bednet.edge_height);
|
|
|
+ // cmd.Parameters.AddWithValue("@felt_mtrlid", _bednet.felt_mtrlid);
|
|
|
+ // cmd.Parameters.AddWithValue("@felt_qty", _bednet.felt_qty);
|
|
|
+ // cmd.Parameters.AddWithValue("@felt_x_mtrlid", _bednet.felt_x_mtrlid);
|
|
|
+ // cmd.Parameters.AddWithValue("@felt_x_qty", _bednet.felt_x_qty);
|
|
|
+ // cmd.Parameters.AddWithValue("@felt_dscrp", _bednet.felt_dscrp);
|
|
|
+ // cmd.Parameters.AddWithValue("@duo_qv_str", _bednet.duo_qv_str);
|
|
|
+ // cmd.Parameters.AddWithValue("@fork_qty", _bednet.iffork == 1 ? _bednet_fork_qty : 0);
|
|
|
+ // cmd.Parameters.AddWithValue("@bednet_height", _bednetMx[0].bednet_height);
|
|
|
+ // cmd.Parameters.AddWithValue("@springid", _bednetMx[0].springid);
|
|
|
+ // cmd.Parameters.AddWithValue("@spring_qty_width", _spring_qty_width);
|
|
|
+ // cmd.Parameters.AddWithValue("@spring_qty_length", _spring_qty_length);
|
|
|
+ // cmd.Parameters.AddWithValue("@if_side_iron", _bednetMx[0].if_side_iron);
|
|
|
+ // cmd.Parameters.AddWithValue("@side_iron_qty", _bednetMx[0].side_iron_qty);
|
|
|
+ // cmd.Parameters.AddWithValue("@fabrics2_mtrlid", _bednetMx[0].fabrics2_mtrlid);
|
|
|
+ // cmd.Parameters.AddWithValue("@fabrics1_mtrlid", _bednetMx[0].fabrics1_mtrlid);
|
|
|
+ // cmd.Parameters.AddWithValue("@if_hard_around", _bednetMx[0].if_hard_around);
|
|
|
+ // cmd.Parameters.AddWithValue("@hard_around_springid", _bednetMx[0].hard_around_springid);
|
|
|
+ // cmd.Parameters.AddWithValue("@hard_around_row", _bednetMx[0].hard_around_row);
|
|
|
+ // cmd.Parameters.AddWithValue("@if_15strip", _bednetMx[0].if_15strip);
|
|
|
+ // using (var reader = cmd.ExecuteReader())
|
|
|
+ // {
|
|
|
+ // if (reader.Read())
|
|
|
+ // {
|
|
|
+ // oBednet = new u_bednet() {
|
|
|
+ // bednetid = Convert.ToInt32(reader["bednetid"]),
|
|
|
+ // typename = Convert.ToString(reader["typename"]),
|
|
|
+ // bednetcode = Convert.ToString(reader["bednetcode"]),
|
|
|
+ // mattress_width = Convert.ToInt32(reader["mattress_width"]),
|
|
|
+ // mattress_length = Convert.ToInt32(reader["mattress_length"]),
|
|
|
+ // mattress_height = Convert.ToInt32(reader["mattress_height"]),
|
|
|
+ // nottax_factory_cost = Convert.ToDecimal(reader["nottax_factory_cost"])
|
|
|
+ // };
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+
|
|
|
+ // if (_bednetSpring.Count>0)
|
|
|
+ // {
|
|
|
+
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+
|
|
|
+ // 匹配失败，自动新建
|
|
|
+ //if (oBednet.bednetid == null)
|
|
|
+ //{
|
|
|
+ /// 20250714 副规格的床网，不匹配查找，直接新建
|
|
|
oBednet = _bednet;
|
|
|
_bednetMx[0].spring_qty_width = _spring_qty_width;
|
|
|
_bednetMx[0].spring_qty_length = _spring_qty_length;
|
|
|
@@ -376,7 +382,7 @@ namespace JLHHJSvr.Excutor
|
|
|
helperBednet.GetSpringListQty(oBednet, _bednetMx[0], ref _bednetSpring);
|
|
|
|
|
|
helperBednet.SaveBedNet(oBednet, _bednetMx, _bednetSpring);
|
|
|
- }
|
|
|
+ //}
|
|
|
|
|
|
var _mtrlname = oBednet.typename +
|
|
|
" " +
|
