diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/constant/BizTypeConstant.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/constant/BizTypeConstant.java index 955d0237..12dec4d6 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/constant/BizTypeConstant.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/constant/BizTypeConstant.java @@ -6,4 +6,9 @@ package org.springblade.desk.common.constant; * @create 2026-02-26 14:40 */ public interface BizTypeConstant { + + /** + * 镀层物料添加量申报 + */ + String GOODS_APPLY = "镀层物料添加量申报"; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/pojo/entity/MesNotifyMessageEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/pojo/entity/MesNotifyMessageEntity.java index e21930cb..6881af0b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/pojo/entity/MesNotifyMessageEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/pojo/entity/MesNotifyMessageEntity.java @@ -1,34 +1,8 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ package org.springblade.desk.common.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; +import lombok.*; import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; @@ -39,6 +13,9 @@ import java.io.Serial; * @since 2026-02-26 */ @Data +@Builder +@NoArgsConstructor +@AllArgsConstructor @TableName("MES_NOTIFY_MESSAGE") @Schema(description = "MesNotifyMessage对象") @EqualsAndHashCode(callSuper = true) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsTeamSetEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsTeamSetEntity.java index ca7975c1..4e782082 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsTeamSetEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsTeamSetEntity.java @@ -25,15 +25,14 @@ */ package org.springblade.desk.dashboard.pojo.entity; -import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableName; -import java.math.BigDecimal; -import java.util.Date; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.tenant.mp.TenantEntity; + import java.io.Serial; +import java.math.BigDecimal; /** * 班组设置表 实体类 @@ -115,6 +114,6 @@ public class BsTeamSetEntity extends BaseEntity { * 作业中心（外键） */ @Schema(description = "作业中心（外键）") - private BigDecimal wcId; + private Long wcId; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/IMesNotifyMessageService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/IMesNotifyMessageService.java index e1487596..ef1a5251 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/IMesNotifyMessageService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/IMesNotifyMessageService.java @@ -55,4 +55,14 @@ public interface IMesNotifyMessageService extends BaseService ids); + + /** + * 新增消息提醒 + * @param bizType + * @param title + * @param content + * @param receiveUserId + * @return + */ + boolean saveMsg(String bizType, String title, String content, Long receiveUserId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesNotifyMessageServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesNotifyMessageServiceImpl.java index e65c08d4..9c602d26 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesNotifyMessageServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/common/service/impl/MesNotifyMessageServiceImpl.java @@ -31,7 +31,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.desk.common.mapper.MesNotifyMessageMapper; import org.springblade.desk.common.pojo.entity.MesNotifyMessageEntity; import org.springblade.desk.common.pojo.vo.MesNotifyMessageVO; @@ -81,9 +80,20 @@ public class MesNotifyMessageServiceImpl extends BaseServiceImpl ids) { this.update(new LambdaUpdateWrapper() - .in(MesNotifyMessageEntity::getId, ids) - .set(MesNotifyMessageEntity::getStatus, 1)); + .in(MesNotifyMessageEntity::getId, ids) + .set(MesNotifyMessageEntity::getStatus, 1)); return true; } + @Override + public boolean saveMsg(String bizType, String title, String content, Long receiveUserId) { + MesNotifyMessageEntity mesNotifyMessage = MesNotifyMessageEntity.builder() + .bizType(bizType) + .title(title) + .content(content) + .receiveUserId(receiveUserId) + .build(); + return this.save(mesNotifyMessage); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IBsTeamSetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IBsTeamSetService.java index e865f76c..a280a9b2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IBsTeamSetService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IBsTeamSetService.java @@ -26,12 +26,13 @@ package org.springblade.desk.dashboard.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.dashboard.excel.BsTeamSetExcel; import org.springblade.desk.dashboard.pojo.entity.BsTeamSetEntity; import org.springblade.desk.dashboard.pojo.vo.BsTeamSetEntityVO; import org.springblade.desk.dashboard.pojo.vo.BsTeamSetVO; -import org.springblade.desk.dashboard.excel.BsTeamSetExcel; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseService; + import java.util.List; /** @@ -69,8 +70,17 @@ public interface IBsTeamSetService extends BaseService { /** * 根据班组ID查询 + * * @param tsId * @return */ - BsTeamSetEntity selectBsTeamSetByTsId(Long tsId); + BsTeamSetEntity selectBsTeamSetByTsId(Long tsId); + + /** + * 根据班组名称查询 + * + * @param teamName + * @return + */ + BsTeamSetEntity selectByTeamName(String teamName); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/BsTeamSetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/BsTeamSetServiceImpl.java index b857241e..34ecd3df 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/BsTeamSetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/BsTeamSetServiceImpl.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.dashboard.service.impl; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springblade.desk.dashboard.pojo.entity.BsTeamSetEntity; import org.springblade.desk.dashboard.pojo.vo.BsTeamSetEntityVO; import org.springblade.desk.dashboard.pojo.vo.BsTeamSetVO; @@ -75,4 +76,9 @@ public class BsTeamSetServiceImpl extends BaseServiceImpl createByOderId(String orderId) { + Boolean result = moldDemandService.createByOderId(orderId); + + return R.success(); + } + /** * 批量关闭 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java index 3fabc6f2..80652c53 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java @@ -14,6 +14,8 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.common.constant.BizTypeConstant; +import org.springblade.desk.common.service.IMesNotifyMessageService; import org.springblade.desk.order.pojo.entity.AssayContentDetail; import org.springblade.desk.order.pojo.entity.PlateGoodsApply; import org.springblade.desk.order.pojo.entity.PlateGoodsRecord; @@ -41,6 +43,7 @@ public class PlateGoodsApplyController extends BladeController { private final IPlateGoodsApplyService plateGoodsApplyService; private final IPlateGoodsApplyDetailService plateGoodsApplyDetailService; + private final IMesNotifyMessageService mesNotifyMessageService; /** * 分页 @@ -82,11 +85,13 @@ public class PlateGoodsApplyController extends BladeController { @Operation(summary = "新增", description = "") public R save(@Valid @RequestBody PlateGoodsApplySave saveData) { PlateGoodsApply apply = saveData.getApply(); - List assayContentDetailList = saveData.getAssayContentDetailList(); - List recordIdList = saveData.getRecordIdList(); - plateGoodsApplyService.save(apply, assayContentDetailList, recordIdList); - return R.status(true); - } + List assayContentDetailList = saveData.getAssayContentDetailList(); + List recordIdList = saveData.getRecordIdList(); + plateGoodsApplyService.save(apply, assayContentDetailList, recordIdList); + + mesNotifyMessageService.saveMsg(BizTypeConstant.GOODS_APPLY, "", "", apply.getApprovalMan()); + return R.status(true); + } /** * 批量审核 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java index 1e186ea4..d5a8e281 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java @@ -154,7 +154,8 @@ public class YieldOrderController extends BladeController { @Operation(summary = "修改", description = "") public R update(@Valid @RequestBody YieldOrder entity) { Boolean result = yieldOrderService.updateById(entity); - return R.status(result); + String msg = yieldOrderService.dataVerify(Func.toLongList(entity.getId().toString())); + return R.success(msg); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml index 5cd0878c..54c32dc5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml @@ -74,8 +74,7 @@