canrd-outside / order-erp · Commits

Commit f0b0fac0164699642c79b6073468d7d4835ecb17

Authored by chenhang4442024
1 parent e0a1536e
build: skipped

生产指示书报告改为生产指示书 

生产指示书对于价格添加货币符号
Inline Side-by-side
Showing 3 changed files with 5 additions and 5 deletions
src/main/java/com/order/erp/common/utils/EasyPdfUtils.java
  View file @f0b0fac
@@ -397,8 +397,8 @@ public class EasyPdfUtils { @@ -397,8 +397,8 @@ public class EasyPdfUtils {
397 } 397 }
398 dataCellList.add(createCell(productionDepartmentConsignTime, 110F)); 398 dataCellList.add(createCell(productionDepartmentConsignTime, 110F));
399 dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getPacketType()) ? producePdfVO.getPacketType() : "", 90F)); 399 dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getPacketType()) ? producePdfVO.getPacketType() : "", 90F));
400 - dataCellList.add(createCell(Objects.nonNull(producePdfVO.getProductionDepartmentPrice()) ? "" + producePdfVO.getProductionDepartmentPrice() : "", 110F));  
401 - dataCellList.add(createCell(Objects.nonNull(producePdfVO.getProductionDepartmentTotalPrice()) ? "" + producePdfVO.getProductionDepartmentTotalPrice() : "", 110F)); 400 + dataCellList.add(createCell(Objects.nonNull(producePdfVO.getProductionDepartmentPrice()) ? "" + producePdfVO.getProductionDepartmentPrice()+"￥" : "", 110F));
  401 + dataCellList.add(createCell(Objects.nonNull(producePdfVO.getProductionDepartmentTotalPrice()) ? "" + producePdfVO.getProductionDepartmentTotalPrice()+"￥" : "", 110F));
402 rowList.add(XEasyPdfHandler.Table.Row.build(dataCellList)); 402 rowList.add(XEasyPdfHandler.Table.Row.build(dataCellList));
403 } 403 }
404 404
@@ -418,7 +418,7 @@ public class EasyPdfUtils { @@ -418,7 +418,7 @@ public class EasyPdfUtils {
418 endCellList.add(createCell("", 110F)); 418 endCellList.add(createCell("", 110F));
419 endCellList.add(createCell("", 90F)); 419 endCellList.add(createCell("", 90F));
420 endCellList.add(createCell("", 110F)); 420 endCellList.add(createCell("", 110F));
421 - endCellList.add(createCell("" + totalPrice, 110F, 16F)); 421 + endCellList.add(createCell("" + totalPrice+"￥", 110F, 16F));
422 rowList.add(XEasyPdfHandler.Table.Row.build(endCellList)); 422 rowList.add(XEasyPdfHandler.Table.Row.build(endCellList));
423 } 423 }
424 424
src/main/java/com/order/erp/domain/EmailTemplateEnum.java
  View file @f0b0fac
@@ -31,7 +31,7 @@ public enum EmailTemplateEnum { @@ -31,7 +31,7 @@ public enum EmailTemplateEnum {
31 31
32 END_CHECK_REPORT_TEMPLATE("尾期验货报告", "您好，请查收尾期验货报告", 9L), 32 END_CHECK_REPORT_TEMPLATE("尾期验货报告", "您好，请查收尾期验货报告", 9L),
33 33
34 - PRODUCE_INDICATE_REPORT("生产指示书报告","你好，请查收附件生产订单",10L), 34 + PRODUCE_INDICATE_REPORT("生产指示书","你好，请查收附件生产订单",10L),
35 35
36 PRODUCE_IDEA("产品意见信息","你好，请查收产品意见信息",11L), 36 PRODUCE_IDEA("产品意见信息","你好，请查收产品意见信息",11L),
37 37
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @f0b0fac
@@ -1261,7 +1261,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O @@ -1261,7 +1261,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
1261 if (CollectionUtils.isEmpty(inspectionStageDOS)) { 1261 if (CollectionUtils.isEmpty(inspectionStageDOS)) {
1262 return; 1262 return;
1263 } 1263 }
1264 - Map<Long, OrderInspectionStageDO> inspectionStageDOMap = inspectionStageDOS.stream().collect(Collectors.toMap(OrderInspectionStageDO::getOrderId, Function.identity())); 1264 + Map<Long, OrderInspectionStageDO> inspectionStageDOMap = inspectionStageDOS.stream().collect(Collectors.toMap(OrderInspectionStageDO::getOrderId, Function.identity(),(existing, replacement) -> existing));
1265 orderInfoResultVOList.forEach(result -> { 1265 orderInfoResultVOList.forEach(result -> {
1266 if (inspectionStageDOMap.containsKey(result.getId())) { 1266 if (inspectionStageDOMap.containsKey(result.getId())) {
1267 OrderInspectionStageDO inspectionStageDO = inspectionStageDOMap.get(result.getId()); 1267 OrderInspectionStageDO inspectionStageDO = inspectionStageDOMap.get(result.getId());