feat: 结算单管理-批量导入

release
liufeilong 2 years ago
parent 1146eacf6e
commit 248b831b2a
  1. 10
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/NewOrderExcel.java
  2. 1
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/utils/ExcelUtils.java
  3. 1
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java
  4. BIN
      order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx
  5. BIN
      order-management-consumer/src/main/resources/download/OrderExcel.xlsx
  6. BIN
      order-management-consumer/src/main/resources/download/QdfpImportExcel.xlsx

@ -12,9 +12,13 @@ import lombok.Setter;
@Getter @Getter
public class NewOrderExcel { public class NewOrderExcel {
/** /**
* 单号 * 结算单号
*/ */
private String ddh; private String ddh;
/**
* 报账单号
*/
private String bzdh;
/** /**
* 发票种类代码发票类型 * 发票种类代码发票类型
*/ */
@ -135,6 +139,10 @@ public class NewOrderExcel {
* 自行编码自行商品编码 * 自行编码自行商品编码
*/ */
private String zxbm; private String zxbm;
/**
* 矿别
*/
private String kb;
/** /**
* 备注 * 备注
*/ */

@ -392,6 +392,7 @@ public class ExcelUtils {
orderItemInfo.setFphxz(OrderInfoEnum.FPHXZ_CODE_0.getKey()); orderItemInfo.setFphxz(OrderInfoEnum.FPHXZ_CODE_0.getKey());
} }
orderItemInfo.setZxbm(orderExcel.getZxbm()); orderItemInfo.setZxbm(orderExcel.getZxbm());
orderItemInfo.setKb(orderExcel.getKb());
return orderItemInfo; return orderItemInfo;
} }

@ -1902,6 +1902,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService {
processInfo.setDdlx(OrderInfoEnum.ORDER_TYPE_0.getKey()); processInfo.setDdlx(OrderInfoEnum.ORDER_TYPE_0.getKey());
processInfo.setDdly(OrderInfoEnum.ORDER_SOURCE_0.getKey()); processInfo.setDdly(OrderInfoEnum.ORDER_SOURCE_0.getKey());
processInfo.setDdzt(OrderInfoEnum.ORDER_STATUS_0.getKey()); processInfo.setDdzt(OrderInfoEnum.ORDER_STATUS_0.getKey());
processInfo.setBzdh(newOrderExcel.getBzdh());
orderExcel2CommonOrderInfo.setProcessInfo(processInfo); orderExcel2CommonOrderInfo.setProcessInfo(processInfo);
orderExcel2CommonOrderInfo.getOrderInfo().setDdlx(OrderInfoEnum.ORDER_SOURCE_0.getKey()); orderExcel2CommonOrderInfo.getOrderInfo().setDdlx(OrderInfoEnum.ORDER_SOURCE_0.getKey());
orderExcel2CommonOrderInfo.setNum(i); orderExcel2CommonOrderInfo.setNum(i);

Loading…
Cancel
Save