朱园亮 / xingyun-erp · Commits

Commit 73dfeb698463230b9c66790d18d5770fb5bbb0fd

Authored by 房远帅
2 parents c5f7e869 52ab1532

Merge branch 'master_after20' into master_cj_zq

Inline Side-by-side
Showing 2 changed files with 16 additions and 2 deletions
... ... @@ -49,6 +49,12 @@ public class GetContractStdProcessingLineBo extends BaseBo<ContractStdProcessing
49 49 private String rawProductGrade;
50 50
51 51 /**
  52 + * 原材料牌号名称
  53 + */
  54 + @ApiModelProperty("原材料牌号")
  55 + private String rawProductGradeName;
  56 +
  57 + /**
52 58 * 行业
53 59 */
54 60 @ApiModelProperty("行业")
... ...
... ... @@ -118,6 +118,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
118 118 public static final String APPLICABLE_STANDARD_DIC_CODE = "APPLICABLE_STANDARD"; // 执行标准
119 119 public static final String AUDIT_STATUS_DIC_CODE = "AUDIT_STATUS"; // 审核状态
120 120 public static final String RAW_TO_PROD_RATIO_DIC_CODE = "RAW_TO_PROD_RATIO"; // 原材料与产品数量比
  121 + public static final String RAW_MATERIAL = "RAW_MATERIAL"; // 原材料
  122 + public static final String RAW_MATERIAL_GRADE = "RAW_MATERIAL_GRADE"; // 原材料牌号
121 123
122 124 /**
123 125 * 查询列表
... ... @@ -390,12 +392,18 @@ public class ContractDistributorStandardController extends DefaultBaseController
390 392 List<GetContractStdProcessingLineBo> lineBoList = new ArrayList<>(contractStdProcessingLineList.size());
391 393 List<SysDataDicItem> rawToProdRatioDiciItemList = sysDataDicItemService.findByDicCode(RAW_TO_PROD_RATIO_DIC_CODE);
392 394 Map<String, String> rawToProdRatioCodeAndNameMap = rawToProdRatioDiciItemList.stream().collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
  395 + List<SysDataDicItem> rawMaterialDiciItemList = sysDataDicItemService.findByDicCode(RAW_MATERIAL);
  396 + Map<String, String> rawMaterialCodeAndNameMap = rawMaterialDiciItemList.stream().collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
  397 + List<SysDataDicItem> rawProductGradeDiciItemList = sysDataDicItemService.findByDicCode(RAW_MATERIAL_GRADE);
  398 + Map<String, String> rawProductGradeCodeAndNameMap = rawProductGradeDiciItemList.stream().collect(Collectors.toMap(SysDataDicItem::getCode, SysDataDicItem::getName));
393 399 contractStdProcessingLineList.forEach(contractStdProcessingLine -> {
394 400 GetContractStdProcessingLineBo contractStdProcessingLineBo = new GetContractStdProcessingLineBo(contractStdProcessingLine);
395   - String rawProductName = productCodeAndNameMap.get(contractStdProcessingLineBo.getRawProductId());
  401 + String rawProductName = rawMaterialCodeAndNameMap.get(contractStdProcessingLineBo.getRawProductId());
  402 + String rawProductGradeName = rawProductGradeCodeAndNameMap.get(contractStdProcessingLineBo.getRawProductGrade());
396 403 String productName = productCodeAndNameMap.get(contractStdProcessingLineBo.getProductId());
397 404 String materialProductRatioName = rawToProdRatioCodeAndNameMap.get(contractStdProcessingLineBo.getMaterialProductRatio());
398 405 contractStdProcessingLineBo.setRawProductName(rawProductName);
  406 + contractStdProcessingLineBo.setRawProductGradeName(rawProductGradeName);
399 407 contractStdProcessingLineBo.setProductName(productName);
400 408 contractStdProcessingLineBo.setMaterialProductRatioName(materialProductRatioName);
401 409 lineBoList.add(contractStdProcessingLineBo);
... ... @@ -1144,7 +1152,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
1144 1152 if (CollectionUtils.isNotEmpty(data.getContractStdProcessingLineList())) {
1145 1153 startRow++;
1146 1154 for (GetContractStdProcessingLineBo line : data.getContractStdProcessingLineList()) {
1147   - setCellValue(sheet, startRow, 1, line.getRawProductName() + "、" + line.getRawProductGrade());
  1155 + setCellValue(sheet, startRow, 1, line.getRawProductName() + "、" + line.getRawProductGradeName());
1148 1156 setCellValue(sheet, startRow, 4, line.getSupplyTime());
1149 1157 if ("其它".equals(line.getMaterialProductRatioName())) {
1150 1158 setCellValue(sheet, startRow, 5, line.getMaterialProductRatioName() + "|" + line.getMaterialProductRatioRemarks());
... ...