diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEntity.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEntity.java
index e2765b2e..b9bf244b 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEntity.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/CommodityCodeEntity.java
@@ -189,6 +189,16 @@ public class CommodityCodeEntity implements Serializable {
      */
     private String jdc;
 
+    /**
+     * mdm物料分类编码
+     */
+    private String wlflbm;
+
+    /**
+     * mdm物料分类名称
+     */
+    private String wlflmc;
+
     private String UUID;
     private Boolean success;
 
diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
index 0f203011..8e7cef07 100644
--- a/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
+++ b/order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
@@ -38,6 +38,8 @@
         <result column="cpy" jdbcType="VARCHAR" property="cpy"/>
         <result column="bmb_bbh" jdbcType="VARCHAR" property="bmbBbh"/>
         <result column="jdc" jdbcType="VARCHAR" property="jdc"/>
+        <result column="wlflbm" jdbcType="VARCHAR" property="wlflbm"/>
+        <result column="wlflmc" jdbcType="VARCHAR" property="wlflmc"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -45,7 +47,7 @@
         tax_rate, specification_model, metering_unit, unit_price, tax_logo, hide_the_logo,
         enjoy_preferential_policies, tax_class_code, tax_classification_name, preferential_policies_type,zzstsgl,
         user_id, create_time, modify_time, modify_user_id, group_id,enterprise_name,data_source,
-        matching_state,data_state,tax_class_abbreviation,description,collect_ident,cpy,bmb_bbh,jdc
+        matching_state,data_state,tax_class_abbreviation,description,collect_ident,cpy,bmb_bbh,jdc,wlflbm,wlflmc
     </sql>
 
 
@@ -87,6 +89,8 @@
         cc.jdc,
         cc.bmb_bbh,
         gc.group_name
+        cc.wlflbm,
+        cc.wlflmc,
         FROM
         commodity_code cc LEFT JOIN group_commodity gc
         ON gc.id = cc.group_id
@@ -107,6 +111,7 @@
                     #{item}
                 </foreach>
             </if>
+               and cc.xhf_nsrsbh != '-1'
             <!-- 商品编码表ID-->
             <if test="map.id != null and map.id != ''">
                 AND cc.id = #{map.id,jdbcType=VARCHAR}
@@ -311,6 +316,12 @@
             <if test="commodityCode.jdc != null">
                 jdc = #{commodityCode.jdc,jdbcType=VARCHAR},
             </if>
+            <if test="commodityCode.wlflbm != null">
+                wlflbm = #{commodityCode.wlflbm,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.wlflmc != null">
+                wlflmc = #{commodityCode.wlflmc,jdbcType=VARCHAR},
+            </if>
         </set>
         <where>
             <if test="commodityCode.id != null and commodityCode.id != ''">
@@ -439,6 +450,12 @@
             <if test="jdc != null">
                 jdc,
             </if>
+            <if test="wlflbm != null">
+                wlflbm,
+            </if>
+            <if test="wlflmc != null">
+                wlflmc,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -545,6 +562,12 @@
             <if test="jdc != null">
                 #{jdc,jdbcType=VARCHAR},
             </if>
+            <if test="wlflbm != null">
+                #{wlflbm,jdbcType=VARCHAR},
+            </if>
+            <if test="wlflmc != null">
+                #{wlflmc,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
 
@@ -651,6 +674,12 @@
             <if test="jdc != null">
                 jdc,
             </if>
+            <if test="wlflbm != null">
+                wlflbm,
+            </if>
+            <if test="wlflmc != null">
+                wlflmc,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -757,6 +786,12 @@
             <if test="jdc != null">
                 #{jdc,jdbcType=VARCHAR},
             </if>
+            <if test="wlflbm != null">
+                #{wlflbm,jdbcType=VARCHAR},
+            </if>
+            <if test="wlflmc != null">
+                #{wlflmc,jdbcType=VARCHAR},
+            </if>
         </trim>
         ON DUPLICATE KEY UPDATE
         <trim suffixOverrides=",">
@@ -858,6 +893,12 @@
             <if test="jdc != null">
                 jdc = VALUES(jdc),
             </if>
+            <if test="wlflbm != null">
+                wlflbm = VALUES(wlflbm),
+            </if>
+            <if test="wlflmc != null">
+                wlflmc = VALUES(wlflmc),
+            </if>
         </trim>
     </insert>
 
@@ -975,6 +1016,7 @@
                         #{item}
                     </foreach>
                 </if>
+                and cc.xhf_nsrsbh != '-1'
             </where>
 
         limit 1000
@@ -989,6 +1031,7 @@
         WHERE t.collect_ident is null
         AND t.matching_state = '0'
         AND t.data_state = '0'
+        and t.xhf_nsrsbh != '-1'
         AND (
         t.data_source = '1'
         OR t.data_source = '2'
@@ -1043,6 +1086,7 @@
                 #{item}
             </foreach>
         </if>
+        and xhf_nsrsbh != '-1'
         </where>
 
     </select>
@@ -1092,6 +1136,7 @@
                 #{item}
             </foreach>
         </if>
+        and cc.xhf_nsrsbh != '-1'
     </select>
 
 
@@ -1143,6 +1188,7 @@
                 <if test='map.jdclx == "0"'>
                     AND cc.jdc = 'N'
                 </if>
+                and cc.xhf_nsrsbh != '-1'
             </where>
             <choose>
                 <when test="map.orderBy !=null and map.orderBy == '0' ">
@@ -1198,6 +1244,7 @@
                 <if test='map.jdclx=="0"'>
                     AND cc.jdc = 'N'
                 </if>
+                and cc.xhf_nsrsbh != '-1'
             </where>
             <choose>
                 <when test="map.orderBy !=null and map.orderBy == '0' ">
diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/GroupCommodityMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
similarity index 100%
rename from order-management-base-service/src/main/resources/mybatis/mapper/GroupCommodityMapper.xml
rename to order-management-base-service/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/GroupCommodityCodeMapper.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/GroupCommodityCodeMapper.java
new file mode 100644
index 00000000..d8dc9eb2
--- /dev/null
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/GroupCommodityCodeMapper.java
@@ -0,0 +1,35 @@
+package com.dxhy.order.consumer.dao;
+
+import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Description 集团物料库 集团物料库和
+ * @Author 巩权林
+ * @Date 2023/3/9 10:36
+ **/
+public interface GroupCommodityCodeMapper {
+
+    /**
+     * 查询集团物料库
+     *
+     * @param commodityCodeEntity
+     * @return
+     */
+    List<CommodityCodeEntity> queryGroupCommodityCodeList(CommodityCodeEntity commodityCodeEntity);
+
+
+    /**
+     * 根据物料编码和销方税号查询物料信息
+     *
+     * @param zxbm
+     * @param xhfNsrsbh
+     * @return
+     */
+    CommodityCodeEntity queryCommodityCodeByZxbmAndXhfNsrsbh(@Param("zxbm") String zxbm, @Param("xhfNsrsbh") String xhfNsrsbh);
+
+
+    int insertCommodityCode(CommodityCodeEntity entity);
+}
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityCodeController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityCodeController.java
new file mode 100644
index 00000000..3d2d4017
--- /dev/null
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityCodeController.java
@@ -0,0 +1,51 @@
+package com.dxhy.order.consumer.modules.commodity.controller;
+
+import cn.hutool.json.JSONObject;
+import com.dxhy.order.consumer.modules.commodity.domain.dto.QueryGroupCommodityDTO;
+import com.dxhy.order.consumer.modules.commodity.domain.dto.QuoteGroupCommodityDTO;
+import com.dxhy.order.consumer.modules.commodity.service.IGroupCommodityCodeService;
+import com.dxhy.order.model.PageUtils;
+import com.dxhy.order.model.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @Description 集团物料库
+ * @Author 巩权林
+ * @Date 2023/3/9 08:19
+ **/
+@RequestMapping(value = "/groupCommodity")
+@RestController
+@Slf4j
+public class GroupCommodityCodeController {
+
+    private final static String LOGGER_MSG = "(集团物料库)";
+
+    @Autowired
+    private IGroupCommodityCodeService groupCommodityCodeService;
+
+    @GetMapping("/list")
+    public R list(QueryGroupCommodityDTO queryGroupCommodityDTO) {
+        try {
+            PageUtils pageUtil = groupCommodityCodeService.queryGroupCommodityCodeList(queryGroupCommodityDTO);
+            return R.ok().put("page", pageUtil);
+        } catch (NumberFormatException e) {
+            log.error("{},分页参数类型转换异常：{}", LOGGER_MSG, e.getMessage());
+            return R.error("商品信息列表查询异常");
+        }
+    }
+
+    /**
+     * 物料引用
+     *
+     * @return
+     */
+    @PostMapping("/quote")
+    public R quote(@RequestBody @Validated QuoteGroupCommodityDTO dto) {
+        return groupCommodityCodeService.quoteGroupCommodityCode(dto);
+    }
+}
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityController.java
deleted file mode 100644
index 91708379..00000000
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.dxhy.order.consumer.modules.commodity.controller;
-
-import com.dxhy.order.model.R;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @Description 集团物料库
- * @Author 巩权林
- * @Date 2023/3/9 08:19
- **/
-@RequestMapping(value = "/groupCommodity")
-@RestController
-public class GroupCommodityController {
-
-    @PostMapping("/list")
-    public R list() {
-
-    }
-}
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/PageBaseDTO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/PageBaseDTO.java
new file mode 100644
index 00000000..a6b10058
--- /dev/null
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/PageBaseDTO.java
@@ -0,0 +1,30 @@
+package com.dxhy.order.consumer.modules.commodity.domain.dto;
+
+import lombok.Data;
+
+/**
+ * @Description 带分页的基础dto
+ * @Author 巩权林
+ * @Date 2023/3/9 10:09
+ **/
+public class PageBaseDTO {
+
+    private Integer currPage;
+    private Integer pageSize;
+
+    public Integer getCurrPage() {
+        return currPage == null ? 0 : currPage;
+    }
+
+    public void setCurrPage(Integer currPage) {
+        this.currPage = currPage;
+    }
+
+    public Integer getPageSize() {
+        return pageSize == null ? 0 : pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+}
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/QueryGroupCommodityDTO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/QueryGroupCommodityDTO.java
index 7b44ce75..3db07c0f 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/QueryGroupCommodityDTO.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/QueryGroupCommodityDTO.java
@@ -1,6 +1,11 @@
 package com.dxhy.order.consumer.modules.commodity.domain.dto;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
 
 /**
  * @Description 集团物料编码查询
@@ -8,6 +13,20 @@ import lombok.Data;
  * @Date 2023/3/9 08:22
  **/
 @Data
-public class QueryGroupCommodityDTO {
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class QueryGroupCommodityDTO extends PageBaseDTO {
+
+    // 物料分类编码
+    private String wlflbm;
+
+    // 物料分类名称
+    private String wlflmc;
+
+    // 物料自行编码
+    private String zxbm;
 
+    // 物料名称
+    private String xmmc;
 }
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/QuoteGroupCommodityDTO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/QuoteGroupCommodityDTO.java
new file mode 100644
index 00000000..2ae712b2
--- /dev/null
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/domain/dto/QuoteGroupCommodityDTO.java
@@ -0,0 +1,23 @@
+package com.dxhy.order.consumer.modules.commodity.domain.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description 引用物料
+ * @Author 巩权林
+ * @Date 2023/3/9 11:01
+ **/
+@Data
+public class QuoteGroupCommodityDTO {
+
+    /**
+     * 自行编码
+     */
+    @NotBlank(message = "物料编码不能为空！")
+    private String zxbm;
+
+    @NotBlank(message = "接收引用物料的销方纳税人识别号不能为空！")
+    private String xhfNsrsbh;
+}
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/IGroupCommodityCodeService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/IGroupCommodityCodeService.java
new file mode 100644
index 00000000..881d1f71
--- /dev/null
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/IGroupCommodityCodeService.java
@@ -0,0 +1,20 @@
+package com.dxhy.order.consumer.modules.commodity.service;
+
+import com.dxhy.order.consumer.modules.commodity.domain.dto.QueryGroupCommodityDTO;
+import com.dxhy.order.consumer.modules.commodity.domain.dto.QuoteGroupCommodityDTO;
+import com.dxhy.order.model.PageUtils;
+import com.dxhy.order.model.R;
+
+import java.util.List;
+
+/**
+ * @Description 集团物料库
+ * @Author 巩权林
+ * @Date 2023/3/9 10:06
+ **/
+public interface IGroupCommodityCodeService {
+
+    PageUtils queryGroupCommodityCodeList(QueryGroupCommodityDTO queryGroupCommodityDTO);
+
+    R quoteGroupCommodityCode(QuoteGroupCommodityDTO quoteGroupCommodityDTO);
+}
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java
new file mode 100644
index 00000000..2ed9fa03
--- /dev/null
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/service/impl/GroupCommodityCodeServiceImpl.java
@@ -0,0 +1,116 @@
+package com.dxhy.order.consumer.modules.commodity.service.impl;
+
+import com.dxhy.order.baseservice.module.base.service.BaseService;
+import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity;
+import com.dxhy.order.constant.ConfigureConstant;
+import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper;
+import com.dxhy.order.consumer.modules.commodity.domain.dto.QueryGroupCommodityDTO;
+import com.dxhy.order.consumer.modules.commodity.domain.dto.QuoteGroupCommodityDTO;
+import com.dxhy.order.consumer.modules.commodity.service.IGroupCommodityCodeService;
+import com.dxhy.order.model.PageUtils;
+import com.dxhy.order.model.R;
+import com.dxhy.order.utils.CommonUtils;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Description
+ * @Author 巩权林
+ * @Date 2023/3/9 10:06
+ **/
+@Service
+@Slf4j
+public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService {
+
+    private final static String LOGGER_MSG = "(集团物料库)";
+
+    @Autowired
+    private GroupCommodityCodeMapper groupCommodityMapper;
+
+    @Resource
+    private BaseService baseService;
+
+    /**
+     * 查询集团物料库
+     *
+     * @param queryGroupCommodityDTO
+     * @param shList
+     * @return
+     */
+    @Override
+    public PageUtils queryGroupCommodityCodeList(QueryGroupCommodityDTO queryGroupCommodityDTO) {
+        int pageSize = queryGroupCommodityDTO.getPageSize();
+        int currPage = queryGroupCommodityDTO.getCurrPage();
+        PageHelper.startPage(currPage, pageSize);
+        CommodityCodeEntity query = new CommodityCodeEntity();
+        query.setWlflbm(queryGroupCommodityDTO.getWlflbm());
+        query.setWlflmc(queryGroupCommodityDTO.getWlflmc());
+        query.setZxbm(queryGroupCommodityDTO.getZxbm());
+        query.setXmmc(queryGroupCommodityDTO.getXmmc());
+        List<CommodityCodeEntity> result = groupCommodityMapper.queryGroupCommodityCodeList(query);
+        result = result.stream().map(i -> {
+            if (StringUtils.isNotEmpty(i.getSl())) {
+                i.setSl(CommonUtils.formatSl(i.getSl()));
+            }
+            return i;
+        }).collect(Collectors.toList());
+        PageInfo<CommodityCodeEntity> pageInfo = new PageInfo<>(result);
+        return new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), pageInfo.getPageNum());
+    }
+
+    /**
+     * 引用物料
+     *
+     * @param quoteGroupCommodityDTO
+     * @return
+     */
+    @Override
+    public R quoteGroupCommodityCode(QuoteGroupCommodityDTO quoteGroupCommodityDTO) {
+        // 判断销方税号是否合法，因为某些情况下可能会传递list过来
+        if (StringUtils.isBlank(quoteGroupCommodityDTO.getXhfNsrsbh())) {
+            return R.error(ConfigureConstant.STRING_0000, "销方税号不能为空");
+        }
+
+        if (quoteGroupCommodityDTO.getXhfNsrsbh().contains(ConfigureConstant.STRING_CHARSET_1)) {
+            return R.error(ConfigureConstant.STRING_0000, "销方税号非法");
+        }
+
+        CommodityCodeEntity commodityCodeEntity = groupCommodityMapper.queryCommodityCodeByZxbmAndXhfNsrsbh(quoteGroupCommodityDTO.getZxbm(), quoteGroupCommodityDTO.getXhfNsrsbh());
+        // 根据文档4.2.1.2 (6) 若物料编码重复时，引用后不对子公司物料进行更新
+        if (commodityCodeEntity != null) {
+            return R.ok();
+        }
+
+        commodityCodeEntity = groupCommodityMapper.queryCommodityCodeByZxbmAndXhfNsrsbh(quoteGroupCommodityDTO.getZxbm(), "-1");
+        if (commodityCodeEntity == null) {
+            return R.error("引用失败，集团物料不存在");
+        }
+
+        CommodityCodeEntity newCommodityCodeEntity = new CommodityCodeEntity();
+        try {
+            BeanUtils.copyProperties(newCommodityCodeEntity, commodityCodeEntity);
+        } catch (IllegalAccessException e) {
+            log.error("{}引用物料异常", LOGGER_MSG, e);
+        } catch (InvocationTargetException e) {
+            log.error("{}引用物料异常", LOGGER_MSG, e);
+        }
+
+        newCommodityCodeEntity.setId(baseService.getGenerateShotKey());
+        newCommodityCodeEntity.setXhfNsrsbh(quoteGroupCommodityDTO.getXhfNsrsbh());
+        if (groupCommodityMapper.insertCommodityCode(newCommodityCodeEntity) > 0) {
+            return R.ok();
+        } else {
+            return R.error("引用失败");
+        }
+    }
+}
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncGroupTaxCodeReqBO.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncGroupTaxCodeReqBO.java
index 07552f35..57515382 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncGroupTaxCodeReqBO.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmSyncGroupTaxCodeReqBO.java
@@ -16,6 +16,12 @@ public class MdmSyncGroupTaxCodeReqBO {
     private String DESCSHORT;
     private String UUID;
 
+    // 物料分类编码
+    private String CATEGORYNAME;
+
+    // 物料分类名称
+    private String CATEGORYCODE;
+
     public void setCODE(String CODE) {
         this.CODE = CODE;
     }
@@ -56,4 +62,19 @@ public class MdmSyncGroupTaxCodeReqBO {
         return UUID;
     }
 
+    public String getCATEGORYNAME() {
+        return CATEGORYNAME;
+    }
+
+    public void setCATEGORYNAME(String CATEGORYNAME) {
+        this.CATEGORYNAME = CATEGORYNAME;
+    }
+
+    public String getCATEGORYCODE() {
+        return CATEGORYCODE;
+    }
+
+    public void setCATEGORYCODE(String CATEGORYCODE) {
+        this.CATEGORYCODE = CATEGORYCODE;
+    }
 }
\ No newline at end of file
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java
index 4274b994..8cdf99fc 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java
@@ -1,6 +1,7 @@
 package com.dxhy.order.consumer.openapi.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.dxhy.order.baseservice.module.base.service.BaseService;
 import com.dxhy.order.baseservice.module.buyer.dao.BuyerMapper;
 import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity;
 import com.dxhy.order.baseservice.module.commodity.dao.CommodityMapper;
@@ -19,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -43,6 +45,9 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
     @Autowired
     private UserInfoService userInfoService;
 
+    @Resource
+    private BaseService baseService;
+
     @Override
     public AjaxResult syncBuyerMessage(List<MdmGmfxxtbReqBO> mdmGmfxxtbReqBOS, String requestBody) {
         // 存表
@@ -156,6 +161,9 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
             commodityCodeEntity.setCreateTime(new Date());
             commodityCodeEntity.setBz(reqBO.getDESCSHORT());
             commodityCodeEntity.setUUID(reqBO.getUUID());
+            commodityCodeEntity.setWlflbm(reqBO.getCATEGORYCODE());
+            commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME());
+            commodityCodeEntity.setCommodityId(baseService.getGenerateShotKey());
             commodityCodeEntity.setXhfNsrsbh("-1");
             if (commodityMapper.insertCommodityOnDuplicateKey(commodityCodeEntity) > 0) {
                 commodityCodeEntity.setSuccess(true);
diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
new file mode 100644
index 00000000..fecca133
--- /dev/null
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
@@ -0,0 +1,1395 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.dxhy.order.consumer.dao.GroupCommodityCodeMapper">
+    <resultMap id="commodityCodeResultMap" type="com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity">
+        <id column="id" jdbcType="VARCHAR" property="id"/>
+        <result column="commodity_id" jdbcType="VARCHAR" property="commodityId"/>
+        <result column="sort_id" jdbcType="BIGINT" property="sortId"/>
+        <result column="xhf_nsrsbh" jdbcType="VARCHAR" property="xhfNsrsbh"/>
+        <result column="merchandise_name" jdbcType="VARCHAR" property="xmmc"/>
+        <result column="encoding" jdbcType="VARCHAR" property="zxbm"/>
+        <result column="tax_items" jdbcType="VARCHAR" property="spsm"/>
+        <result column="brief_code" jdbcType="VARCHAR" property="spjm"/>
+        <result column="tax_rate" jdbcType="VARCHAR" property="sl"/>
+        <result column="specification_model" jdbcType="VARCHAR" property="ggxh"/>
+        <result column="metering_unit" jdbcType="VARCHAR" property="xmdw"/>
+        <result column="unit_price" jdbcType="VARCHAR" property="xmdj"/>
+        <result column="tax_logo" jdbcType="VARCHAR" property="hsbz"/>
+        <result column="hide_the_logo" jdbcType="VARCHAR" property="ycbz"/>
+        <result column="enjoy_preferential_policies" jdbcType="VARCHAR" property="yhzcbs"/>
+        <result column="tax_class_code" jdbcType="VARCHAR" property="spbm"/>
+        <result column="tax_classification_name" jdbcType="VARCHAR" property="ssflMc"/>
+        <result column="preferential_policies_type" jdbcType="VARCHAR" property="lslbs"/>
+        <result column="zzstsgl" jdbcType="VARCHAR" property="zzstsgl"/>
+        <result column="user_id" jdbcType="VARCHAR" property="userId"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime"/>
+        <result column="modify_user_id" jdbcType="CHAR" property="modifyUserId"/>
+        <result column="group_id" jdbcType="VARCHAR" property="groupId"/>
+        <result column="group_name" jdbcType="VARCHAR" property="groupName"/>
+        <result column="enterprise_name" jdbcType="VARCHAR" property="xhfMc"/>
+        <result column="data_source" jdbcType="VARCHAR" property="dataSource"/>
+        <result column="matching_state" jdbcType="VARCHAR" property="matchingState"/>
+        <result column="data_state" jdbcType="VARCHAR" property="dataState"/>
+        <result column="tax_class_abbreviation" jdbcType="VARCHAR" property="spjc"/>
+        <result column="description" jdbcType="VARCHAR" property="bz"/>
+        <result column="collect_ident" jdbcType="VARCHAR" property="collectIdent"/>
+        <result column="cpy" jdbcType="VARCHAR" property="cpy"/>
+        <result column="bmb_bbh" jdbcType="VARCHAR" property="bmbBbh"/>
+        <result column="jdc" jdbcType="VARCHAR" property="jdc"/>
+        <result column="wlflbm" jdbcType="VARCHAR" property="wlflbm"/>
+        <result column="wlflmc" jdbcType="VARCHAR" property="wlflmc"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id
+        , commodity_id, sort_id, xhf_nsrsbh, merchandise_name,encoding, tax_items, brief_code,
+        tax_rate, specification_model, metering_unit, unit_price, tax_logo, hide_the_logo,
+        enjoy_preferential_policies, tax_class_code, tax_classification_name, preferential_policies_type,zzstsgl,
+        user_id, create_time, modify_time, modify_user_id, group_id,enterprise_name,data_source,
+        matching_state,data_state,tax_class_abbreviation,description,collect_ident,cpy,bmb_bbh,jdc,wlflbm,wlflmc
+    </sql>
+
+    <sql id="baseSelect">
+        SELECT cc.id,
+               cc.commodity_id,
+               cc.sort_id,
+               cc.xhf_nsrsbh,
+               cc.merchandise_name,
+               cc.tax_items,
+               cc.brief_code,
+               cc.tax_rate,
+               cc.specification_model,
+               cc.metering_unit,
+               cc.unit_price,
+               cc.tax_logo,
+               cc.hide_the_logo,
+               cc.enjoy_preferential_policies,
+               cc.tax_class_code,
+               cc.tax_classification_name,
+               cc.preferential_policies_type,
+               cc.zzstsgl,
+               cc.user_id,
+               cc.create_time,
+               cc.modify_time,
+               cc.modify_user_id,
+               cc.encoding,
+               cc.group_id,
+               cc.enterprise_name,
+               cc.data_source,
+               cc.matching_state,
+               cc.data_state,
+               cc.tax_class_abbreviation,
+               cc.description,
+               cc.cpy,
+               cc.jdc,
+               cc.bmb_bbh,
+               gc.group_name,
+               cc.wlflbm,
+               cc.wlflmc
+        FROM commodity_code cc
+                 LEFT JOIN group_commodity gc
+                           ON gc.id = cc.group_id
+    </sql>
+
+
+    <!-- 查询集团物料库 -->
+    <select id="queryGroupCommodityCodeList" resultMap="commodityCodeResultMap">
+        <bind name="dataType" value="${dataType}"/>
+        <include refid="baseSelect"/>
+        <where>
+            <if test="wlflbm != null and wlflbm != ''">
+                AND cc.wlflbm LIKE CONCAT('%',#{wlflbm},'%')
+            </if>
+            <if test="wlflmc != null and wlflmc != ''">
+                AND cc.wlflmc LIKE CONCAT('%',#{wlflmc},'%')
+            </if>
+            <if test="zxbm != null and zxbm != ''">
+                AND cc.zxbm LIKE CONCAT('%',#{zxbm},'%')
+            </if>
+            <if test="xmmc != null and xmmc != ''">
+                AND cc.xmmc LIKE CONCAT('%',#{xmmc},'%')
+            </if>
+            AND cc.xhf_nsrsbh = '-1'
+        </where>
+
+        ORDER BY cc.create_time DESC
+    </select>
+
+    <select id="queryCommodityCodeByZxbmAndXhfNsrsbh" resultMap="commodityCodeResultMap">
+        <bind name="dataType" value="${dataType}"/>
+        <include refid="baseSelect"/>
+        where cc.encoding = #{zxbm} AND cc.xhf_nsrsbh = #{xhfNsrsbh}
+        ORDER BY cc.create_time DESC limit 1
+    </select>
+
+    <insert id="insertCommodityCode"
+            parameterType="com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity">
+        <bind name="dataType" value="${dataType}"/>
+
+        insert into commodity_code
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="commodityId != null">
+                commodity_id,
+            </if>
+            <if test="sortId != null">
+                sort_id,
+            </if>
+            <if test="xhfNsrsbh != null">
+                xhf_nsrsbh,
+            </if>
+            <if test="xmmc != null">
+                merchandise_name,
+            </if>
+            <if test="zxbm != null">
+                encoding,
+            </if>
+            <if test="spsm != null">
+                tax_items,
+            </if>
+            <if test="spjm != null">
+                brief_code,
+            </if>
+            <if test="sl != null">
+                tax_rate,
+            </if>
+            <if test="ggxh != null">
+                specification_model,
+            </if>
+            <if test="xmdw != null">
+                metering_unit,
+            </if>
+            <if test="xmdj != null">
+                unit_price,
+            </if>
+            <if test="hsbz != null">
+                tax_logo,
+            </if>
+            <if test="ycbz != null">
+                hide_the_logo,
+            </if>
+            <if test="yhzcbs != null">
+                enjoy_preferential_policies,
+            </if>
+            <if test="spbm != null">
+                tax_class_code,
+            </if>
+            <if test="ssflMc != null">
+                tax_classification_name,
+            </if>
+            <if test="lslbs != null">
+                preferential_policies_type,
+            </if>
+            <if test="zzstsgl != null">
+                zzstsgl,
+            </if>
+            <if test="userId != null">
+                user_id,
+            </if>
+            create_time,
+            modify_time,
+            <if test="modifyUserId != null">
+                modify_user_id,
+            </if>
+            <if test="groupId != null">
+                group_id,
+            </if>
+            <if test="bz != null">
+                description,
+            </if>
+            <if test="xhfMc != null">
+                enterprise_name,
+            </if>
+            <if test="dataSource != null">
+                data_source,
+            </if>
+            <if test="matchingState != null">
+                matching_state,
+            </if>
+            <if test="dataState != null">
+                data_state,
+            </if>
+            <if test="spjc != null">
+                tax_class_abbreviation,
+            </if>
+            <if test="collectIdent != null">
+                collect_ident,
+            </if>
+            <if test="cpy != null">
+                cpy,
+            </if>
+            <if test="bmbBbh != null">
+                bmb_bbh,
+            </if>
+            <if test="jdc != null">
+                jdc,
+            </if>
+            <if test="wlflbm != null">
+                wlflbm,
+            </if>
+            <if test="wlflmc != null">
+                wlflmc,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityId != null">
+                #{commodityId,jdbcType=VARCHAR},
+            </if>
+            <if test="sortId != null">
+                #{sortId,jdbcType=BIGINT},
+            </if>
+            <if test="xhfNsrsbh != null">
+                #{xhfNsrsbh,jdbcType=VARCHAR},
+            </if>
+            <if test="xmmc != null">
+                #{xmmc,jdbcType=VARCHAR},
+            </if>
+            <if test="zxbm != null">
+                #{zxbm,jdbcType=VARCHAR},
+            </if>
+            <if test="spsm != null">
+                #{spsm,jdbcType=VARCHAR},
+            </if>
+            <if test="spjm != null">
+                #{spjm,jdbcType=VARCHAR},
+            </if>
+            <if test="sl != null">
+                #{sl,jdbcType=VARCHAR},
+            </if>
+            <if test="ggxh != null">
+                #{ggxh,jdbcType=VARCHAR},
+            </if>
+            <if test="xmdw != null">
+                #{xmdw,jdbcType=VARCHAR},
+            </if>
+            <if test="xmdj != null">
+                #{xmdj,jdbcType=VARCHAR},
+            </if>
+            <if test="hsbz != null">
+                #{hsbz,jdbcType=VARCHAR},
+            </if>
+            <if test="ycbz != null">
+                #{ycbz,jdbcType=VARCHAR},
+            </if>
+            <if test="yhzcbs != null">
+                #{yhzcbs,jdbcType=VARCHAR},
+            </if>
+            <if test="spbm != null">
+                #{spbm,jdbcType=VARCHAR},
+            </if>
+            <if test="ssflMc != null">
+                #{ssflMc,jdbcType=VARCHAR},
+            </if>
+            <if test="lslbs != null">
+                #{lslbs,jdbcType=VARCHAR},
+            </if>
+            <if test="zzstsgl != null">
+                #{zzstsgl,jdbcType=VARCHAR},
+            </if>
+            <if test="userId != null">
+                #{userId,jdbcType=VARCHAR},
+            </if>
+            <if test="dataType == 0">
+                now(),
+                now(),
+            </if>
+            <if test="dataType == 1">
+                SYSDATE,
+                SYSDATE,
+            </if>
+            <if test="modifyUserId != null">
+                #{modifyUserId,jdbcType=CHAR},
+            </if>
+            <if test="groupId != null">
+                #{groupId,jdbcType=VARCHAR},
+            </if>
+            <if test="bz != null">
+                #{bz,jdbcType=VARCHAR},
+            </if>
+            <if test="xhfMc != null">
+                #{xhfMc,jdbcType=VARCHAR},
+            </if>
+            <if test="dataSource != null">
+                #{dataSource,jdbcType=VARCHAR},
+            </if>
+            <if test="matchingState != null">
+                #{matchingState,jdbcType=VARCHAR},
+            </if>
+            <if test="dataState != null">
+                #{dataState,jdbcType=VARCHAR},
+            </if>
+            <if test="spjc != null">
+                #{spjc,jdbcType=VARCHAR},
+            </if>
+            <if test="collectIdent != null">
+                #{collectIdent,jdbcType=VARCHAR},
+            </if>
+            <if test="cpy != null">
+                #{cpy,jdbcType=VARCHAR},
+            </if>
+            <if test="bmbBbh != null">
+                #{bmbBbh,jdbcType=VARCHAR},
+            </if>
+            <if test="jdc != null">
+                #{jdc,jdbcType=VARCHAR},
+            </if>
+            <if test="wlflbm != null">
+                #{wlflbm,jdbcType=VARCHAR},
+            </if>
+            <if test="wlflmc != null">
+                #{wlflmc,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+
+
+    <!-- 修改 -->
+    <update id="updateCommodity" parameterType="com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity">
+        <bind name="dataType" value="${dataType}"/>
+        update commodity_code
+        <set>
+            <if test="commodityCode.commodityId != null">
+                commodity_id = #{commodityCode.commodityId,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.sortId != null">
+                sort_id = #{commodityCode.sortId,jdbcType=BIGINT},
+            </if>
+            <if test="commodityCode.xhfNsrsbh != null">
+                xhf_nsrsbh = #{commodityCode.xhfNsrsbh,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.xmmc != null">
+                merchandise_name = #{commodityCode.xmmc,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.zxbm != null">
+                encoding = #{commodityCode.zxbm,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.spsm != null">
+                tax_items = #{commodityCode.spsm,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.spjm != null">
+                brief_code = #{commodityCode.spjm,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.sl != null">
+                tax_rate = #{commodityCode.sl,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.ggxh != null">
+                specification_model = #{commodityCode.ggxh,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.xmdw != null">
+                metering_unit = #{commodityCode.xmdw,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.xmdj != null">
+                unit_price = #{commodityCode.xmdj,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.hsbz != null">
+                tax_logo = #{commodityCode.hsbz,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.ycbz != null">
+                hide_the_logo = #{commodityCode.ycbz,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.yhzcbs != null">
+                enjoy_preferential_policies = #{commodityCode.yhzcbs,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.spbm != null">
+                tax_class_code = #{commodityCode.spbm,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.ssflMc != null">
+                tax_classification_name = #{commodityCode.ssflMc,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.lslbs != null">
+                preferential_policies_type = #{commodityCode.lslbs,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.zzstsgl != null">
+                zzstsgl = #{commodityCode.zzstsgl,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.userId != null">
+                user_id = #{commodityCode.userId,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.createTime != null">
+                create_time = #{commodityCode.createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="dataType == 0">
+                modify_time = now(),
+            </if>
+            <if test="dataType == 1">
+                modify_time = SYSDATE,
+            </if>
+            <if test="commodityCode.modifyUserId != null">
+                modify_user_id = #{commodityCode.modifyUserId,jdbcType=CHAR},
+            </if>
+            <if test="commodityCode.groupId != null">
+                group_id = #{commodityCode.groupId,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.bz != null">
+                description = #{commodityCode.bz,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.xhfMc != null">
+                enterprise_name = #{commodityCode.xhfMc,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.dataSource != null">
+                data_source = #{commodityCode.dataSource,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.matchingState != null">
+                matching_state = #{commodityCode.matchingState,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.dataState != null">
+                data_state = #{commodityCode.dataState,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.spjc != null">
+                tax_class_abbreviation = #{commodityCode.spjc,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.collectIdent != null">
+                collect_ident = #{commodityCode.collectIdent,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.cpy != null">
+                cpy = #{commodityCode.cpy,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.bmbBbh != null">
+                bmb_bbh = #{commodityCode.bmbBbh,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.jdc != null">
+                jdc = #{commodityCode.jdc,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.wlflbm != null">
+                wlflbm = #{commodityCode.wlflbm,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityCode.wlflmc != null">
+                wlflmc = #{commodityCode.wlflmc,jdbcType=VARCHAR},
+            </if>
+        </set>
+        <where>
+            <if test="commodityCode.id != null and commodityCode.id != ''">
+                AND id = #{commodityCode.id,jdbcType=VARCHAR}
+            </if>
+
+            <if test="shList != null and shList.size() == 0">
+                and xhf_nsrsbh = ''
+            </if>
+            <if test="shList != null and shList.size() == 1">
+                and xhf_nsrsbh =
+                <foreach collection="shList" index="index" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="shList != null and shList.size() > 1">
+                and xhf_nsrsbh in
+                <foreach collection="shList" index="index" item="item"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </update>
+
+    <insert id="insertCommodity" parameterType="com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity">
+        <bind name="dataType" value="${dataType}"/>
+
+        insert into commodity_code
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="commodityId != null">
+                commodity_id,
+            </if>
+            <if test="sortId != null">
+                sort_id,
+            </if>
+            <if test="xhfNsrsbh != null">
+                xhf_nsrsbh,
+            </if>
+            <if test="xmmc != null">
+                merchandise_name,
+            </if>
+            <if test="zxbm != null">
+                encoding,
+            </if>
+            <if test="spsm != null">
+                tax_items,
+            </if>
+            <if test="spjm != null">
+                brief_code,
+            </if>
+            <if test="sl != null">
+                tax_rate,
+            </if>
+            <if test="ggxh != null">
+                specification_model,
+            </if>
+            <if test="xmdw != null">
+                metering_unit,
+            </if>
+            <if test="xmdj != null">
+                unit_price,
+            </if>
+            <if test="hsbz != null">
+                tax_logo,
+            </if>
+            <if test="ycbz != null">
+                hide_the_logo,
+            </if>
+            <if test="yhzcbs != null">
+                enjoy_preferential_policies,
+            </if>
+            <if test="spbm != null">
+                tax_class_code,
+            </if>
+            <if test="ssflMc != null">
+                tax_classification_name,
+            </if>
+            <if test="lslbs != null">
+                preferential_policies_type,
+            </if>
+            <if test="zzstsgl != null">
+                zzstsgl,
+            </if>
+            <if test="userId != null">
+                user_id,
+            </if>
+            create_time,
+            modify_time,
+            <if test="modifyUserId != null">
+                modify_user_id,
+            </if>
+            <if test="groupId != null">
+                group_id,
+            </if>
+            <if test="bz != null">
+                description,
+            </if>
+            <if test="xhfMc != null">
+                enterprise_name,
+            </if>
+            <if test="dataSource != null">
+                data_source,
+            </if>
+            <if test="matchingState != null">
+                matching_state,
+            </if>
+            <if test="dataState != null">
+                data_state,
+            </if>
+            <if test="spjc != null">
+                tax_class_abbreviation,
+            </if>
+            <if test="collectIdent != null">
+                collect_ident,
+            </if>
+            <if test="cpy != null">
+                cpy,
+            </if>
+            <if test="bmbBbh != null">
+                bmb_bbh,
+            </if>
+            <if test="jdc != null">
+                jdc,
+            </if>
+            <if test="wlflbm != null">
+                wlflbm,
+            </if>
+            <if test="wlflmc != null">
+                wlflmc,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityId != null">
+                #{commodityId,jdbcType=VARCHAR},
+            </if>
+            <if test="sortId != null">
+                #{sortId,jdbcType=BIGINT},
+            </if>
+            <if test="xhfNsrsbh != null">
+                #{xhfNsrsbh,jdbcType=VARCHAR},
+            </if>
+            <if test="xmmc != null">
+                #{xmmc,jdbcType=VARCHAR},
+            </if>
+            <if test="zxbm != null">
+                #{zxbm,jdbcType=VARCHAR},
+            </if>
+            <if test="spsm != null">
+                #{spsm,jdbcType=VARCHAR},
+            </if>
+            <if test="spjm != null">
+                #{spjm,jdbcType=VARCHAR},
+            </if>
+            <if test="sl != null">
+                #{sl,jdbcType=VARCHAR},
+            </if>
+            <if test="ggxh != null">
+                #{ggxh,jdbcType=VARCHAR},
+            </if>
+            <if test="xmdw != null">
+                #{xmdw,jdbcType=VARCHAR},
+            </if>
+            <if test="xmdj != null">
+                #{xmdj,jdbcType=VARCHAR},
+            </if>
+            <if test="hsbz != null">
+                #{hsbz,jdbcType=VARCHAR},
+            </if>
+            <if test="ycbz != null">
+                #{ycbz,jdbcType=VARCHAR},
+            </if>
+            <if test="yhzcbs != null">
+                #{yhzcbs,jdbcType=VARCHAR},
+            </if>
+            <if test="spbm != null">
+                #{spbm,jdbcType=VARCHAR},
+            </if>
+            <if test="ssflMc != null">
+                #{ssflMc,jdbcType=VARCHAR},
+            </if>
+            <if test="lslbs != null">
+                #{lslbs,jdbcType=VARCHAR},
+            </if>
+            <if test="zzstsgl != null">
+                #{zzstsgl,jdbcType=VARCHAR},
+            </if>
+            <if test="userId != null">
+                #{userId,jdbcType=VARCHAR},
+            </if>
+            <if test="dataType == 0">
+                now(),
+                now(),
+            </if>
+            <if test="dataType == 1">
+                SYSDATE,
+                SYSDATE,
+            </if>
+            <if test="modifyUserId != null">
+                #{modifyUserId,jdbcType=CHAR},
+            </if>
+            <if test="groupId != null">
+                #{groupId,jdbcType=VARCHAR},
+            </if>
+            <if test="bz != null">
+                #{bz,jdbcType=VARCHAR},
+            </if>
+            <if test="xhfMc != null">
+                #{xhfMc,jdbcType=VARCHAR},
+            </if>
+            <if test="dataSource != null">
+                #{dataSource,jdbcType=VARCHAR},
+            </if>
+            <if test="matchingState != null">
+                #{matchingState,jdbcType=VARCHAR},
+            </if>
+            <if test="dataState != null">
+                #{dataState,jdbcType=VARCHAR},
+            </if>
+            <if test="spjc != null">
+                #{spjc,jdbcType=VARCHAR},
+            </if>
+            <if test="collectIdent != null">
+                #{collectIdent,jdbcType=VARCHAR},
+            </if>
+            <if test="cpy != null">
+                #{cpy,jdbcType=VARCHAR},
+            </if>
+            <if test="bmbBbh != null">
+                #{bmbBbh,jdbcType=VARCHAR},
+            </if>
+            <if test="jdc != null">
+                #{jdc,jdbcType=VARCHAR},
+            </if>
+            <if test="wlflbm != null">
+                #{wlflbm,jdbcType=VARCHAR},
+            </if>
+            <if test="wlflmc != null">
+                #{wlflmc,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+
+    <insert id="insertCommodityOnDuplicateKey"
+            parameterType="com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity">
+        <bind name="dataType" value="${dataType}"/>
+
+        insert into commodity_code
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="commodityId != null">
+                commodity_id,
+            </if>
+            <if test="sortId != null">
+                sort_id,
+            </if>
+            <if test="xhfNsrsbh != null">
+                xhf_nsrsbh,
+            </if>
+            <if test="xmmc != null">
+                merchandise_name,
+            </if>
+            <if test="zxbm != null">
+                encoding,
+            </if>
+            <if test="spsm != null">
+                tax_items,
+            </if>
+            <if test="spjm != null">
+                brief_code,
+            </if>
+            <if test="sl != null">
+                tax_rate,
+            </if>
+            <if test="ggxh != null">
+                specification_model,
+            </if>
+            <if test="xmdw != null">
+                metering_unit,
+            </if>
+            <if test="xmdj != null">
+                unit_price,
+            </if>
+            <if test="hsbz != null">
+                tax_logo,
+            </if>
+            <if test="ycbz != null">
+                hide_the_logo,
+            </if>
+            <if test="yhzcbs != null">
+                enjoy_preferential_policies,
+            </if>
+            <if test="spbm != null">
+                tax_class_code,
+            </if>
+            <if test="ssflMc != null">
+                tax_classification_name,
+            </if>
+            <if test="lslbs != null">
+                preferential_policies_type,
+            </if>
+            <if test="zzstsgl != null">
+                zzstsgl,
+            </if>
+            <if test="userId != null">
+                user_id,
+            </if>
+            create_time,
+            modify_time,
+            <if test="modifyUserId != null">
+                modify_user_id,
+            </if>
+            <if test="groupId != null">
+                group_id,
+            </if>
+            <if test="bz != null">
+                description,
+            </if>
+            <if test="xhfMc != null">
+                enterprise_name,
+            </if>
+            <if test="dataSource != null">
+                data_source,
+            </if>
+            <if test="matchingState != null">
+                matching_state,
+            </if>
+            <if test="dataState != null">
+                data_state,
+            </if>
+            <if test="spjc != null">
+                tax_class_abbreviation,
+            </if>
+            <if test="collectIdent != null">
+                collect_ident,
+            </if>
+            <if test="cpy != null">
+                cpy,
+            </if>
+            <if test="bmbBbh != null">
+                bmb_bbh,
+            </if>
+            <if test="jdc != null">
+                jdc,
+            </if>
+            <if test="wlflbm != null">
+                wlflbm,
+            </if>
+            <if test="wlflmc != null">
+                wlflmc,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=VARCHAR},
+            </if>
+            <if test="commodityId != null">
+                #{commodityId,jdbcType=VARCHAR},
+            </if>
+            <if test="sortId != null">
+                #{sortId,jdbcType=BIGINT},
+            </if>
+            <if test="xhfNsrsbh != null">
+                #{xhfNsrsbh,jdbcType=VARCHAR},
+            </if>
+            <if test="xmmc != null">
+                #{xmmc,jdbcType=VARCHAR},
+            </if>
+            <if test="zxbm != null">
+                #{zxbm,jdbcType=VARCHAR},
+            </if>
+            <if test="spsm != null">
+                #{spsm,jdbcType=VARCHAR},
+            </if>
+            <if test="spjm != null">
+                #{spjm,jdbcType=VARCHAR},
+            </if>
+            <if test="sl != null">
+                #{sl,jdbcType=VARCHAR},
+            </if>
+            <if test="ggxh != null">
+                #{ggxh,jdbcType=VARCHAR},
+            </if>
+            <if test="xmdw != null">
+                #{xmdw,jdbcType=VARCHAR},
+            </if>
+            <if test="xmdj != null">
+                #{xmdj,jdbcType=VARCHAR},
+            </if>
+            <if test="hsbz != null">
+                #{hsbz,jdbcType=VARCHAR},
+            </if>
+            <if test="ycbz != null">
+                #{ycbz,jdbcType=VARCHAR},
+            </if>
+            <if test="yhzcbs != null">
+                #{yhzcbs,jdbcType=VARCHAR},
+            </if>
+            <if test="spbm != null">
+                #{spbm,jdbcType=VARCHAR},
+            </if>
+            <if test="ssflMc != null">
+                #{ssflMc,jdbcType=VARCHAR},
+            </if>
+            <if test="lslbs != null">
+                #{lslbs,jdbcType=VARCHAR},
+            </if>
+            <if test="zzstsgl != null">
+                #{zzstsgl,jdbcType=VARCHAR},
+            </if>
+            <if test="userId != null">
+                #{userId,jdbcType=VARCHAR},
+            </if>
+            <if test="dataType == 0">
+                now(),
+                now(),
+            </if>
+            <if test="dataType == 1">
+                SYSDATE,
+                SYSDATE,
+            </if>
+            <if test="modifyUserId != null">
+                #{modifyUserId,jdbcType=CHAR},
+            </if>
+            <if test="groupId != null">
+                #{groupId,jdbcType=VARCHAR},
+            </if>
+            <if test="bz != null">
+                #{bz,jdbcType=VARCHAR},
+            </if>
+            <if test="xhfMc != null">
+                #{xhfMc,jdbcType=VARCHAR},
+            </if>
+            <if test="dataSource != null">
+                #{dataSource,jdbcType=VARCHAR},
+            </if>
+            <if test="matchingState != null">
+                #{matchingState,jdbcType=VARCHAR},
+            </if>
+            <if test="dataState != null">
+                #{dataState,jdbcType=VARCHAR},
+            </if>
+            <if test="spjc != null">
+                #{spjc,jdbcType=VARCHAR},
+            </if>
+            <if test="collectIdent != null">
+                #{collectIdent,jdbcType=VARCHAR},
+            </if>
+            <if test="cpy != null">
+                #{cpy,jdbcType=VARCHAR},
+            </if>
+            <if test="bmbBbh != null">
+                #{bmbBbh,jdbcType=VARCHAR},
+            </if>
+            <if test="jdc != null">
+                #{jdc,jdbcType=VARCHAR},
+            </if>
+            <if test="wlflbm != null">
+                #{wlflbm,jdbcType=VARCHAR},
+            </if>
+            <if test="wlflmc != null">
+                #{wlflmc,jdbcType=VARCHAR},
+            </if>
+        </trim>
+        ON DUPLICATE KEY UPDATE
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = VALUES(id),
+            </if>
+            <if test="commodityId != null">
+                commodity_id = VALUES(commodity_id),
+            </if>
+            <if test="sortId != null">
+                sort_id = VALUES(sort_id),
+            </if>
+            <if test="xhfNsrsbh != null">
+                xhf_nsrsbh = VALUES(xhf_nsrsbh),
+            </if>
+            <if test="xmmc != null">
+                merchandise_name = VALUES(merchandise_name),
+            </if>
+            <if test="zxbm != null">
+                encoding = VALUES(encoding),
+            </if>
+            <if test="spsm != null">
+                tax_items = VALUES(tax_items),
+            </if>
+            <if test="spjm != null">
+                brief_code = VALUES(brief_code),
+            </if>
+            <if test="sl != null">
+                tax_rate = VALUES(tax_rate),
+            </if>
+            <if test="ggxh != null">
+                specification_model = VALUES(specification_model),
+            </if>
+            <if test="xmdw != null">
+                metering_unit = VALUES(metering_unit),
+            </if>
+            <if test="xmdj != null">
+                unit_price = VALUES(unit_price),
+            </if>
+            <if test="hsbz != null">
+                tax_logo = VALUES(tax_logo),
+            </if>
+            <if test="ycbz != null">
+                hide_the_logo = VALUES(hide_the_logo),
+            </if>
+            <if test="yhzcbs != null">
+                enjoy_preferential_policies = VALUES(enjoy_preferential_policies),
+            </if>
+            <if test="spbm != null">
+                tax_class_code = VALUES(tax_class_code),
+            </if>
+            <if test="ssflMc != null">
+                tax_classification_name = VALUES(tax_classification_name),
+            </if>
+            <if test="lslbs != null">
+                preferential_policies_type = VALUES(preferential_policies_type),
+            </if>
+            <if test="zzstsgl != null">
+                zzstsgl = VALUES(zzstsgl),
+            </if>
+            <if test="userId != null">
+                user_id = VALUES(user_id),
+            </if>
+            create_time = VALUES(create_time),
+            modify_time = VALUES(modify_time),
+            <if test="modifyUserId != null">
+                modify_user_id = VALUES(modify_user_id),
+            </if>
+            <if test="groupId != null">
+                group_id = VALUES(group_id),
+            </if>
+            <if test="bz != null">
+                description = VALUES(description),
+            </if>
+            <if test="xhfMc != null">
+                enterprise_name = VALUES(enterprise_name),
+            </if>
+            <if test="dataSource != null">
+                data_source = VALUES(data_source),
+            </if>
+            <if test="matchingState != null">
+                matching_state = VALUES(matching_state),
+            </if>
+            <if test="dataState != null">
+                data_state = VALUES(data_state),
+            </if>
+            <if test="spjc != null">
+                tax_class_abbreviation = VALUES(tax_class_abbreviation),
+            </if>
+            <if test="collectIdent != null">
+                collect_ident = VALUES(collect_ident),
+            </if>
+            <if test="cpy != null">
+                cpy = VALUES(cpy),
+            </if>
+            <if test="bmbBbh != null">
+                bmb_bbh = VALUES(bmb_bbh),
+            </if>
+            <if test="jdc != null">
+                jdc = VALUES(jdc),
+            </if>
+            <if test="wlflbm != null">
+                wlflbm = VALUES(wlflbm),
+            </if>
+            <if test="wlflmc != null">
+                wlflmc = VALUES(wlflmc),
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateByGropId" parameterType="String">
+        UPDATE commodity_code
+        SET
+        group_id = ''
+        WHERE group_id = #{id,jdbcType=VARCHAR}
+        <if test="shList != null and shList.size() == 0">
+            and xhf_nsrsbh = ''
+        </if>
+        <if test="shList != null and shList.size() == 1">
+            and xhf_nsrsbh =
+            <foreach collection="shList" index="index" item="item">
+                #{item}
+            </foreach>
+        </if>
+        <if test="shList != null and shList.size() > 1">
+            and xhf_nsrsbh in
+            <foreach collection="shList" index="index" item="item"
+                     open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </update>
+
+    <delete id="deleteCommodity" parameterType="String">
+        DELETE
+        FROM
+        commodity_code
+        WHERE id = #{id,jdbcType=VARCHAR}
+        <if test="shList != null and shList.size() == 0">
+            and xhf_nsrsbh = ''
+        </if>
+        <if test="shList != null and shList.size() == 1">
+            and xhf_nsrsbh =
+            <foreach collection="shList" index="index" item="item">
+                #{item}
+            </foreach>
+        </if>
+        <if test="shList != null and shList.size() > 1">
+            and xhf_nsrsbh in
+            <foreach collection="shList" index="index" item="item"
+                     open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </delete>
+    <select id="queryCommodityInfoList" resultMap="commodityCodeResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        commodity_code cc
+        <where>
+            <if test="pageSpxxReq.dataStatus!=null and pageSpxxReq.dataStatus!=''">
+                AND cc.data_state = #{pageSpxxReq.dataStatus,jdbcType=VARCHAR}
+            </if>
+
+            <if test="pageSpxxReq.id!=null and pageSpxxReq.id!=''">
+                AND cc.id = #{pageSpxxReq.id,jdbcType=VARCHAR}
+            </if>
+
+            <if test="pageSpxxReq.spId!=null and pageSpxxReq.spId!=''">
+                AND cc.commodity_id = #{pageSpxxReq.spId,jdbcType=VARCHAR}
+            </if>
+            <if test="pageSpxxReq.spdw!=null and pageSpxxReq.spdw!=''">
+                AND cc.metering_unit = #{pageSpxxReq.spdw,jdbcType=VARCHAR}
+            </if>
+            <if test="pageSpxxReq.spdj!=null and pageSpxxReq.spdj!=''">
+                AND cc.unit_price = #{pageSpxxReq.spdj,jdbcType=VARCHAR}
+            </if>
+            <if test="pageSpxxReq.sl!=null and pageSpxxReq.sl!=''">
+                AND cc.tax_rate = #{pageSpxxReq.sl,jdbcType=VARCHAR}
+            </if>
+            <if test="pageSpxxReq.spmc!=null and pageSpxxReq.spmc!=''">
+                AND cc.merchandise_name LIKE CONCAT(CONCAT('%',#{pageSpxxReq.spmc}),'%')
+            </if>
+            <if test="pageSpxxReq.zxbm!=null and pageSpxxReq.zxbm!=''">
+                AND cc.encoding LIKE CONCAT(CONCAT('%',#{pageSpxxReq.zxbm}),'%')
+            </if>
+
+            <if test="pageSpxxReq.ggxh!=null and pageSpxxReq.ggxh!=''">
+                AND cc.specification_model LIKE CONCAT(CONCAT('%',#{pageSpxxReq.ggxh}),'%')
+            </if>
+            <!-- 成品油类型 1 成品油 -->
+            <if test='pageSpxxReq.cpylx=="1"'>
+                AND cc.cpy = 'Y'
+            </if>
+            <!-- 成品油类型 0 非成品油 -->
+            <if test='pageSpxxReq.cpylx=="0"'>
+                AND cc.cpy = 'N'
+            </if>
+            <!-- 机动车类型 1 机动车 -->
+            <if test='pageSpxxReq.jdclx=="1"'>
+                AND cc.jdc = 'Y'
+            </if>
+            <!-- 机动车类型 0 非机动车 -->
+            <if test='pageSpxxReq.jdclx=="0"'>
+                AND cc.jdc = 'N'
+            </if>
+
+            <if test="shList != null and shList.size() == 0">
+                and cc.xhf_nsrsbh = ''
+            </if>
+            <if test="shList != null and shList.size() == 1">
+                and cc.xhf_nsrsbh =
+                <foreach collection="shList" index="index" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="shList != null and shList.size() > 1">
+                and cc.xhf_nsrsbh in
+                <foreach collection="shList" index="index" item="item"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+        limit 1000
+    </select>
+
+    <!--查询集团下面企业可采集的数据   匹配状态为0（已匹配） 数据状态为0（启用） 数据来源为1（页面创建）、2（模板导入）-->
+    <select id="getCommodityCode" resultMap="commodityCodeResultMap" parameterType="string">
+        SELECT
+        t.*
+        FROM
+        commodity_code t
+        WHERE t.collect_ident is null
+        AND t.matching_state = '0'
+        AND t.data_state = '0'
+        AND (
+        t.data_source = '1'
+        OR t.data_source = '2'
+        )
+        <if test="shList != null and shList.size() == 0">
+            and t.xhf_nsrsbh = ''
+        </if>
+        <if test="shList != null and shList.size() == 1">
+            and t.xhf_nsrsbh =
+            <foreach collection="shList" index="index" item="item">
+                #{item}
+            </foreach>
+        </if>
+        <if test="shList != null and shList.size() > 1">
+            and t.xhf_nsrsbh in
+            <foreach collection="shList" index="index" item="item"
+                     open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+    <!-- 根据id查询 -->
+    <select id="queryCommodityById" parameterType="string" resultMap="commodityCodeResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        commodity_code
+        <where>
+
+            <if test="id != null and id !=''">
+                and id = #{id,jdbcType=VARCHAR}
+            </if>
+
+            <if test="commodityId != null and commodityId !=''">
+                and commodity_id = #{commodityId,jdbcType=VARCHAR}
+            </if>
+
+            <if test="shList != null and shList.size() == 0">
+                and xhf_nsrsbh = ''
+            </if>
+            <if test="shList != null and shList.size() == 1">
+                and xhf_nsrsbh =
+                <foreach collection="shList" index="index" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="shList != null and shList.size() > 1">
+                and xhf_nsrsbh in
+                <foreach collection="shList" index="index" item="item"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+    </select>
+
+    <select id="queryProductList" parameterType="map" resultMap="commodityCodeResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        commodity_code cc
+        WHERE cc.data_state = '0'
+        AND cc.matching_state = '0'
+        <if test="map.productName != null and map.productName != ''">
+            AND cc.merchandise_name = #{map.productName,jdbcType=VARCHAR}
+        </if>
+        <if test="map.taxClassCode != null and map.taxClassCode != ''">
+            AND cc.tax_class_code = #{map.taxClassCode,jdbcType=VARCHAR}
+        </if>
+        <if test="map.zxbm != null and map.zxbm != '' ">
+            AND cc.encoding = #{map.zxbm,jdbcType=VARCHAR}
+        </if>
+        <if test="map.ggxh != null ">
+            AND cc.specification_model = #{map.ggxh,jdbcType=VARCHAR}
+        </if>
+        <if test="map.xmdw != null ">
+            AND cc.metering_unit = #{map.xmdw,jdbcType=VARCHAR}
+        </if>
+        <if test="map.xmdj != null ">
+            AND cc.unit_price = #{map.xmdj,jdbcType=VARCHAR}
+        </if>
+        <if test="map.sl != null ">
+            AND cc.tax_rate = #{map.sl,jdbcType=VARCHAR}
+        </if>
+
+        <if test="shList != null and shList.size() == 0">
+            and cc.xhf_nsrsbh = ''
+        </if>
+        <if test="shList != null and shList.size() == 1">
+            and cc.xhf_nsrsbh =
+            <foreach collection="shList" index="index" item="item">
+                #{item}
+            </foreach>
+        </if>
+        <if test="shList != null and shList.size() > 1">
+            and cc.xhf_nsrsbh in
+            <foreach collection="shList" index="index" item="item"
+                     open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+
+    <!-- 通用条件查询 -->
+    <select id="queryCommodityInfoListByMap" resultMap="commodityCodeResultMap">
+        <bind name="dataType" value="${dataType}"/>
+        <if test="dataType == 0">
+            SELECT
+            <include refid="Base_Column_List"/>
+            FROM
+            commodity_code cc
+            <where>
+                <if test="shList != null and shList.size() == 0">
+                    and cc.xhf_nsrsbh = ''
+                </if>
+                <if test="shList != null and shList.size() == 1">
+                    and cc.xhf_nsrsbh =
+                    <foreach collection="shList" index="index" item="item">
+                        #{item}
+                    </foreach>
+                </if>
+                <if test="shList != null and shList.size() > 1">
+                    and cc.xhf_nsrsbh in
+                    <foreach collection="shList" index="index" item="item"
+                             open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
+
+                <if test="map.merchandiseName!=null and map.merchandiseName!=''">
+                    AND cc.merchandise_name LIKE CONCAT(CONCAT('%',#{map.merchandiseName}),'%')
+                </if>
+                <if test="map.encoding!=null and map.encoding!=''">
+                    AND cc.encoding LIKE CONCAT(CONCAT('%',#{map.encoding}),'%')
+                </if>
+                <!-- 成品油类型 1 成品油 -->
+                <if test='map.cpylx == "1"'>
+                    AND cc.cpy = 'Y'
+                </if>
+                <!-- 成品油类型 0 非成品油 -->
+                <if test='map.cpylx == "0"'>
+                    AND cc.cpy = 'N'
+                </if>
+                <!-- 机动车类型 1 机动车 -->
+                <if test='map.jdclx == "1"'>
+                    AND cc.jdc = 'Y'
+                </if>
+                <!-- 机动车类型 0 非机动车 -->
+                <if test='map.jdclx == "0"'>
+                    AND cc.jdc = 'N'
+                </if>
+            </where>
+            <choose>
+                <when test="map.orderBy !=null and map.orderBy == '0' ">
+                    order by cc.create_time asc
+                </when>
+                <otherwise>
+                    order by cc.create_time desc
+                </otherwise>
+            </choose>
+        </if>
+
+        <if test="dataType == 1">
+            SELECT
+            <include refid="Base_Column_List"/>
+            FROM
+            commodity_code cc
+            <where>
+                <if test="shList != null and shList.size() == 0">
+                    and cc.xhf_nsrsbh = ''
+                </if>
+                <if test="shList != null and shList.size() == 1">
+                    and cc.xhf_nsrsbh =
+                    <foreach collection="shList" index="index" item="item">
+                        #{item}
+                    </foreach>
+                </if>
+                <if test="shList != null and shList.size() > 1">
+                    and cc.xhf_nsrsbh in
+                    <foreach collection="shList" index="index" item="item"
+                             open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
+                <if test="map.merchandiseName!=null and map.merchandiseName!=''">
+                    AND cc.merchandise_name LIKE '%' || #{map.merchandiseName} || '%'
+                </if>
+                <if test="map.encoding!=null and map.encoding!=''">
+                    AND cc.encoding LIKE '%' || #{map.encoding} || '%'
+                </if>
+                <!-- 成品油类型 1 成品油 -->
+                <if test='map.cpylx=="1"'>
+                    AND cc.cpy = 'Y'
+                </if>
+                <!-- 成品油类型 0 非成品油 -->
+                <if test='map.cpylx=="0"'>
+                    AND cc.cpy = 'N'
+                </if>
+                <!-- 机动车类型 1 机动车 -->
+                <if test='map.jdclx=="1"'>
+                    AND cc.jdc = 'Y'
+                </if>
+                <!-- 机动车类型 0 非机动车 -->
+                <if test='map.jdclx=="0"'>
+                    AND cc.jdc = 'N'
+                </if>
+            </where>
+            <choose>
+                <when test="map.orderBy !=null and map.orderBy == '0' ">
+                    order by cc.create_time asc
+                </when>
+                <otherwise>
+                    order by cc.create_time desc
+                </otherwise>
+            </choose>
+        </if>
+    </select>
+</mapper>