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
index 01c09451..9aa41f5b 100644
--- 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
@@ -119,9 +119,10 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService
                 return R.error("第" + (i + 1) + "条数据，集团物料不存在");
             }
             CommodityCodeEntity queryCommodityEntity = new CommodityCodeEntity();
-            queryCommodityEntity.setXhfNsrsbh(quoteGroupCommodityDTO.getXhfNsrsbh());
+//            queryCommodityEntity.setXhfNsrsbh(quoteGroupCommodityDTO.getXhfNsrsbh());
+            queryCommodityEntity.setEntId(quoteGroupCommodityDTO.getDeptId());
             queryCommodityEntity.setZxbm(zxbm);
-            queryCommodityEntity.setCommodityId(commodityCodeEntity.getCommodityId());
+            //queryCommodityEntity.setCommodityId(commodityCodeEntity.getCommodityId());
 
             queryCommodityEntity = groupCommodityMapper.queryCommodityCodeList(queryCommodityEntity);
 
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
index 8a2ded15..e0608626 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
@@ -166,7 +166,7 @@ public class OrderInfoController {
                 return R.ok();
             }
         } catch (Exception e) {
-
+            log.error(e.getMessage());
         }
         return R.error("更新失败，请稍后重试");
     }
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 6a3c6bf7..adf87000 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
@@ -304,15 +304,19 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
             // 1.先去所有子公司库中匹配税编，以第一条为准；如果未匹配到，再去根据物料编码匹配
             List<CommodityCodeEntity> commodityCodeEntities = commodityMapper.queryByCommoditySpbmCompany(reqBO.getCODE());
             if(commodityCodeEntities != null && commodityCodeEntities.size() > 0){
+                matchCommodityCode(commodityCodeEntity);
+                commodityCodeEntity.setXmmc(reqBO.getDESC1());
                 commodityCodeEntity.setZxbm(reqBO.getCODE()); // 编码
                 commodityCodeEntity.setXmdw(reqBO.getDESC5());
                 commodityCodeEntity.setCreateTime(new Date());
                 commodityCodeEntity.setBz(reqBO.getDESCSHORT());
                 commodityCodeEntity.setUUID(reqBO.getUUID());
                 commodityCodeEntity.setWlflbm(reqBO.getCATEGORYCODE());
-                commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME());
+                if(StringUtils.isNotBlank(reqBO.getCATEGORYNAME())){
+                    commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME());
+                }
                 commodityCodeEntity.setDataSource("4");
-                matchCommodityCode(commodityCodeEntity);
+                //matchCommodityCode(commodityCodeEntity);
                 List<String> ids = commodityCodeEntities.stream().map(t -> t.getId()).collect(Collectors.toList());
                 commodityMapper.batchUpdateCommodity(commodityCodeEntity,ids);
             }else{
@@ -320,14 +324,16 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
                 commodityCodeEntity.setXmmc(reqBO.getDESC1()); // 商品名称
                 matchCommodityCode(commodityCodeEntity);
                 // 进行物料匹配
-                matchCommodityCode(commodityCodeEntity);
+                //matchCommodityCode(commodityCodeEntity);
                 commodityCodeEntity.setZxbm(reqBO.getCODE()); // 编码
                 commodityCodeEntity.setXmdw(reqBO.getDESC5());
                 commodityCodeEntity.setCreateTime(new Date());
                 commodityCodeEntity.setBz(reqBO.getDESCSHORT());
                 commodityCodeEntity.setUUID(reqBO.getUUID());
                 commodityCodeEntity.setWlflbm(reqBO.getCATEGORYCODE());
-                commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME());
+                if(StringUtils.isNotBlank(reqBO.getCATEGORYNAME())){
+                    commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME());
+                }
                 commodityCodeEntity.setDataSource("4");
 
                 // sdenergyTaxCodeMatchDao.queryByWlflbm(requestBody.get)
@@ -384,6 +390,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
             commodityCodeEntity.setSpjc(taxClassCodeEntity.getSpjc());
             commodityCodeEntity.setYhzcbs(taxClassCodeEntity.getZzstsgl());
             commodityCodeEntity.setHsbz("1");
+            //commodityCodeEntity.setWlflmc(taxCodeMatch.getFlmc());
 //            commodityCodeEntity.setSl(taxClassCodeEntity.getZzssl());
             commodityCodeEntity.setYhzcbs("0");
             if (StringUtils.isNotBlank(taxClassCodeEntity.getYhzcmc())) {
diff --git a/order-management-consumer/src/main/resources/bootstrap-std.yaml b/order-management-consumer/src/main/resources/bootstrap-std.yaml
index 1accef1d..9ff4daf1 100644
--- a/order-management-consumer/src/main/resources/bootstrap-std.yaml
+++ b/order-management-consumer/src/main/resources/bootstrap-std.yaml
@@ -5,7 +5,8 @@ spring:
       config:
         # Nacos config 地址
 #        server-addr: nacos-1.itax.local:33000
-        server-addr: 172.31.36.147:33000
+        #server-addr: 172.31.36.147:33000
+        server-addr: 172.31.36.143:33000
         # Nacos config 命名空间,对应配置中的名称(sims_order_namespace)
         namespace: a049b41c-b0a8-4a66-91b1-f3f3cab0e524
         # Nacos config 分组
@@ -54,7 +55,7 @@ spring:
       # Nacos discovery 配置
       discovery:
         # Nacos discovery 服务地址
-        server-addr: 172.31.36.147:33000
+        server-addr: 172.31.36.143:33000
     #sentinel配置相关
     sentinel:
       #sentinel是否开启控制
diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
index cd2031ae..81c7f8ff 100644
--- a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
@@ -135,6 +135,9 @@
             <if test="commodityCodeEntity.xhfNsrsbh != null and commodityCodeEntity.xhfNsrsbh != ''">
                 AND cc.xhf_nsrsbh = #{commodityCodeEntity.xhfNsrsbh}
             </if>
+            <if test="commodityCodeEntity.entId != null and commodityCodeEntity.entId != ''">
+                AND cc.ent_id = #{commodityCodeEntity.entId}
+            </if>
         </where>
 
         ORDER BY cc.create_time DESC