diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java index 33b7af34..759019df 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java +++ b/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位"), diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java index 363bcce2..a8f89664 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java +++ b/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; diff --git a/order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx b/order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx index 9f7d2742..711c1a2e 100644 Binary files a/order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx and b/order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx differ diff --git a/order-management-consumer/src/main/resources/download/OrderExcel.xlsx b/order-management-consumer/src/main/resources/download/OrderExcel.xlsx index 7481c30f..9875652a 100644 Binary files a/order-management-consumer/src/main/resources/download/OrderExcel.xlsx and b/order-management-consumer/src/main/resources/download/OrderExcel.xlsx differ diff --git a/order-management-consumer/src/main/resources/download/QdfpImportExcel.xlsx b/order-management-consumer/src/main/resources/download/QdfpImportExcel.xlsx index 403bc0d6..3908390d 100644 Binary files a/order-management-consumer/src/main/resources/download/QdfpImportExcel.xlsx and b/order-management-consumer/src/main/resources/download/QdfpImportExcel.xlsx differ