From 9e930b2aaab6fc5ec59963b224618cc763d6c79b Mon Sep 17 00:00:00 2001 From: 10001392 <1055202292@qq.com> Date: Thu, 5 Sep 2024 09:31:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=96=99=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E3=80=91=E6=8F=90=E7=A4=BA=E8=AF=AD=20=E3=80=90=E6=A0=87?= =?UTF-8?q?=E5=87=86=E9=83=A8=E4=BB=B6=E3=80=91=E9=9D=9E=E6=A0=87=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=9A=E9=80=89=E5=9E=8B?= =?UTF-8?q?=E8=AF=B4=E6=98=8E=EF=BC=8C=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/dto/ExcelDTO/StandardPartPickExcelDTO.java | 6 ++++++ .../product/material/service/MaterialUpdateBillService.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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物料时不能选激活，应选择售后专用或禁止采购")); } }