diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcPartAttributeData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcPartAttributeData.java index 2c1f256a..f4e2c50f 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/QcPartAttributeData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/QcPartAttributeData.java @@ -33,6 +33,16 @@ public class QcPartAttributeData extends QueryPage { // 备注 private String attributeRemark; + private String spec; + + public String getSpec() { + return spec; + } + + public void setSpec(String spec) { + this.spec = spec; + } + public String getSku() { return sku; } diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 5c31c3d0..e29e26aa 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -645,7 +645,7 @@ (site, bu_no, template_id, ItemNo, default_value, max_value, min_value) VALUES - (#{item.site}, #{item.buNo}, #{item.templateId}, #{item.itemNo}, #{item.defaultValue}, #{item.maxValue}, #{item.minValue}) + (#{item.site}, #{item.buNo}, #{item.templateId}, #{item.itemNo}, #{item.defaultValue}, #{item.maxValue,jdbcType=DECIMAL}, #{item.minValue,jdbcType=DECIMAL}) @@ -662,8 +662,7 @@ ItemRemark, ItemType FROM eam_properties_item - WHERE ItemNo = #{itemNo} - AND ItemType = #{itemType} + WHERE ItemNo = #{itemNo} AND ItemType = #{itemType} @@ -975,7 +974,8 @@ dbo.qc_get_cinv_source_code(p.part_no) as cinvSourceCode, dbo.qc_get_sku(part_no) as sku, p.FamilyID, - p.spec as FamilyName, + p.invtype as familyName, + p.spec, p.umid, qa.supplier_no, dbo.qc_get_supplier_name(qa.site, qa.supplier_no) as supplierDesc, @@ -1008,7 +1008,7 @@ AND dbo.qc_get_sku(part_no) LIKE '%' + #{query.sku}+'%' - AND p.spec LIKE '%' + #{query.familyName}+'%' + AND p.invtype LIKE '%' + #{query.familyName}+'%'