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 86e86e63..75665efe 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
@@ -34,6 +34,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -66,6 +67,8 @@ public class BuyerServiceImpl implements BuyerService {
     @Autowired
     private UserInfoService userInfoService;
 
+    SimpleDateFormat sdf = new SimpleDateFormat("MMdd");
+
     @Override
     public PageUtils queryBuyerList(Map<String, Object> paramMap, List<String> shList) {
         int pageSize = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_PAGE_SIZE)));
@@ -455,6 +458,10 @@ public class BuyerServiceImpl implements BuyerService {
             return r.put("message", "客户编码已存在").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999);
         }
         String buyerId = baseService.getGenerateShotKey();
+        if(StringUtils.isBlank(buyerEntity.getBuyerCode())||"0000000000".equals(buyerEntity.getBuyerCode())){
+            String format = String.format("%s%s", sdf.format(new Date()), String.format("%6s", String.valueOf(new Random().nextInt(1000000))).replace(' ', '0'));
+            buyerEntity.setBuyerCode(format);
+        }
         if (CollectionUtil.isNotEmpty(buyerEntity.getBuyerEntityDetail())) {
             Map<String, BuyerEntityDetail> collect = buyerEntity.getBuyerEntityDetail().stream().sorted((t1,t2)->Integer.valueOf(t2.getDefaultMark()) - Integer.valueOf(t1.getDefaultMark())).collect(Collectors.toMap(t -> t.getAddress() + t.getPhone() + t.getBankName() + t.getBankAccount(), t -> t,(t1, t2) -> t2));
             List<BuyerEntityDetail> collect1 = collect.values().stream().collect(Collectors.toList());
diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java
index 4dbb9f5d..11ebac5b 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java
@@ -160,6 +160,9 @@ public class CommodityController {
         if (StringUtils.isBlank(commodityCodeEntity.getYcbz())) {
             commodityCodeEntity.setYcbz(ConfigureConstant.STRING_0);
         }
+        if(StringUtils.isBlank(commodityCodeEntity.getZxbm())||"000000000000000000".equals(commodityCodeEntity.getZxbm())){
+            commodityCodeEntity.setZxbm(commodityCodeEntity.getId());
+        }
         /**
          * 添加校验
          */
@@ -479,7 +482,12 @@ public class CommodityController {
                 commodityCodeEntity.setXhfNsrsbh(xhfNsrsbh);
                 commodityCodeEntity.setXhfMc(xhfMc);
                 commodityCodeEntity.setXmmc(commodityExcel.getXmmc());
-                commodityCodeEntity.setZxbm(String.format("%18s", commodityExcel.getZxbm()).replace(' ', '0'));
+
+                if(StringUtils.isBlank(commodityCodeEntity.getZxbm())){
+                    commodityCodeEntity.setZxbm(baseService.getGenerateShotKey());
+                }else{
+                    commodityCodeEntity.setZxbm(String.format("%18s", commodityExcel.getZxbm()).replace(' ', '0'));
+                }
                 commodityCodeEntity.setSpsm("");
                 commodityCodeEntity.setSpjm("");
                 String sl = commodityExcel.getSl();
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java
index c4bdded6..5428d088 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java
@@ -34,6 +34,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -65,6 +66,7 @@ public class BuyerController {
     @Resource
     private OrderInfoService orderInfoService;
 
+    SimpleDateFormat sdf = new SimpleDateFormat("MMdd");
     /**
      * 查询购方信息数据
      * 在使用
@@ -282,7 +284,12 @@ public class BuyerController {
                 buyerEntity.setBankOfDeposit(buyerImportExcel.getGhfYh());
                 buyerEntity.setBankNumber(buyerImportExcel.getGhfZh());
                 buyerEntity.setRemarks(buyerImportExcel.getGhfBz());
-                buyerEntity.setBuyerCode(String.format("%10s", buyerImportExcel.getGhfBm()).replace(' ', '0'));
+                if(StringUtils.isBlank(buyerEntity.getBuyerCode())||"0000000000".equals(buyerEntity.getBuyerCode())){
+                    String format = String.format("%s%s", sdf.format(new Date()), String.format("%6s", String.valueOf(new Random().nextInt(1000000))).replace(' ', '0'));
+                    buyerEntity.setBuyerCode(format);
+                }else{
+                    buyerEntity.setBuyerCode(String.format("%10s", buyerImportExcel.getGhfBm()).replace(' ', '0'));
+                }
                 buyerEntity.setEmail(buyerImportExcel.getGhfYx());
                 buyerEntity.setSjh(buyerImportExcel.getGhfSjh());