diff --git a/src/main/java/com/xujie/sys/modules/ecss/entity/PropertyModelHeaderData.java b/src/main/java/com/xujie/sys/modules/ecss/entity/PropertyModelHeaderData.java index cf9acf16..c1f8d6e8 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/entity/PropertyModelHeaderData.java +++ b/src/main/java/com/xujie/sys/modules/ecss/entity/PropertyModelHeaderData.java @@ -23,6 +23,7 @@ public class PropertyModelHeaderData extends PropertyModelHeader { private String group; private String partNo; + private String brand; private String functionTypeDesc; private String functionGroupDesc; private List list; diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java index 8e8e222e..3e72bc33 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java @@ -2498,6 +2498,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService { inData.setBuNo(eorder.get("BuNo")!=null?eorder.get("BuNo").toString():""); inData.setCodeNo(eorder.get("codeNo")!=null?eorder.get("codeNo").toString():""); inData.setPartNo(eorder.get("hsCodeDesc")!=null?eorder.get("hsCodeDesc").toString():""); + inData.setBrand(eorder.get("brand")!=null?eorder.get("brand").toString():""); inData.setRecordType("ECSS"); List propertiesList = coDelMapper.getPropertiesListByPartAndCodeNo(inData); StringBuilder properties = new StringBuilder(); diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java index 90ff7f57..f6a80546 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java @@ -1890,6 +1890,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { inData.setBuNo(eorder.get("BuNo")!=null?eorder.get("BuNo").toString():""); inData.setCodeNo(eorder.get("codeNo")!=null?eorder.get("codeNo").toString():""); inData.setPartNo(eorder.get("hsCodeDesc")!=null?eorder.get("hsCodeDesc").toString():""); + inData.setBrand(eorder.get("brand")!=null?eorder.get("brand").toString():""); inData.setRecordType("ECSS"); List propertiesList = coDelMapper.getPropertiesListByPartAndCodeNo(inData); StringBuilder properties = new StringBuilder(); diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java index 1e1a0690..1f0586ae 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java @@ -408,6 +408,7 @@ public class CoDelServiceImpl implements CoDelService { propertiesData.setSite(data.getSite()); propertiesData.setBuNo(data.getBuNo()); propertiesData.setCodeNo(data.getCodeNo()); + propertiesData.setBrand(data.getBrand()); propertiesData.setRecordType("ECSS"); propertiesData.setPartNo(data.getHsCodeDesc()); partInformationMapper.deletePartSubPropertiesValueHeader(propertiesData); @@ -447,6 +448,7 @@ public class CoDelServiceImpl implements CoDelService { propertiesData.setSite(site); propertiesData.setBuNo(inData.getBuNo()); propertiesData.setCodeNo(inData.getCodeNo()); + propertiesData.setBrand(inData.getBrand()); propertiesData.setRecordType("ECSS"); propertiesData.setPartNo(inData.getHsCodeDesc()); partInformationMapper.savePartSubPropertiesValueHeader(propertiesData); @@ -465,6 +467,7 @@ public class CoDelServiceImpl implements CoDelService { propertiesData.setSite(site); propertiesData.setBuNo(inData.getBuNo()); propertiesData.setCodeNo(inData.getCodeNo()); + propertiesData.setBrand(inData.getBrand()); propertiesData.setRecordType("ECSS"); propertiesData.setPartNo(inData.getHsCodeDesc()); List checkValueHeaderData = partInformationMapper.checkValueHeaderData(propertiesData); @@ -504,6 +507,7 @@ public class CoDelServiceImpl implements CoDelService { propertiesData.setSite(inData.getSite()); propertiesData.setBuNo(inData.getBuNo()); propertiesData.setCodeNo(inData.getCodeNo()); + propertiesData.setBrand(inData.getBrand()); propertiesData.setRecordType(inData.getRecordType()); propertiesData.setPartNo(inData.getPartNo()); List checkValueHeaderData = partInformationMapper.checkValueHeaderData(propertiesData); @@ -1493,6 +1497,7 @@ public class CoDelServiceImpl implements CoDelService { inData.setBuNo(eorder.get("BuNo").toString()); inData.setCodeNo(eorder.get("codeNo").toString()); inData.setPartNo(eorder.get("hsCodeDesc").toString()); + inData.setBrand(eorder.get("brand") != null ? eorder.get("brand").toString() : ""); inData.setRecordType("ECSS"); List result = coDelMapper.getPropertiesListByPartAndCodeNo(inData); result = result.stream().filter(item -> item.getItemDesc().equals(data.getBrand())).collect(Collectors.toList()); diff --git a/src/main/java/com/xujie/sys/modules/part/entity/PartSubPropertiesValue.java b/src/main/java/com/xujie/sys/modules/part/entity/PartSubPropertiesValue.java index 6ed82258..666660b3 100644 --- a/src/main/java/com/xujie/sys/modules/part/entity/PartSubPropertiesValue.java +++ b/src/main/java/com/xujie/sys/modules/part/entity/PartSubPropertiesValue.java @@ -21,6 +21,11 @@ public class PartSubPropertiesValue { */ private String codeNo; + /** + * 品牌 + */ + private String brand; + /** * */ diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml index b317358a..4da79a7d 100644 --- a/src/main/resources/mapper/ecss/CoDelMapper.xml +++ b/src/main/resources/mapper/ecss/CoDelMapper.xml @@ -424,6 +424,7 @@ create_by,create_date,update_by,update_date SELECT a.part_no , a.Site , a.code_no + , a.brand , a.sub_code_seq_no , a.sub_code_desc ,a.bu_no @@ -445,6 +446,9 @@ create_by,create_date,update_by,update_date and a.bu_no=#{buNo} and a.code_no = #{codeNo} AND a.part_no = #{partNo,jdbcType=VARCHAR} + + AND ISNULL(a.brand,'无') = ISNULL(#{brand},'无') + order by a.item_no @@ -458,17 +462,21 @@ create_by,create_date,update_by,update_date and sub_code_seq_no = #{subCodeSeqNo} and item_no = #{itemNo} and bu_no=#{buNo} + + and ISNULL(brand,'无') = ISNULL(#{brand},'无') + - insert into part_sub_properties_value ( part_no, site, bu_no, code_no, sub_code_seq_no, sub_code_desc, + insert into part_sub_properties_value ( part_no, site, bu_no, code_no, brand, sub_code_seq_no, sub_code_desc, item_no, properties_item_no, text_value, num_value, record_type) select #{partNo}, #{site}, #{buNo}, #{codeNo}, + #{brand,jdbcType=NVARCHAR}, 1, d.code_desc, #{itemNo,jdbcType=DOUBLE}, @@ -492,6 +500,9 @@ create_by,create_date,update_by,update_date and bu_no=#{buNo} and code_no = #{codeNo} AND part_no = #{partNo,jdbcType=VARCHAR} + + AND ISNULL(brand,'无') = ISNULL(#{brand},'无') + and properties_item_no = #{propertiesItemNo} @@ -503,6 +514,9 @@ create_by,create_date,update_by,update_date and a.bu_no=#{buNo} and a.code_no = #{codeNo} AND a.part_no = #{partNo,jdbcType=VARCHAR} + + AND ISNULL(a.brand,'无') = ISNULL(#{brand},'无') + delete from part_sub_properties_value_header where part_no = #{partNo} and site = #{site} and bu_no = #{buNo} and record_type = #{recordType} + + and ISNULL(brand,'无') = ISNULL(#{brand},'无') + delete from part_sub_properties_value where part_no = #{partNo} and site = #{site} and bu_no = #{buNo} and record_type = #{recordType} + + and ISNULL(brand,'无') = ISNULL(#{brand},'无') + insert into part_sub_properties_value_header - (part_no, site, bu_no, code_no, sub_code_seq_no, sub_code_desc, record_type) + (part_no, site, bu_no, code_no, brand, sub_code_seq_no, sub_code_desc, record_type) select #{partNo}, #{site}, #{buNo}, #{codeNo}, + #{brand,jdbcType=NVARCHAR}, 1, code_desc, #{recordType} @@ -184,12 +194,13 @@ insert into part_sub_properties_value - (part_no, site, bu_no, code_no, sub_code_seq_no, sub_code_desc, item_no, properties_item_no, text_value, num_value, record_type) + (part_no, site, bu_no, code_no, brand, sub_code_seq_no, sub_code_desc, item_no, properties_item_no, text_value, num_value, record_type) select #{partNo}, #{site}, #{buNo}, #{codeNo}, + #{brand,jdbcType=NVARCHAR}, 1, a.code_desc, b.seq_No,