diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java
index f8fab143..625a05fc 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java
@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity;
+import com.dxhy.order.baseservice.module.thirdservice.user.model.TaxPlayerCodeDept;
 import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService;
 import com.dxhy.order.constant.ConfigureConstant;
 import com.dxhy.order.constant.OrderInfoContentEnum;
@@ -178,6 +179,7 @@ public class BuyerServiceImpl implements BuyerService {
                     checkResultMapList.add(checkResultMap1);
                 }
             }
+            //查找根据销方税号 deptid
             if (StringUtils.isNotEmpty(buyerEntity.getPurchaseName())) {
                 param.put("purchaseName", buyerEntity.getPurchaseName());
                 int i = buyerMapper.selectBuyerByName(param, shList);
@@ -187,6 +189,27 @@ public class BuyerServiceImpl implements BuyerService {
                     checkResultMap1.put(OrderManagementConstant.ERRORMESSAGE, preStr + "购方名称:" + buyerEntity.getPurchaseName() + ",已经存在");
                     checkResultMapList.add(checkResultMap1);
                 }
+            }else{
+                Map<String, String> checkResultMap1 = new HashMap<>(2);
+                checkResultMap1.put(OrderManagementConstant.ERRORCODE, ConfigureConstant.STRING_9999);
+                checkResultMap1.put(OrderManagementConstant.ERRORMESSAGE, preStr + "购方名称不允许为空");
+                checkResultMapList.add(checkResultMap1);
+            }
+            if (StringUtils.isNotEmpty(buyerEntity.getEntId())&&StringUtils.isNotEmpty(buyerEntity.getBuyerCode())) {
+                param.put("ent_id", buyerEntity.getEntId());
+                param.put("buyerCode", buyerEntity.getBuyerCode());
+                int i = buyerMapper.selectBuyerByName(param, shList);
+                if (i > 0) {
+                    Map<String, String> checkResultMap1 = new HashMap<>(2);
+                    checkResultMap1.put(OrderManagementConstant.ERRORCODE, ConfigureConstant.STRING_9999);
+                    checkResultMap1.put(OrderManagementConstant.ERRORMESSAGE, preStr + "销方组织：" + buyerEntity.getXhfMc() + ",购方编码:" + buyerEntity.getBuyerCode() + ",已经存在");
+                    checkResultMapList.add(checkResultMap1);
+                }
+            }else{
+                Map<String, String> checkResultMap1 = new HashMap<>(2);
+                checkResultMap1.put(OrderManagementConstant.ERRORCODE, ConfigureConstant.STRING_9999);
+                checkResultMap1.put(OrderManagementConstant.ERRORMESSAGE, preStr + "销方组织或购方编码不允许为空");
+                checkResultMapList.add(checkResultMap1);
             }
 
         }
diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml
index 7bc56b49..d163402c 100644
--- a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml
+++ b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml
@@ -896,6 +896,9 @@
             <if test="map.status!=null and map.status!=''">
                 AND status =#{map.status,jdbcType=VARCHAR}
             </if>
+            <if test="map.buyerCode != null and map.buyerCode != ''">
+                AND buyer_code =#{map.buyerCode,jdbcType=VARCHAR}
+            </if>
         </where>
     </select>
 
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 13ae5a7b..3aec19c7 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
@@ -2,6 +2,8 @@ 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.baseservice.module.taxclass.dao.TaxClassCodeMapper;
+import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity;
 import com.dxhy.order.constant.ConfigureConstant;
 import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper;
 import com.dxhy.order.consumer.modules.commodity.domain.dto.QueryGroupCommodityDTO;
@@ -48,6 +50,9 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService
     @Autowired
     private ISDEnregyService sdEnregyService;
 
+    @Resource
+    private TaxClassCodeMapper taxClassCodeMapper;
+
     /**
      * 查询集团物料库
      *
@@ -104,7 +109,7 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService
             }
 
             //CommodityCodeEntity commodityCodeEntity = groupCommodityMapper.queryCommodityCodeByZxbmAndXhfNsrsbh(zxbm, quoteGroupCommodityDTO.getXhfNsrsbh());
-//            CommodityCodeEntity commodityCodeEntity = groupCommodityMapper.queryCommodityCodeByZxbmAndXhfNsrsbhAndEntId(zxbm, quoteGroupCommodityDTO.getXhfNsrsbh(), quoteGroupCommodityDTO.getDeptId());
+            //CommodityCodeEntity commodityCodeEntity = groupCommodityMapper.queryCommodityCodeByZxbmAndXhfNsrsbhAndEntId(zxbm, quoteGroupCommodityDTO.getXhfNsrsbh(), quoteGroupCommodityDTO.getDeptId());
 
 
             CommodityCodeEntity commodityCodeEntity = groupCommodityMapper.queryCommodityCodeByZxbmAndXhfNsrsbh(zxbm, "-1");
@@ -139,6 +144,19 @@ public class GroupCommodityCodeServiceImpl implements IGroupCommodityCodeService
                 newCommodityCodeEntity.setEntId(quoteGroupCommodityDTO.getDeptId());
                 newCommodityCodeEntity.setDataState("0");
                 newCommodityCodeEntity.setXhfMc(quoteGroupCommodityDTO.getXhfMc());
+                newCommodityCodeEntity.setHsbz("1");
+                newCommodityCodeEntity.setYhzcbs("0");
+                if(StringUtils.isNotBlank(newCommodityCodeEntity.getSpbm())){
+                    TaxClassCodeEntity taxClassCodeEntity = taxClassCodeMapper.queryTaxClassCodeEntityBySpbm(newCommodityCodeEntity.getSpbm());
+                    if(taxClassCodeEntity != null){
+                        newCommodityCodeEntity.setYhzcbs(StringUtils.isNotBlank(taxClassCodeEntity.getYhzcmc())?"1":"0");
+                        newCommodityCodeEntity.setSpjc(taxClassCodeEntity.getSpjc());
+                        newCommodityCodeEntity.setZzstsgl(StringUtils.isNotBlank(taxClassCodeEntity.getYhzcmc())?taxClassCodeEntity.getYhzcmc():"");
+                    }else{
+                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                        return R.error("第" + (i + 1) + "条数据商品编码为汇总项，引用失败");
+                    }
+                }
                 //如果存在则更新
                 if (groupCommodityMapper.insertCommodityCode(newCommodityCodeEntity) <= 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
diff --git a/order-management-consumer/src/main/resources/download/BuyerExcel.xlsx b/order-management-consumer/src/main/resources/download/BuyerExcel.xlsx
index 96fa0c37..6b8fa9d1 100644
Binary files a/order-management-consumer/src/main/resources/download/BuyerExcel.xlsx and b/order-management-consumer/src/main/resources/download/BuyerExcel.xlsx differ