|
@@ -289,6 +289,7 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
List<OrderInputImpotVo> orderInputImpotVos = new ArrayList<>();
|
|
|
List<OrderListImportVo> orderListImportVos = new ArrayList<>();
|
|
|
+ List<OrderListImportVo> orderListImportlist = new ArrayList<>();
|
|
|
if (ids.size() > 500) {
|
|
|
throw new CustomException("超出文档导出上限");
|
|
|
}
|
|
@@ -313,7 +314,6 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
|
|
|
number[0]++;
|
|
|
});
|
|
|
orderInputVos.forEach(orderInputVo -> {
|
|
|
- final Integer[] number1 = {Constants.NUMBER};
|
|
|
OrderQueryBo orderQueryBo = new OrderQueryBo();
|
|
|
orderQueryBo.setInputOrderSn(String.valueOf(orderInputVo.getInputOrderSn()));
|
|
|
orderQueryBo.setStatus(new Integer[]{1});
|
|
@@ -323,7 +323,6 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
|
|
|
if (ObjectUtils.isEmpty(orderLIst.getGoodsRealPrice())) {
|
|
|
bean.setGoodsRealPrice(BigDecimal.valueOf(0));
|
|
|
}
|
|
|
- bean.setId(number1[0]);
|
|
|
bean.setGoodsPayStatus(getGoodsPayStatus(orderLIst.getGoodsPayStatus()));
|
|
|
bean.setInputOrderSn(orderInputVo.getInputOrderSn());
|
|
|
bean.setCreateTime(DateUtils.timestampToDateFormat(orderLIst.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
|
|
@@ -338,9 +337,14 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
|
|
|
}
|
|
|
bean.setGoodsNotReceived(orderLIst.getPayPrice().subtract(orderLIst.getGoodsReceived()));
|
|
|
orderListImportVos.add(bean);
|
|
|
- number1[0]++;
|
|
|
});
|
|
|
});
|
|
|
+ final Integer[] number1 = {Constants.NUMBER};
|
|
|
+ orderListImportVos.forEach(item->{
|
|
|
+ item.setId(number1[0]);
|
|
|
+ orderListImportlist.add(item);
|
|
|
+ number1[0]++;
|
|
|
+ });
|
|
|
}else {
|
|
|
throw new CustomException("请先勾选数据");
|
|
|
}
|
|
@@ -359,7 +363,7 @@ public class OrderInputServiceImpl extends ServiceImpl<OrderInputMapper, OrderIn
|
|
|
deptExportMap1.put("title", deptExportParams1);
|
|
|
deptExportMap1.put("entity", OrderListImportVo.class);
|
|
|
// sheet中要填充得数据
|
|
|
- deptExportMap1.put("data", orderListImportVos);
|
|
|
+ deptExportMap1.put("data", orderListImportlist);
|
|
|
sheetsList.add(deptExportMap);
|
|
|
sheetsList.add(deptExportMap1);
|
|
|
OutputStream out = null;
|