diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/ExcelDTO/StandardPartPickExcelDTO.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/ExcelDTO/StandardPartPickExcelDTO.java index 64e8d6fe..993b4e08 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/ExcelDTO/StandardPartPickExcelDTO.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/dto/ExcelDTO/StandardPartPickExcelDTO.java @@ -30,4 +30,10 @@ public class StandardPartPickExcelDTO implements Serializable { @ExcelColumn(value = "单重") private BigDecimal unitWeight; + + @ExcelColumn(value = "选型说明") + private String modelSelectionRemark; + + @ExcelColumn(value = "备注") + private String remark; } diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java index 26565695..2ad4d86b 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/service/MaterialUpdateBillService.java @@ -664,7 +664,7 @@ public class MaterialUpdateBillService extends ServiceImpl materialNos = filterList.stream().map(MaterialUpdateBillEntity::getMaterialNo).collect(Collectors.toList()); - throw new NflgBusinessException(STATE.ParamErr, StrUtil.join(",", materialNos).concat("物料解冻时,禁止改成激活")); + throw new NflgBusinessException(STATE.ParamErr, StrUtil.join(",", materialNos).concat("营销中心(工服)解冻11、21物料时不能选激活,应选择售后专用或禁止采购")); } }