diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/vo/ProductVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/vo/ProductVo.java index fa38476b..3b073ef2 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/vo/ProductVo.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/vo/ProductVo.java @@ -44,6 +44,12 @@ public class ProductVo implements Serializable { @Excel(name = "产品编码") private String productCode; + /** + * 仓储产品编号 + */ + @Excel(name = "仓储编号") + private String wmsCode; + /** * 所属分类 */ @@ -277,9 +283,5 @@ public class ProductVo implements Serializable { */ private Integer pkCubasdoc; - /** - * 仓储产品编号 - */ - private String wmsCode; } diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/product/BdProductMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/product/BdProductMapper.xml index afd6b628..ccecf167 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/product/BdProductMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/product/BdProductMapper.xml @@ -76,6 +76,7 @@ + select - bp.PK_ID,bp.PRODUCT_CODE,bp.PRODUCT_NAME,bp.PK_CLASSIFY,bp.COVER,bp.SHIPPING_CHANNEL,bp.LENGTH,bp.WIDTH,bp.HEIGHT,bp.WEIGHT,bp.POSTAGE_WEIGHT,bp.UNIT, + bp.PK_ID,bp.PRODUCT_CODE,bp.PRODUCT_NAME,bp.PK_CLASSIFY,bp.COVER,bp.SHIPPING_CHANNEL, + bp.LENGTH,bp.WIDTH,bp.HEIGHT,bp.WEIGHT,bp.POSTAGE_WEIGHT,bp.UNIT, bp.PRODUCT_ATTR,bp.RETAIL_PRICE,bp.SHELF_LIFE,bp.IS_FRESH, (select REPLACE(wm_concat(st.TYPE_NAME),',','/') from BD_PRODUCT_SPECS ps left join BD_SPECS_TYPE st on st.PK_ID = ps.PK_SPECS_TYPE where ps.PK_PRODUCT = bp.PK_ID and ps.DEL_FLAG = '0') productSpecType, - pe.IS_GIFT,pe.IS_PICK_UP,pe.IS_PRIZE,pe.IS_BAR_CODE,pe.IS_MERGE,pe.IS_LAND_TRANS - ,pe.IS_AIR_TRANS,pe.IS_OCEAN_TRANS,pe.SORT,bp.CREATION_TIME, - bu.NAME unitVal,bc.CUST_NAME custName,pe.IS_PUT_ON,bp.LISTING_TIME,bp.REMOVAL_TIME - + pe.IS_GIFT,pe.IS_PICK_UP,pe.IS_PRIZE,pe.IS_BAR_CODE,pe.IS_MERGE,pe.IS_LAND_TRANS, + pe.IS_AIR_TRANS,pe.IS_OCEAN_TRANS,pe.SORT,bp.CREATION_TIME, + bu.NAME unitVal,bc.CUST_NAME custName,pe.IS_PUT_ON,bp.LISTING_TIME,bp.REMOVAL_TIME, + bp.wms_code, bcl.name classify_name from BD_PRODUCT bp left join BD_PRODUCT_EXTEND pe on pe.PK_PRODUCT = bp.PK_ID left join BD_UNIT bu on bu.PK_ID = bp.UNIT left join BD_CUBASDOC bc on bc.pk_id = bp.PK_CUBASDOC - where 1 = 1 and bp.DEL_FLAG = '0' + left join BD_CLASSIFY bcl on bcl.pk_id = bp.PK_CLASSIFY + where 1 = 1 and bp.DEL_FLAG = 0 and (select count(ps.PK_ID) from BD_PRODUCT_SPECS ps where bp.PK_ID = ps.PK_PRODUCT and ps.del_flag = 0) > 0 @@ -163,6 +166,9 @@ and bp.CREATION_TIME <= #{endCreateDate} + + and bp.wms_code = #{wmsCode} + order by pe.SORT desc