Merge branch 'release' into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java

@@ -262,8 +262,10 @@ public enum ExcelErrorMessageEnum {
     
     ORDERINFO_SSFLBM_SL_NULL("9611", "该商品税率没有维护，不能为空"),
     
-    ORDERINFO_9701("9701", "企业自编码长度超过18位"),
-    
+    ORDERINFO_9701("9701", "物料编码长度超过18位"),
+
+    ORDERINFO_9700("9700", "物料编码不允许为空"),
+
     ORDERINFO_9702("9702", "编码表版本号长度超过10位"),
     
     ORDERINFO_9703("9703", "税额长度超过30位"),

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java

@@ -908,7 +908,11 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService {
 //                        ExcelErrorMessageEnum.ORDERINFO_9709, false));
 //            }
 //        }
-
+        if (StringUtils.isBlank(orderExcel.getZxbm())) {
+            isValid = true;
+            resultList
+                    .add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_ZXBM.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9700, false));
+        }
         // 自行编码
         if (!StringUtils.isBlank(orderExcel.getZxbm()) && GbkUtils.getGbkLength(orderExcel.getZxbm()) > ConfigureConstant.INT_18) {
             isValid = true;