diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/NewOrderExcel.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/NewOrderExcel.java index f05653e6..bfcbae2b 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/NewOrderExcel.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/NewOrderExcel.java @@ -12,9 +12,13 @@ import lombok.Setter; @Getter public class NewOrderExcel { /** - * 订单号 + * 结算单号 */ private String ddh; + /** + * 报账单号 + */ + private String bzdh; /** * 发票种类代码(发票类型) */ @@ -135,6 +139,10 @@ public class NewOrderExcel { * 自行编码(自行商品编码) */ private String zxbm; + /** + * 矿别 + */ + private String kb; /** * 备注 */ diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/ExcelUtils.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/ExcelUtils.java index 918dd831..e16ddd96 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/ExcelUtils.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/ExcelUtils.java @@ -392,6 +392,7 @@ public class ExcelUtils { orderItemInfo.setFphxz(OrderInfoEnum.FPHXZ_CODE_0.getKey()); } orderItemInfo.setZxbm(orderExcel.getZxbm()); + orderItemInfo.setKb(orderExcel.getKb()); return orderItemInfo; } 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 2820fe09..35a19485 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 @@ -1902,6 +1902,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService { processInfo.setDdlx(OrderInfoEnum.ORDER_TYPE_0.getKey()); processInfo.setDdly(OrderInfoEnum.ORDER_SOURCE_0.getKey()); processInfo.setDdzt(OrderInfoEnum.ORDER_STATUS_0.getKey()); + processInfo.setBzdh(newOrderExcel.getBzdh()); orderExcel2CommonOrderInfo.setProcessInfo(processInfo); orderExcel2CommonOrderInfo.getOrderInfo().setDdlx(OrderInfoEnum.ORDER_SOURCE_0.getKey()); orderExcel2CommonOrderInfo.setNum(i); diff --git a/order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx b/order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx index ea0422fd..299925ca 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 8aa2e296..1ab45574 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 bafb173c..fd7b6bac 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