|
@@ -562,23 +562,23 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
|
|
|
item.add(record.getProductColor());
|
|
|
String productLength = "", productWidth = "", productHeight = "";
|
|
|
if (ObjectUtil.isNotEmpty(record.getProductLength())) {
|
|
|
- productLength = String.valueOf(record.getProductLength().setScale(2));
|
|
|
+ productLength = record.getProductLength().setScale(2).stripTrailingZeros().toPlainString();
|
|
|
}
|
|
|
if (ObjectUtil.isNotEmpty(record.getProductWidth())) {
|
|
|
- productWidth = String.valueOf(record.getProductWidth().setScale(2));
|
|
|
+ productWidth = record.getProductWidth().setScale(2).stripTrailingZeros().toPlainString();
|
|
|
}
|
|
|
if (ObjectUtil.isNotEmpty(record.getProductHeight())) {
|
|
|
- productHeight = String.valueOf(record.getProductHeight().setScale(2));
|
|
|
+ productHeight = record.getProductHeight().setScale(2).stripTrailingZeros().toPlainString();
|
|
|
}
|
|
|
item.add(String.format("%s*%s*%s", productLength, productWidth, productHeight));
|
|
|
item.add(frontLineMap.get(record.getProductFrontalTexture()));
|
|
|
item.add(backLineMap.get(record.getProductReverseTexture()));
|
|
|
String logoLength = "", logoWidth = "";
|
|
|
if (ObjectUtil.isNotEmpty(record.getProductLogoLength())) {
|
|
|
- logoLength = String.valueOf(record.getProductLogoLength().setScale(2));
|
|
|
+ logoLength = record.getProductLogoLength().setScale(2).stripTrailingZeros().toPlainString();
|
|
|
}
|
|
|
if (ObjectUtil.isNotEmpty(record.getProductLogoWidth())) {
|
|
|
- logoWidth = String.valueOf(record.getProductLogoWidth().setScale(2));
|
|
|
+ logoWidth = record.getProductLogoWidth().setScale(2).stripTrailingZeros().toPlainString();
|
|
|
}
|
|
|
item.add(String.format("%s*%s", logoLength, logoWidth));
|
|
|
item.add(DateUtil.format(record.getOrderCreateTime(), "yyyy-MM-dd"));
|
|
@@ -588,22 +588,22 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
|
|
|
item.add(record.getRemark());
|
|
|
item.add(DateUtil.format(record.getDeliveryPeriod(), "yyyy-MM-dd"));
|
|
|
item.add(record.getLackStatus() == 1 ? "欠料" : "未欠料");
|
|
|
- item.add(record.getFinishQuantity().divide(record.getQuantity(), 2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)) + "%");
|
|
|
+ item.add(record.getFinishQuantity().divide(record.getQuantity(), 2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).stripTrailingZeros().toPlainString() + "%");
|
|
|
item.add(record.getCode());
|
|
|
- item.add(record.getContractCompanyName());
|
|
|
- item.add(record.getContractDeptName());
|
|
|
- Integer contractType = record.getContractType();
|
|
|
- item.add(contractType == 1 ? "外贸订单(退税)" : contractType == 2 ? "内销订单" : contractType == 3 ? "打样订单" : contractType == 4 ? "外贸订单(不退税)" : contractType);
|
|
|
- item.add(record.getIsOverdue() == 1 ? "逾期" : "未逾期");
|
|
|
- Integer produceStatus = record.getProduceStatus();
|
|
|
- item.add(produceStatus == 0 ? "未开始" : produceStatus == 1 ? "生产中" : produceStatus == 2 ? "生产完成" : produceStatus == 5 ? "出库中" : produceStatus == 10 ? "已出库" : produceStatus == 88 ? "作废" : produceStatus == 99 ? "终止" : produceStatus);
|
|
|
- StringJoiner tagNames = new StringJoiner(",");
|
|
|
- for (String tag : ObjectUtil.defaultIfNull(record.getProdTag(), "").split(",")) {
|
|
|
- tagNames.add(contractProdTagMap.getOrDefault(tag, tag));
|
|
|
- }
|
|
|
- item.add(tagNames.toString());
|
|
|
- item.add(DateUtil.format(record.getFinishTime(), "yyyy-MM-dd"));
|
|
|
- item.add(record.getUsageTime());
|
|
|
+// item.add(record.getContractCompanyName());
|
|
|
+// item.add(record.getContractDeptName());
|
|
|
+// Integer contractType = record.getContractType();
|
|
|
+// item.add(contractType == 1 ? "外贸订单(退税)" : contractType == 2 ? "内销订单" : contractType == 3 ? "打样订单" : contractType == 4 ? "外贸订单(不退税)" : contractType);
|
|
|
+// item.add(record.getIsOverdue() == 1 ? "逾期" : "未逾期");
|
|
|
+// Integer produceStatus = record.getProduceStatus();
|
|
|
+// item.add(produceStatus == 0 ? "未开始" : produceStatus == 1 ? "生产中" : produceStatus == 2 ? "生产完成" : produceStatus == 5 ? "出库中" : produceStatus == 10 ? "已出库" : produceStatus == 88 ? "作废" : produceStatus == 99 ? "终止" : produceStatus);
|
|
|
+// StringJoiner tagNames = new StringJoiner(",");
|
|
|
+// for (String tag : ObjectUtil.defaultIfNull(record.getProdTag(), "").split(",")) {
|
|
|
+// tagNames.add(contractProdTagMap.getOrDefault(tag, tag));
|
|
|
+// }
|
|
|
+// item.add(tagNames.toString());
|
|
|
+// item.add(DateUtil.format(record.getFinishTime(), "yyyy-MM-dd"));
|
|
|
+// item.add(record.getUsageTime());
|
|
|
|
|
|
//动态工序部分
|
|
|
List<ProductionTaskProgressVo> progressList = record.getProductionTaskProgressList();
|
|
@@ -623,7 +623,9 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
|
|
|
|
|
|
//标题
|
|
|
List<List<String>> headList = new ArrayList<List<String>>();
|
|
|
- for (String title : Arrays.asList("客户", "业务员", "订单组别", "订单编号", "归属业务", "产品类别", "产品编码", "产品名称", "产品颜色", "规格尺寸(cm)", "正面纹路", "背面纹路", "LOGO尺寸", "下单日期", "订单数量", "已完成", "欠量", "进度说明", "出货交期", "欠料状态", "进度达成率", "生产订单号", "业务公司", "业务部门", "订单类型", "是否逾期", "生产状态", "生产指示", "完成时间", "生产用时")) {
|
|
|
+ for (String title : Arrays.asList("客户", "业务员", "订单组别", "订单编号", "归属业务", "产品类别", "产品编码", "产品名称", "产品颜色", "规格尺寸(cm)", "正面纹路", "背面纹路", "LOGO尺寸(cm)", "下单日期", "订单数量", "已完成", "欠量", "进度说明", "出货交期", "欠料状态", "进度达成率", "生产订单号"
|
|
|
+ //,"业务公司", "业务部门", "订单类型", "是否逾期", "生产状态", "生产指示", "完成时间", "生产用时"
|
|
|
+ )) {
|
|
|
headList.add(Arrays.asList(title));
|
|
|
}
|
|
|
for (ProductionProcesses productionProcesses : ppList) {
|
|
@@ -638,7 +640,7 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
|
|
|
String fileName = DateUtils.format(new Date(), DateUtils.DATE_FORMAT_14) + "导出数据";
|
|
|
fileName = URLEncoder.encode(fileName, Charsets.UTF_8.name());
|
|
|
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
|
|
|
- EasyExcel.write(response.getOutputStream()).sheet().head(headList).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).doWrite(writeList);
|
|
|
+ EasyExcel.write(response.getOutputStream()).sheet("生产任务").head(headList).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).doWrite(writeList);
|
|
|
} catch (Exception e) {
|
|
|
throw new ServiceException(e.getMessage());
|
|
|
}
|