diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java index b5595dbc..b4598142 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java @@ -116,9 +116,9 @@ public class RemindMsg extends BaseEntity { @Schema(description = "编码") private String code; /** - * 类型 + * 类型 0：零件号提醒 1: 镀层提醒 2：颜色提醒 3:材料提醒 */ - @Schema(description = "类型") + @Schema(description = "类型 0：零件号提醒 1: 镀层提醒 2：颜色提醒 3:材料提醒") private Long remindMsgType; /** * [零件]id @@ -176,15 +176,10 @@ public class RemindMsg extends BaseEntity { @Schema(description = "子[零件]id") private Long subPartId; /** - * 子[零件]编码 + * 子[零件]编码,虚拟子件号 */ - @Schema(description = "子[零件]编码") + @Schema(description = "子[零件]编码,虚拟子件号") private String subPartCode; - /** - * 生产标识 - */ - @Schema(description = "生产标识") - private String prodFlagText; /** * 参数1 */ @@ -210,4 +205,30 @@ public class RemindMsg extends BaseEntity { */ @Schema(description = "[零件]名称") private String partName; + + //镀种信息 + private String plateing; + + //参数1上限 + private BigDecimal param1Up; + //参数1下限 + private BigDecimal param1Down; + //参数2上限 + private BigDecimal param2Up; + //参数2下限 + private BigDecimal param2Down; + //参数3上限 + private BigDecimal param3Up; + //参数3下限 + private BigDecimal param3Down; + //提醒颜色 + private String remindColor; + //显示颜色 + private String showColor; + + //程式编号 + private String formula; + //材料 + private String material; + } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java index 226690d2..0ef0a89d 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java @@ -28,4 +28,9 @@ public class RemindMsgVO extends RemindMsg { private String platingName = ""; @Schema(description = "工艺一级路线") private String processClazz1Name = ""; + + private String param1; + private String param2; + private String param3; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java index d93e46d0..9d7db4a1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java @@ -100,6 +100,7 @@ public class RemindMsgController extends BladeController { // qw.like(RemindMsg.PART_NAME, partName); // } // qw.like(map.containsKey("partName"), RemindMsg.PART_NAME, map.get("partName")); + qw.orderByDesc("CREATE_TIME"); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = RemindMsgWrapper.build().pageVO(pages); pagesVO.getRecords() @@ -155,9 +156,39 @@ public class RemindMsgController extends BladeController { @ApiLog("新增提醒信息") @Operation(summary = "新增批量", description = "传入RemindMsg List") public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { + + for(RemindMsg one : addList){ + if(0== one.getRemindMsgType()){ + + } + if(1== one.getRemindMsgType()){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("PLATEING",one.getPlateing()); + if(service.count(qw)>0){ + return R.fail(one.getPlateing()+"此镀种信息已存在"); + } + + } + if(2== one.getRemindMsgType()){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("SUB_PART_CODE",one.getSubPartCode()); + if(service.count(qw)>0){ + return R.fail(one.getSubPartCode()+"此零件信息已存在"); + } + } + if(3== one.getRemindMsgType()){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("FORMULA",one.getFormula()); + if(service.count(qw)>0){ + return R.fail(one.getFormula()+"此程式编号已存在"); + } + } one.setId(null); - }); + } + +// addList.forEach(one -> { +// one.setId(null); +// }); return R.status(service.saveBatch(addList)); } @@ -169,6 +200,36 @@ public class RemindMsgController extends BladeController { @ApiLog("修改提醒信息") @Operation(summary = "修改一条", description = "传入RemindMsg Obj") public R update(@Valid @RequestBody RemindMsg updateOne) { + + if(0== updateOne.getRemindMsgType()){ + + } + if(1== updateOne.getRemindMsgType()){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("PLATEING",updateOne.getPlateing()); + qw.ne("ID",updateOne.getId()); + if(service.count(qw)>0){ + return R.fail(updateOne.getPlateing()+"此镀种信息已存在"); + } + + } + if(2== updateOne.getRemindMsgType()){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("SUB_PART_CODE",updateOne.getSubPartCode()); + qw.ne("ID",updateOne.getId()); + if(service.count(qw)>0){ + return R.fail(updateOne.getSubPartCode()+"此零件信息已存在"); + } + } + if(3== updateOne.getRemindMsgType()){ + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("FORMULA",updateOne.getFormula()); + qw.ne("ID",updateOne.getId()); + if(service.count(qw)>0){ + return R.fail(updateOne.getFormula()+"此程式编号已存在"); + } + } + return R.status(service.updateById(updateOne)); } @@ -257,6 +318,33 @@ public class RemindMsgController extends BladeController { "导入模版-消息提醒.xls"); } + @GetMapping("/downloadExcelTemplatePlate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplatePlate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/镀种消息提醒.xls", + "导入模版-镀种消息提醒.xls"); + } + + @GetMapping("/downloadExcelTemplateColor") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplateColor() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/颜色消息提醒.xls", + "导入模版-颜色消息提醒.xls"); + } + + @GetMapping("/downloadExcelTemplateMaterial") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplateMaterial() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/材料消息提醒.xls", + "导入模版-材料消息提醒.xls"); + } + /** * [提醒信息] 导入Excel */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/RemindMsgExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/RemindMsgExcel.java index b4be9bff..86b10030 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/RemindMsgExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/RemindMsgExcel.java @@ -114,6 +114,10 @@ public class RemindMsgExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("子[零件]编码") private String subPartCode; + + @ColumnWidth(20) + @ExcelProperty("虚拟子件号") + private String subPartCodeNew; /** * 生产标识 */ @@ -144,4 +148,40 @@ public class RemindMsgExcel implements Serializable { // @ColumnWidth(20) // @ExcelProperty("参数4") private String param4; + + //镀种信息 + @ExcelProperty("镀种信息") + private String plateing; + + //参数1上限 + @ExcelProperty("参数1上限") + private BigDecimal param1Up; + //参数1下限 + @ExcelProperty("参数1下限") + private BigDecimal param1Down; + //参数2上限 + @ExcelProperty("参数2上限") + private BigDecimal param2Up; + //参数2下限 + @ExcelProperty("参数2下限") + private BigDecimal param2Down; + //参数3上限 + @ExcelProperty("参数3上限") + private BigDecimal param3Up; + //参数3下限 + @ExcelProperty("参数3下限") + private BigDecimal param3Down; + //提醒颜色 + @ExcelProperty("提醒颜色") + private String remindColor; + //显示颜色 + @ExcelProperty("显示颜色") + private String showColor; + + //程式编号 + @ExcelProperty("程式编号") + private String formula; + //材料 + @ExcelProperty("材料") + private String material; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/RemindMsgServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/RemindMsgServiceImpl.java index 2a9cd19b..d42d0800 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/RemindMsgServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/RemindMsgServiceImpl.java @@ -72,5 +72,35 @@ public class RemindMsgServiceImpl extends BaseServiceImpl