From 30d17b3051ca720b7f6e012d878a3ea5e0975aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Wed, 20 Aug 2025 15:15:21 +0800 Subject: [PATCH] =?UTF-8?q?08-20-=E4=BE=9B=E5=BA=94=E5=95=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E7=9B=91=E5=90=AC=E5=99=A8,=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=85=A5=E5=BA=93=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cailiaoshebei/controller/constant.java | 1 + .../TenderSupplierInputController.java | 6 +++ .../tender/domain/TenderSupplierInput.java | 20 +++++++ .../domain/bo/TenderSupplierInputBo.java | 20 +++++++ .../domain/vo/TenderSupplierInputVo.java | 23 ++++++++ .../service/ITenderSupplierInputService.java | 3 +- .../impl/TenderSupplierInputServiceImpl.java | 52 +++++++++++++++---- 7 files changed, 113 insertions(+), 12 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/constant.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/constant.java index 224fcc33..1d3c8250 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/constant.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/constant.java @@ -17,6 +17,7 @@ public class constant { public static final String EquipmentOrdering = "equipmentOrdering"; //订货 public static final String PURCHASE_DOC_FILE_URL = "docs/purchase/doc/"; // 采购联系单文件路径 public static final String PURCHASE_DOC_TEMPLATE_PATH = "template/物资采购联系单模版.docx"; // 采购联系单文件路径 + public static final String SUPPLIER_INPUT = "supplierInput";//供应商入库 /** * 获取物资采购联系单文件名 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java index 5b0b330e..f7a0ed73 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java @@ -2,10 +2,15 @@ package org.dromara.tender.controller; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import lombok.extern.slf4j.Slf4j; +import org.dromara.cailiaoshebei.controller.constant; +import org.dromara.cailiaoshebei.domain.BusCailiaoshebeiPici; +import org.dromara.common.core.domain.event.ProcessEvent; import org.dromara.system.service.ISysOssService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,6 +36,7 @@ import org.springframework.web.multipart.MultipartFile; * @author Lion Li * @date 2025-08-19 */ +@Slf4j @Validated @RequiredArgsConstructor @RestController diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/TenderSupplierInput.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/TenderSupplierInput.java index 8a6f9b71..4b57f6b9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/TenderSupplierInput.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/TenderSupplierInput.java @@ -32,6 +32,21 @@ public class TenderSupplierInput extends BaseEntity { */ private String supplierType; + /*** + * 供应商名称 + */ + private String supplierName; + + /*** + * 供应商负责人 + */ + private String supplierPerson; + + /*** + * 负责人电话 + */ + private String personPhone; + /*** * 资料文件ID */ @@ -42,5 +57,10 @@ public class TenderSupplierInput extends BaseEntity { */ private String inputFile; + /*** + * 审核状态 + */ + private String state; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderSupplierInputBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderSupplierInputBo.java index 6d8bd7b0..c40b2095 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderSupplierInputBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/bo/TenderSupplierInputBo.java @@ -31,10 +31,30 @@ public class TenderSupplierInputBo extends BaseEntity { */ private String supplierType; + /*** + * 供应商名称 + */ + private String supplierName; + + /*** + * 供应商负责人 + */ + private String supplierPerson; + + /*** + * 负责人电话 + */ + private String personPhone; + /** * 入库资料 */ private String inputFile; + /*** + * 审核状态 + */ + private String state; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/TenderSupplierInputVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/TenderSupplierInputVo.java index 0df0fffd..8bcf7d96 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/TenderSupplierInputVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/domain/vo/TenderSupplierInputVo.java @@ -40,11 +40,34 @@ public class TenderSupplierInputVo implements Serializable { @ExcelProperty(value = "供应商类型") private String supplierType; + /*** + * 供应商名称 + */ + @ExcelProperty(value = "供应商名称") + private String supplierName; + + /*** + * 供应商负责人 + */ + @ExcelProperty(value = "供应商负责人") + private String supplierPerson; + + /*** + * 负责人电话 + */ + @ExcelProperty(value = "负责人电话") + private String personPhone; + /** * 入库资料 */ @ExcelProperty(value = "入库资料") private String inputFile; + /*** + * 审核状态 + */ + @ExcelProperty(value = "审核状态") + private String state; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/ITenderSupplierInputService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/ITenderSupplierInputService.java index 15eb8ad5..0e4dddaa 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/ITenderSupplierInputService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/ITenderSupplierInputService.java @@ -18,7 +18,8 @@ import java.util.List; * @author Lion Li * @date 2025-08-19 */ -public interface ITenderSupplierInputService extends IService{ +public interface +ITenderSupplierInputService extends IService{ /** * 查询供应商入库 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java index ee0ea9d1..b365e95a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java @@ -1,6 +1,10 @@ package org.dromara.tender.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.dromara.cailiaoshebei.controller.constant; +import org.dromara.cailiaoshebei.domain.BusCailiaoshebeiPici; +import org.dromara.common.core.domain.event.ProcessEvent; import org.dromara.common.core.service.OssService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -35,6 +39,7 @@ import static org.dromara.common.constant.MinioPathConstant.SupplierInput; * @author Lion Li * @date 2025-08-19 */ +@Slf4j @RequiredArgsConstructor @Service public class TenderSupplierInputServiceImpl extends ServiceImpl implements ITenderSupplierInputService { @@ -99,7 +104,7 @@ public class TenderSupplierInputServiceImpl extends ServiceImpl 0; if (flag) { @@ -118,11 +123,11 @@ public class TenderSupplierInputServiceImpl extends ServiceImpl 0; } @@ -145,15 +150,40 @@ public class TenderSupplierInputServiceImpl extends ServiceImpl ids, Boolean isValid) { if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 - List fileIds = new ArrayList<>(); - for (Long id : ids) { - TenderSupplierInput byId = getById(id); - if (byId.getFileId() != null){ - fileIds.add(byId.getFileId()); - } - } - ossService.deleteWithValidByIds(fileIds, false); +// List fileIds = new ArrayList<>(); +// for (Long id : ids) { +// TenderSupplierInput byId = getById(id); +// if (byId.getFileId() != null){ +// fileIds.add(byId.getFileId()); +// } +// } +// ossService.deleteWithValidByIds(fileIds, false); } return baseMapper.deleteByIds(ids) > 0; } + + + /** + * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等) + * 正常使用只需#processEvent.flowCode=='leave1' + * 示例为了方便则使用startsWith匹配了全部示例key + * + * @param processEvent 参数 + */ + @org.springframework.context.event.EventListener(condition = "#processEvent.flowCode.endsWith('"+ constant.SUPPLIER_INPUT+"')") + public void processPlansHandler(ProcessEvent processEvent) { + log.info("物资计划审核任务执行了{}", processEvent.toString()); + TenderSupplierInput byId = getById(processEvent.getBusinessId()); + byId.setState(processEvent.getStatus()); + boolean b = updateById(byId); + if (!b){ + log.error("更改供应商入库状态失败"); + } +// String batchNumber = processEvent.getBusinessId().split("_")[0]; +// //1、根据批次ID改编审核状态 +// BusCailiaoshebeiPici busCailiaoshebeiPici = new BusCailiaoshebeiPici().setApprovalPlan(processEvent.getStatus()); +// busCailiaoshebeiPiciService.update(busCailiaoshebeiPici, new LambdaQueryWrapper() +// .eq(BusCailiaoshebeiPici::getBatchNumber, batchNumber)); + } + }