|
|
@@ -2,14 +2,15 @@ package com.jjt.order.utils;
|
|
|
|
|
|
import com.jjt.biz.vo.GramMassDetail;
|
|
|
import com.jjt.calc.domain.TwinCalcDay;
|
|
|
-import com.jjt.calc.domain.TwinFormulaInfo;
|
|
|
import com.jjt.common.utils.DateUtils;
|
|
|
import com.jjt.common.utils.StringUtils;
|
|
|
+import com.jjt.common.utils.bean.BeanUtils;
|
|
|
import com.jjt.order.domain.TwinOrder;
|
|
|
import com.jjt.order.domain.TwinOrderDetail;
|
|
|
import com.jjt.order.domain.VmsStock;
|
|
|
import com.jjt.order.vo.BomVO;
|
|
|
import com.jjt.order.vo.SkuVO;
|
|
|
+import com.jjt.order.vo.TwinOrderVO;
|
|
|
import org.apache.poi.ss.usermodel.*;
|
|
|
import org.apache.poi.ss.util.CellRangeAddress;
|
|
|
import org.apache.poi.xddf.usermodel.chart.*;
|
|
|
@@ -113,13 +114,15 @@ public class OrderExportUtil {
|
|
|
sku.setQty(0f);
|
|
|
}
|
|
|
sku.setXql(bom.getXql());
|
|
|
- List<TwinOrder> skuOrder = new ArrayList<>();
|
|
|
+ List<TwinOrderVO> skuOrder = new ArrayList<>();
|
|
|
//按订单分组
|
|
|
Map<Long, List<TwinOrderDetail>> map = todList.stream().collect(Collectors.groupingBy(TwinOrderDetail::getOderId, LinkedHashMap::new, Collectors.toList()));
|
|
|
for (Long oid : map.keySet()) {
|
|
|
TwinOrder to = orderMap.get(oid);
|
|
|
- to.setTwinOrderDetailList(map.get(oid));
|
|
|
- skuOrder.add(to);
|
|
|
+ TwinOrderVO vo = new TwinOrderVO();
|
|
|
+ BeanUtils.copyBeanProp(vo, to);
|
|
|
+ vo.setTwinOrderDetailList(map.get(oid));
|
|
|
+ skuOrder.add(vo);
|
|
|
}
|
|
|
sku.setOrderList(skuOrder);
|
|
|
bom.setOrderList(skuOrder);
|
|
|
@@ -284,7 +287,7 @@ public class OrderExportUtil {
|
|
|
cells[6].setCellValue(sku.getBomName());
|
|
|
cells[7].setCellValue(sku.getBomSpec());
|
|
|
boolean out = false;
|
|
|
- for (TwinOrder order : sku.getOrderList()) {
|
|
|
+ for (TwinOrderVO order : sku.getOrderList()) {
|
|
|
if (out) {
|
|
|
row = sheet.createRow(num.getAndIncrement());
|
|
|
cells = new Cell[18];
|
|
|
@@ -355,7 +358,7 @@ public class OrderExportUtil {
|
|
|
cells[6].setCellValue(obj.getYcl());
|
|
|
|
|
|
boolean out = false;
|
|
|
- for (TwinOrder order : obj.getOrderList()) {
|
|
|
+ for (TwinOrderVO order : obj.getOrderList()) {
|
|
|
if (out) {
|
|
|
row = sheet.createRow(num.getAndIncrement());
|
|
|
cells = new Cell[18];
|