From 0419b56b1198ee44cec62aea4648bb3a725cb607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Wed, 29 Oct 2025 17:55:13 +0800 Subject: [PATCH 1/8] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseOrderServiceImpl.java | 188 +++++++++++++----- .../salesorder/SalesOrderServiceImpl.java | 144 ++++++++++---- 2 files changed, 250 insertions(+), 82 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java index 8f95c9d5..bf0b6928 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java @@ -11,6 +11,7 @@ import com.zt.plat.module.bpm.api.task.BpmProcessInstanceApi; import com.zt.plat.module.bpm.api.task.BpmTaskApi; import com.zt.plat.module.bpm.api.task.dto.*; import com.zt.plat.module.bpm.enums.task.BpmProcessInstanceStatusEnum; +import com.zt.plat.module.bpm.enums.task.BpmTaskStatusEnum; import com.zt.plat.module.contractorder.api.vo.contract.ContractRespVO; import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.*; import com.zt.plat.module.contractorder.dal.dataobject.contract.SystemRelativityDO; @@ -40,6 +41,7 @@ import org.springframework.transaction.annotation.Transactional; import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.stream.Collectors; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; @@ -554,53 +556,61 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { return sequenceApi.getNextSequence("PURCHASE_ORDER_NUMBER", null, null).getData(); } - @Override - @Transactional(rollbackFor=Exception.class) - public boolean orderPassReject(PurchaseorderReqVO purchaseorderReqVO) { - PurchaseOrderDO purchaseOrderDO = purchaseOrderMapper.selectById(purchaseorderReqVO.getId()); - if (ObjectUtils.isEmpty(purchaseOrderDO)) { - throw exception(PURCHASE_ORDER_NOT_EXISTS); - } - // 获取当前流程正在审批的任务节点 - List taskList = bpmTaskApi.getTaskListByProcessInstanceId(purchaseOrderDO.getProcessInstanceId()).getData(); - BpmTaskRespDTO undoTask = taskList.get(taskList.size() - 1); +// @Override +// @Transactional(rollbackFor=Exception.class) +// public boolean orderPassReject(PurchaseorderReqVO purchaseorderReqVO) { +// PurchaseOrderDO purchaseOrderDO = purchaseOrderMapper.selectById(purchaseorderReqVO.getId()); +// if (ObjectUtils.isEmpty(purchaseOrderDO)) { +// throw exception(PURCHASE_ORDER_NOT_EXISTS); +// } +// // 获取当前流程正在审批的任务节点 +// List taskList = bpmTaskApi.getTaskListByProcessInstanceId(purchaseOrderDO.getProcessInstanceId()).getData(); +// BpmTaskRespDTO undoTask = taskList.get(taskList.size() - 1); +// +// // 判断是否流程已经通过、驳回 +// BpmApprovalDetailReqDTO badrDto = new BpmApprovalDetailReqDTO(); +// badrDto.setProcessInstanceId(purchaseOrderDO.getProcessInstanceId()); // 流程实例id +// badrDto.setTaskId(undoTask.getId()); // 当前审核任务节点id +// BpmApprovalDetailRespDTO approvalDetail = bpmProcessInstanceApi.getApprovalDetail(SecurityFrameworkUtils.getLoginUserId(), badrDto).getData(); +// //如果审核通过 +// if ("WAIT_PUSH".equals(purchaseorderReqVO.getStatus())) { +// purchaseOrderDO.setStatus(getStatusByBpmProcessInstanceCode(approvalDetail.getStatus())); +// } else { +// //如果审核不通过 +// purchaseOrderDO.setStatus(OrderStatusEnum.DRAFT.getCode()); +// } +// //设置审核意见 +// purchaseOrderDO.setReviewOpinion(purchaseorderReqVO.getReviewOpinion()); +// if (ObjectUtils.isNotEmpty(undoTask)) { +// purchaseOrderDO.setTaskId(undoTask.getId()); +// } +// purchaseOrderMapper.updateById(purchaseOrderDO); //更新状态 +// // 需要调用bpm 审核接口更新审批中的状态 +// if (DictEnum.BSE_CTRT_STS_WAIT_PUSH.getCode().equals(purchaseorderReqVO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) { +// if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) { +// BpmTaskApproveReqDTO btarDto = new BpmTaskApproveReqDTO(); +// btarDto.setId(undoTask.getId()); +// btarDto.setReason(purchaseorderReqVO.getReviewOpinion()); +// CommonResult booleanCommonResult = bpmProcessInstanceApi.approveTask(btarDto); +// if (booleanCommonResult.isError()) { +// throw new RuntimeException(booleanCommonResult.getMsg()); +// } +// } +// } else if (DictEnum.BSE_CTRT_STS_REJECTED.getCode().equals(purchaseorderReqVO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) { +// if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) { +// BpmTaskRejectReqDTO btrrDto = new BpmTaskRejectReqDTO(); +// btrrDto.setId(undoTask.getId()); +// btrrDto.setReason(purchaseorderReqVO.getReviewOpinion()); +// CommonResult booleanCommonResult = bpmProcessInstanceApi.rejectTask(btrrDto); +// if (booleanCommonResult.isError()) { +// throw new RuntimeException(booleanCommonResult.getMsg()); +// } +// } +// } +// return true; +// } + - // 判断是否流程已经通过、驳回 - BpmApprovalDetailReqDTO badrDto = new BpmApprovalDetailReqDTO(); - badrDto.setProcessInstanceId(purchaseOrderDO.getProcessInstanceId()); // 流程实例id - badrDto.setTaskId(undoTask.getId()); // 当前审核任务节点id - BpmApprovalDetailRespDTO approvalDetail = bpmProcessInstanceApi.getApprovalDetail(SecurityFrameworkUtils.getLoginUserId(), badrDto).getData(); - //如果审核通过 - if ("WAIT_PUSH".equals(purchaseorderReqVO.getStatus())) { - purchaseOrderDO.setStatus(OrderStatusEnum.TO_SUBMIT_ERP.getCode()); - } else { - //如果审核不通过 - purchaseOrderDO.setStatus(OrderStatusEnum.DRAFT.getCode()); - } - //设置审核意见 - purchaseOrderDO.setReviewOpinion(purchaseorderReqVO.getReviewOpinion()); - if (ObjectUtils.isNotEmpty(undoTask)) { - purchaseOrderDO.setTaskId(undoTask.getId()); - } - purchaseOrderMapper.updateById(purchaseOrderDO); //更新状态 - // 需要调用bpm 审核接口更新审批中的状态 - if (DictEnum.BSE_CTRT_STS_WAIT_PUSH.getCode().equals(purchaseorderReqVO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) { - if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) { - BpmTaskApproveReqDTO btarDto = new BpmTaskApproveReqDTO(); - btarDto.setId(undoTask.getId()); - btarDto.setReason(purchaseorderReqVO.getReviewOpinion()); - bpmProcessInstanceApi.approveTask(btarDto); - } - } else if (DictEnum.BSE_CTRT_STS_REJECTED.getCode().equals(purchaseorderReqVO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) { - if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) { - BpmTaskRejectReqDTO btrrDto = new BpmTaskRejectReqDTO(); - btrrDto.setId(undoTask.getId()); - btrrDto.setReason(purchaseorderReqVO.getReviewOpinion()); - bpmProcessInstanceApi.rejectTask(btrrDto); - } - } - return true; - } @Override public List getOrderByOrderIdAndType(DownOrUpOrderReqVO reqVO) { @@ -687,4 +697,90 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { public List getOrdersByIds(List ids) { return purchaseOrderMapper.selectByIds(ids); } + + @Override + @Transactional(rollbackFor=Exception.class) + public boolean orderPassReject(PurchaseorderReqVO purchaseorderReqVO) { + // 查询采购单 + PurchaseOrderDO purchaseOrderDO = purchaseOrderMapper.selectById(purchaseorderReqVO.getId()); + if (ObjectUtils.isEmpty(purchaseOrderDO)) { + throw exception(PURCHASE_ORDER_NOT_EXISTS); + } + + // 获取当前流程的所有任务节点 + List taskList = bpmTaskApi.getTaskListByProcessInstanceId(purchaseOrderDO.getProcessInstanceId()).getData(); + + // 筛选出当前待处理的任务（未结束的任务） + BpmTaskRespDTO undoTask = taskList.stream() + .filter(task -> task.getEndTime() == null) + .findFirst() + .orElse(null); + + if (ObjectUtils.isEmpty(undoTask)) { + throw new RuntimeException("未找到待审批的任务节点"); + } + + // 先调用BPM审批接口，再更新本地状态 + if (DictEnum.BSE_CTRT_STS_WAIT_PUSH.getCode().equals(purchaseorderReqVO.getStatus())) { + // 审批通过 + BpmTaskApproveReqDTO btarDto = new BpmTaskApproveReqDTO(); + btarDto.setId(undoTask.getId()); + btarDto.setReason(purchaseorderReqVO.getReviewOpinion()); + CommonResult result = bpmProcessInstanceApi.approveTask(btarDto); + if (result.isError()) { + throw new RuntimeException(result.getMsg()); + } + } else if (DictEnum.BSE_CTRT_STS_REJECTED.getCode().equals(purchaseorderReqVO.getStatus())) { + // 审批驳回 + BpmTaskRejectReqDTO btrrDto = new BpmTaskRejectReqDTO(); + btrrDto.setId(undoTask.getId()); + btrrDto.setReason(purchaseorderReqVO.getReviewOpinion()); + CommonResult result = bpmProcessInstanceApi.rejectTask(btrrDto); + if (result.isError()) { + throw new RuntimeException(result.getMsg()); + } + } + + // 调用BPM接口后，查询最新的审批详情 + BpmApprovalDetailReqDTO badrDto = new BpmApprovalDetailReqDTO(); + badrDto.setProcessInstanceId(purchaseOrderDO.getProcessInstanceId()); + badrDto.setTaskId(undoTask.getId()); + BpmApprovalDetailRespDTO approvalDetail = bpmProcessInstanceApi.getApprovalDetail(SecurityFrameworkUtils.getLoginUserId(), badrDto).getData(); + + // 使用统一方法转换状态 + purchaseOrderDO.setStatus(getStatusByBpmProcessInstanceCode(approvalDetail.getStatus())); + purchaseOrderDO.setReviewOpinion(purchaseorderReqVO.getReviewOpinion()); + purchaseOrderDO.setTaskId(undoTask.getId()); + + purchaseOrderMapper.updateById(purchaseOrderDO); + + return true; + } + + private String getStatusByBpmProcessInstanceCode(Integer code) { + log.debug("转换BPM状态码 - 输入码: {}", code); + return Optional.ofNullable(code) + .map(c -> switch (c) { + case -1, 3, 4 -> { + log.debug("BPM状态码 {} 转换为: {}", c, OrderStatusEnum.DRAFT.getCode()); + yield OrderStatusEnum.DRAFT.getCode(); + } + case 1 -> { + log.debug("BPM状态码 {} 转换为: {}", c, OrderStatusEnum.APPROVING.getCode()); + yield OrderStatusEnum.APPROVING.getCode(); + } + case 2 -> { + log.debug("BPM状态码 {} 转换为: {}", c, OrderStatusEnum.TO_SUBMIT_ERP.getCode()); + yield OrderStatusEnum.TO_SUBMIT_ERP.getCode(); + } + default -> { + log.error("未定义的BPM状态码: {}", c); + throw new IllegalArgumentException("未定义的BPM状态码：" + c); + } + }) + .orElseThrow(() -> { + log.error("BPM状态码为null"); + return new IllegalArgumentException("BPM状态码不能为null"); + }); + } } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java index 9348cdc4..f7df6612 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson2.JSONException; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils; @@ -17,6 +18,7 @@ import com.zt.plat.module.contractorder.api.vo.contract.ContractRespVO; import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.*; import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.*; import com.zt.plat.module.contractorder.dal.dataobject.contract.SystemRelativityDO; +import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PurchaseOrderDO; import com.zt.plat.module.contractorder.dal.dataobject.salesorder.SalesOrderDO; import com.zt.plat.module.contractorder.dal.mysql.contract.SystemRelativityMapper; import com.zt.plat.module.contractorder.dal.mysql.salesorder.SalesOrderMapper; @@ -40,6 +42,7 @@ import org.springframework.validation.annotation.Validated; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.module.contractorder.enums.ErrorCodeConstants.CONTRACT_ORDER_EXISTS; @@ -311,55 +314,113 @@ public class SalesOrderServiceImpl implements SalesOrderService { return "提交审批成功"; } +// @Override +// @Transactional +// public boolean orderPassReject(SalesOrderReviewReqVO salesOrderReviewReqVO) { +// SalesOrderDO salesOrderDO = salesOrderMapper.selectById(salesOrderReviewReqVO.getId()); +// if (ObjectUtils.isEmpty(salesOrderDO)) { +// throw exception(PURCHASE_ORDER_NOT_EXISTS); +// } +// // 获取当前流程正在审批的任务节点 +// List taskList = bpmTaskApi.getTaskListByProcessInstanceId(salesOrderDO.getProcessInstanceId()).getData(); +// BpmTaskRespDTO undoTask = taskList.get(taskList.size() - 1); +// +// // 判断是否流程已经通过、驳回 +// BpmApprovalDetailReqDTO badrDto = new BpmApprovalDetailReqDTO(); +// badrDto.setProcessInstanceId(salesOrderDO.getProcessInstanceId()); // 流程实例id +// badrDto.setTaskId(undoTask.getId()); // 当前审核任务节点id +// BpmApprovalDetailRespDTO approvalDetail = bpmProcessInstanceApi.getApprovalDetail(SecurityFrameworkUtils.getLoginUserId(), badrDto).getData(); +// //如果审核通过 +// if ("WAIT_PUSH".equals(salesOrderReviewReqVO.getStatus())) { +// salesOrderDO.setStatus(getStatusByBpmProcessInstanceCode(approvalDetail.getStatus())); +// } else { +// //如果审核不通过 +// salesOrderDO.setStatus(OrderStatusEnum.DRAFT.getCode()); +// } +// //设置审核意见 +// salesOrderDO.setReviewOpinion(salesOrderDO.getReviewOpinion()); +// if (ObjectUtils.isNotEmpty(undoTask)) { +// salesOrderDO.setTaskId(undoTask.getId()); +// } +// salesOrderMapper.updateById(salesOrderDO); //更新状态 +// +// // 需要调用bpm 审核接口更新审批中的状态 +// if (DictEnum.BSE_CTRT_STS_WAIT_PUSH.getCode().equals(salesOrderDO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) { +// if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) { +// BpmTaskApproveReqDTO btarDto = new BpmTaskApproveReqDTO(); +// btarDto.setId(undoTask.getId()); +// btarDto.setReason(salesOrderDO.getReviewOpinion()); +// bpmProcessInstanceApi.approveTask(btarDto); +// } +// } else if (DictEnum.BSE_CTRT_STS_REJECTED.getCode().equals(salesOrderDO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) { +// if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) { +// BpmTaskRejectReqDTO btrrDto = new BpmTaskRejectReqDTO(); +// btrrDto.setId(undoTask.getId()); +// btrrDto.setReason(salesOrderDO.getReviewOpinion()); +// bpmProcessInstanceApi.rejectTask(btrrDto); +// } +// } +// return true; +// } + @Override - @Transactional + @Transactional(rollbackFor=Exception.class) public boolean orderPassReject(SalesOrderReviewReqVO salesOrderReviewReqVO) { + // 查询采购单 SalesOrderDO salesOrderDO = salesOrderMapper.selectById(salesOrderReviewReqVO.getId()); if (ObjectUtils.isEmpty(salesOrderDO)) { throw exception(PURCHASE_ORDER_NOT_EXISTS); } - // 获取当前流程正在审批的任务节点 + + // 获取当前流程的所有任务节点 List taskList = bpmTaskApi.getTaskListByProcessInstanceId(salesOrderDO.getProcessInstanceId()).getData(); - BpmTaskRespDTO undoTask = taskList.get(taskList.size() - 1); - // 判断是否流程已经通过、驳回 + // 筛选出当前待处理的任务（未结束的任务） + BpmTaskRespDTO undoTask = taskList.stream() + .filter(task -> task.getEndTime() == null) + .findFirst() + .orElse(null); + + if (ObjectUtils.isEmpty(undoTask)) { + throw new RuntimeException("未找到待审批的任务节点"); + } + + // 先调用BPM审批接口，再更新本地状态 + if (DictEnum.BSE_CTRT_STS_WAIT_PUSH.getCode().equals(salesOrderReviewReqVO.getStatus())) { + // 审批通过 + BpmTaskApproveReqDTO btarDto = new BpmTaskApproveReqDTO(); + btarDto.setId(undoTask.getId()); + btarDto.setReason(salesOrderReviewReqVO.getReviewOpinion()); + CommonResult result = bpmProcessInstanceApi.approveTask(btarDto); + if (result.isError()) { + throw new RuntimeException(result.getMsg()); + } + } else if (DictEnum.BSE_CTRT_STS_REJECTED.getCode().equals(salesOrderReviewReqVO.getStatus())) { + // 审批驳回 + BpmTaskRejectReqDTO btrrDto = new BpmTaskRejectReqDTO(); + btrrDto.setId(undoTask.getId()); + btrrDto.setReason(salesOrderReviewReqVO.getReviewOpinion()); + CommonResult result = bpmProcessInstanceApi.rejectTask(btrrDto); + if (result.isError()) { + throw new RuntimeException(result.getMsg()); + } + } + + // 调用BPM接口后，查询最新的审批详情 BpmApprovalDetailReqDTO badrDto = new BpmApprovalDetailReqDTO(); - badrDto.setProcessInstanceId(salesOrderDO.getProcessInstanceId()); // 流程实例id - badrDto.setTaskId(undoTask.getId()); // 当前审核任务节点id + badrDto.setProcessInstanceId(salesOrderDO.getProcessInstanceId()); + badrDto.setTaskId(undoTask.getId()); BpmApprovalDetailRespDTO approvalDetail = bpmProcessInstanceApi.getApprovalDetail(SecurityFrameworkUtils.getLoginUserId(), badrDto).getData(); - //如果审核通过 - if ("WAIT_PUSH".equals(salesOrderReviewReqVO.getStatus())) { - salesOrderDO.setStatus(OrderStatusEnum.TO_SUBMIT_ERP.getCode()); - } else { - //如果审核不通过 - salesOrderDO.setStatus(OrderStatusEnum.DRAFT.getCode()); - } - //设置审核意见 - salesOrderDO.setReviewOpinion(salesOrderDO.getReviewOpinion()); - if (ObjectUtils.isNotEmpty(undoTask)) { - salesOrderDO.setTaskId(undoTask.getId()); - } - salesOrderMapper.updateById(salesOrderDO); //更新状态 - // 需要调用bpm 审核接口更新审批中的状态 - if (DictEnum.BSE_CTRT_STS_WAIT_PUSH.getCode().equals(salesOrderDO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) { - if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) { - BpmTaskApproveReqDTO btarDto = new BpmTaskApproveReqDTO(); - btarDto.setId(undoTask.getId()); - btarDto.setReason(salesOrderDO.getReviewOpinion()); - bpmProcessInstanceApi.approveTask(btarDto); - } - } else if (DictEnum.BSE_CTRT_STS_REJECTED.getCode().equals(salesOrderDO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) { - if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) { - BpmTaskRejectReqDTO btrrDto = new BpmTaskRejectReqDTO(); - btrrDto.setId(undoTask.getId()); - btrrDto.setReason(salesOrderDO.getReviewOpinion()); - bpmProcessInstanceApi.rejectTask(btrrDto); - } - } + // 使用统一方法转换状态 + salesOrderDO.setStatus(getStatusByBpmProcessInstanceCode(approvalDetail.getStatus())); + salesOrderDO.setReviewOpinion(salesOrderReviewReqVO.getReviewOpinion()); + salesOrderDO.setTaskId(undoTask.getId()); + + salesOrderMapper.updateById(salesOrderDO); + return true; } - @Override public boolean linkOrder(LinkOrderReqVO LinkOrderReqVO) { @@ -460,4 +521,15 @@ public class SalesOrderServiceImpl implements SalesOrderService { throw exception(PURCHASE_ORDER_NOT_EXISTS); } } + + private String getStatusByBpmProcessInstanceCode(Integer code) { + return Optional.ofNullable(code) + .map(c -> switch (c) { + case -1, 3, 4 -> OrderStatusEnum.DRAFT.getCode(); + case 1 -> OrderStatusEnum.APPROVING.getCode(); + case 2 -> OrderStatusEnum.TO_SUBMIT_ERP.getCode(); + default -> throw new IllegalArgumentException("未定义的BPM状态码：" + c); + }) + .orElseThrow(() -> new IllegalArgumentException("BPM状态码不能为null")); + } } From e6d3fe8584c022cdd4c0d67a881a79a37f9fd702 Mon Sep 17 00:00:00 2001 From: hxt <3511209590@qq.com> Date: Thu, 30 Oct 2025 09:29:53 +0800 Subject: [PATCH 2/8] =?UTF-8?q?erp=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zt/plat/module/erp/api/ErpExternalApi.java | 2 +- .../java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpExternalApi.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpExternalApi.java index f8889bdf..6ba05f2a 100644 --- a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpExternalApi.java +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpExternalApi.java @@ -26,7 +26,7 @@ public interface ErpExternalApi { @Operation(summary = "erp数据提交") HashMap submitDataToErp(@Valid @RequestBody ErpSubmitReqDTO reqDTO); - @GetMapping(PREFIX + "/query") + @PostMapping(PREFIX + "/query") @Operation(summary = "erp数据查询") HashMap queryDataToErp(@Valid @RequestBody ErpQueryReqDTO reqDTO); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java index 1ea6c564..a1e517db 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java @@ -43,7 +43,7 @@ public class ErpExternalApiImpl implements ErpExternalApi { @Override public HashMap queryDataToErp(ErpQueryReqDTO reqDTO) { String funcnr = reqDTO.getFuncnr(); - Map req = new HashMap<>(); + Map req = reqDTO.getReq(); return erpConfig.fetchDataFromERP(funcnr, req); } From 24a774767b1897b42320b7be2644d892fab8b6f7 Mon Sep 17 00:00:00 2001 From: liss <1780094091@qq.com> Date: Thu, 30 Oct 2025 10:11:45 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E7=BC=96=E7=A0=81=E3=80=81=E5=90=8D=E7=A7=B0=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=B8=BA=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/base/dal/mysql/base/AccountMapper.java | 12 ++++++------ .../dal/mysql/base/CompanyRelativityMapper.java | 4 ++-- .../module/base/dal/mysql/base/ContactMapper.java | 8 ++++---- .../module/base/dal/mysql/base/FactoryMapper.java | 8 ++++---- .../dal/mysql/base/MaterialInfomationMapper.java | 4 ++-- .../base/dal/mysql/base/MaterialOtherMapper.java | 2 +- .../plat/module/base/dal/mysql/base/TaxMapper.java | 4 ++-- .../base/dal/mysql/base/WarehouseMapper.java | 6 +++--- .../module/erp/dal/mysql/erp/ErpAssetMapper.java | 10 +++++----- .../module/erp/dal/mysql/erp/ErpBomMapper.java | 6 +++--- .../module/erp/dal/mysql/erp/ErpCompanyMapper.java | 2 +- .../erp/dal/mysql/erp/ErpContractMapper.java | 12 ++++++------ .../erp/dal/mysql/erp/ErpCostcenterMapper.java | 2 +- .../erp/dal/mysql/erp/ErpCustomerMapper.java | 4 ++-- .../erp/dal/mysql/erp/ErpInternalOrderMapper.java | 2 +- .../erp/dal/mysql/erp/ErpMaterialMapper.java | 8 ++++---- .../erp/dal/mysql/erp/ErpProcessDetailMapper.java | 4 ++-- .../module/erp/dal/mysql/erp/ErpProcessMapper.java | 6 +++--- .../dal/mysql/erp/ErpProductiveOrderMapper.java | 14 +++++++------- .../dal/mysql/erp/ErpProductiveVersionMapper.java | 8 ++++---- .../mysql/erp/ErpPurchaseOrganizationMapper.java | 4 ++-- .../dal/mysql/erp/ErpSalesOrganizationMapper.java | 4 ++-- 22 files changed, 67 insertions(+), 67 deletions(-) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java index fa89ea4d..4e524fb6 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java @@ -28,8 +28,8 @@ public interface AccountMapper extends BaseMapperX { .likeIfPresent(AccountDO::getCustomerName, reqVO.getCustomerName()) .likeIfPresent(AccountDO::getCustomerNumber, reqVO.getCustomerNumber()) .eqIfPresent(AccountDO::getIsEnable, reqVO.getIsEnable()) - .eqIfPresent(AccountDO::getAccountNumber, reqVO.getAccountNumber()) - .eqIfPresent(AccountDO::getTaxNumber, reqVO.getTaxNumber()) + .likeIfPresent(AccountDO::getAccountNumber, reqVO.getAccountNumber()) + .likeIfPresent(AccountDO::getTaxNumber, reqVO.getTaxNumber()) .betweenIfPresent(AccountDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(AccountDO::getId)); } @@ -41,11 +41,11 @@ public interface AccountMapper extends BaseMapperX { .likeIfPresent(AccountDO::getAddress, dto.getAddress()) .likeIfPresent(AccountDO::getPhone, dto.getPhone()) .eqIfPresent(AccountDO::getBankAccount, dto.getBankAccount()) - .eqIfPresent(AccountDO::getCustomerName, dto.getCustomerName()) - .eqIfPresent(AccountDO::getCustomerNumber, dto.getCustomerNumber()) + .likeIfPresent(AccountDO::getCustomerName, dto.getCustomerName()) + .likeIfPresent(AccountDO::getCustomerNumber, dto.getCustomerNumber()) .eqIfPresent(AccountDO::getIsEnable, dto.getIsEnable()) - .eqIfPresent(AccountDO::getAccountNumber, dto.getAccountNumber()) - .eqIfPresent(AccountDO::getTaxNumber, dto.getTaxNumber()) + .likeIfPresent(AccountDO::getAccountNumber, dto.getAccountNumber()) + .likeIfPresent(AccountDO::getTaxNumber, dto.getTaxNumber()) .orderByDesc(AccountDO::getId)); } } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/CompanyRelativityMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/CompanyRelativityMapper.java index 330f4ccf..548f785a 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/CompanyRelativityMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/CompanyRelativityMapper.java @@ -21,8 +21,8 @@ public interface CompanyRelativityMapper extends BaseMapperX selectPage(CompanyRelativityPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(CompanyRelativityDO::getErpNumber, reqVO.getErpNumber()) - .eqIfPresent(CompanyRelativityDO::getNumber, reqVO.getNumber()) + .likeIfPresent(CompanyRelativityDO::getErpNumber, reqVO.getErpNumber()) + .likeIfPresent(CompanyRelativityDO::getNumber, reqVO.getNumber()) .betweenIfPresent(CompanyRelativityDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(CompanyRelativityDO::getId)); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java index 9f6557a4..9cb6546f 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java @@ -21,11 +21,11 @@ public interface ContactMapper extends BaseMapperX { .likeIfPresent(ContactDO::getContact, reqVO.getContact()) .likeIfPresent(ContactDO::getTel, reqVO.getTel()) .likeIfPresent(ContactDO::getCustomerName, reqVO.getCustomerName()) - .eqIfPresent(ContactDO::getCustomerNumber, reqVO.getCustomerNumber()) + .likeIfPresent(ContactDO::getCustomerNumber, reqVO.getCustomerNumber()) .eqIfPresent(ContactDO::getIsEnable, reqVO.getIsEnable()) - .eqIfPresent(ContactDO::getEmail, reqVO.getEmail()) - .eqIfPresent(ContactDO::getFax, reqVO.getFax()) - .eqIfPresent(ContactDO::getAddress, reqVO.getAddress()) + .likeIfPresent(ContactDO::getEmail, reqVO.getEmail()) + .likeIfPresent(ContactDO::getFax, reqVO.getFax()) + .likeIfPresent(ContactDO::getAddress, reqVO.getAddress()) .betweenIfPresent(ContactDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(ContactDO::getId)); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java index 05b5d318..adc75b41 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java @@ -17,16 +17,16 @@ public interface FactoryMapper extends BaseMapperX { default PageResult selectPage(FactoryPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(FactoryDO::getCompanyNumber, reqVO.getCompanyNumber()) + .likeIfPresent(FactoryDO::getCompanyNumber, reqVO.getCompanyNumber()) .likeIfPresent(FactoryDO::getCpnName, reqVO.getCpnName()) - .eqIfPresent(FactoryDO::getErpCompanyNumber, reqVO.getErpCompanyNumber()) + .likeIfPresent(FactoryDO::getErpCompanyNumber, reqVO.getErpCompanyNumber()) .likeIfPresent(FactoryDO::getErpCompanyName, reqVO.getErpCompanyName()) .likeIfPresent(FactoryDO::getName, reqVO.getName()) - .eqIfPresent(FactoryDO::getNumber, reqVO.getNumber()) + .likeIfPresent(FactoryDO::getNumber, reqVO.getNumber()) .betweenIfPresent(FactoryDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(FactoryDO::getIsEnable, reqVO.getIsEnable()) .likeIfPresent(FactoryDO::getErpName, reqVO.getErpName()) - .eqIfPresent(FactoryDO::getErpNumber, reqVO.getErpNumber()) + .likeIfPresent(FactoryDO::getErpNumber, reqVO.getErpNumber()) .orderByDesc(FactoryDO::getId)); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialInfomationMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialInfomationMapper.java index e0c41fd1..27ab3cc4 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialInfomationMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialInfomationMapper.java @@ -23,9 +23,9 @@ public interface MaterialInfomationMapper extends BaseMapperX selectPage(MaterialInfomationPageReqVO reqVO, Collection infomationIds) { return BaseMapperX.super.selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MaterialInfomationDO::getCode, reqVO.getCode()) + .likeIfPresent(MaterialInfomationDO::getCode, reqVO.getCode()) .likeIfPresent(MaterialInfomationDO::getName, reqVO.getName()) - .eqIfPresent(MaterialInfomationDO::getRemark, reqVO.getRemark()) + .likeIfPresent(MaterialInfomationDO::getRemark, reqVO.getRemark()) .betweenIfPresent(MaterialInfomationDO::getCreateTime, reqVO.getCreateTime()) .inIfPresent(MaterialInfomationDO::getId, infomationIds) .orderByDesc(MaterialInfomationDO::getId)); diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java index af4a1396..6833dddc 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java @@ -22,7 +22,7 @@ public interface MaterialOtherMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(MaterialOtherDO::getMaterialNumber, reqVO.getMaterialNumber()) .likeIfPresent(MaterialOtherDO::getMaterialName, reqVO.getMaterialName()) - .eqIfPresent(MaterialOtherDO::getErpMaterialNumber, reqVO.getErpMaterialNumber()) + .likeIfPresent(MaterialOtherDO::getErpMaterialNumber, reqVO.getErpMaterialNumber()) .likeIfPresent(MaterialOtherDO::getErpMaterialName, reqVO.getErpMaterialName()) .eqIfPresent(MaterialOtherDO::getUnit, reqVO.getUnit()) .eqIfPresent(MaterialOtherDO::getAbbreviation, reqVO.getAbbreviation()) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/TaxMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/TaxMapper.java index ca0dc83a..3626f273 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/TaxMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/TaxMapper.java @@ -20,11 +20,11 @@ public interface TaxMapper extends BaseMapperX { .eqIfPresent(TaxDO::getType, reqVO.getType()) .eqIfPresent(TaxDO::getCategory, reqVO.getCategory()) .eqIfPresent(TaxDO::getTaxCoding, reqVO.getTaxCoding()) - .eqIfPresent(TaxDO::getRemark, reqVO.getRemark()) + .likeIfPresent(TaxDO::getRemark, reqVO.getRemark()) .eqIfPresent(TaxDO::getTax, reqVO.getTax()) .betweenIfPresent(TaxDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(TaxDO::getIsEnable, reqVO.getIsEnable()) - .eqIfPresent(TaxDO::getCustomerNumber, reqVO.getCustomerNumber()) + .likeIfPresent(TaxDO::getCustomerNumber, reqVO.getCustomerNumber()) .likeIfPresent(TaxDO::getCustomerName, reqVO.getCustomerName()) .orderByDesc(TaxDO::getId)); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/WarehouseMapper.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/WarehouseMapper.java index 60d3a7b2..e6ae7530 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/WarehouseMapper.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/WarehouseMapper.java @@ -17,7 +17,7 @@ public interface WarehouseMapper extends BaseMapperX { default PageResult selectPage(WarehousePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(WarehouseDO::getFactoryNumber, reqVO.getFactoryNumber()) + .likeIfPresent(WarehouseDO::getFactoryNumber, reqVO.getFactoryNumber()) .likeIfPresent(WarehouseDO::getCpnName, reqVO.getCpnName()) .likeIfPresent(WarehouseDO::getErpFactoryName, reqVO.getErpFactoryName()) .eqIfPresent(WarehouseDO::getErpFactoryNumber, reqVO.getErpFactoryNumber()) @@ -26,8 +26,8 @@ public interface WarehouseMapper extends BaseMapperX { .betweenIfPresent(WarehouseDO::getCreateTime, reqVO.getCreateTime()) .likeIfPresent(WarehouseDO::getFactoryName, reqVO.getFactoryName()) .eqIfPresent(WarehouseDO::getIsEnable, reqVO.getIsEnable()) - .eqIfPresent(WarehouseDO::getCompanyNumber, reqVO.getCompanyNumber()) - .eqIfPresent(WarehouseDO::getErpCoding, reqVO.getErpCoding()) + .likeIfPresent(WarehouseDO::getCompanyNumber, reqVO.getCompanyNumber()) + .likeIfPresent(WarehouseDO::getErpCoding, reqVO.getErpCoding()) .likeIfPresent(WarehouseDO::getErpName, reqVO.getErpName()) .orderByDesc(WarehouseDO::getId)); } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpAssetMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpAssetMapper.java index 913011be..05fb9fd7 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpAssetMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpAssetMapper.java @@ -17,17 +17,17 @@ public interface ErpAssetMapper extends BaseMapperX { default PageResult selectPage(ErpAssetPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ErpAssetDO::getCompanyNumber, reqVO.getCompanyNumber()) - .eqIfPresent(ErpAssetDO::getMainAssetNumber, reqVO.getMainAssetNumber()) + .likeIfPresent(ErpAssetDO::getCompanyNumber, reqVO.getCompanyNumber()) + .likeIfPresent(ErpAssetDO::getMainAssetNumber, reqVO.getMainAssetNumber()) .betweenIfPresent(ErpAssetDO::getRecordCreateDate, reqVO.getRecordCreateDate()) .likeIfPresent(ErpAssetDO::getUpdateUserName, reqVO.getUpdateUserName()) - .eqIfPresent(ErpAssetDO::getAssetTypeNumber, reqVO.getAssetTypeNumber()) + .likeIfPresent(ErpAssetDO::getAssetTypeNumber, reqVO.getAssetTypeNumber()) .likeIfPresent(ErpAssetDO::getAssetTypeName, reqVO.getAssetTypeName()) .betweenIfPresent(ErpAssetDO::getAssetDate, reqVO.getAssetDate()) .eqIfPresent(ErpAssetDO::getUom, reqVO.getUom()) .eqIfPresent(ErpAssetDO::getQuantity, reqVO.getQuantity()) - .eqIfPresent(ErpAssetDO::getAssetDescription, reqVO.getAssetDescription()) - .eqIfPresent(ErpAssetDO::getAssetDescriptionAttach, reqVO.getAssetDescriptionAttach()) + .likeIfPresent(ErpAssetDO::getAssetDescription, reqVO.getAssetDescription()) + .likeIfPresent(ErpAssetDO::getAssetDescriptionAttach, reqVO.getAssetDescriptionAttach()) .betweenIfPresent(ErpAssetDO::getDepreciationStartDate, reqVO.getDepreciationStartDate()) .eqIfPresent(ErpAssetDO::getPlanYearDate, reqVO.getPlanYearDate()) .eqIfPresent(ErpAssetDO::getCostcenterNumber, reqVO.getCostcenterNumber()) diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpBomMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpBomMapper.java index 167de8b6..053d8a70 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpBomMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpBomMapper.java @@ -17,10 +17,10 @@ public interface ErpBomMapper extends BaseMapperX { default PageResult selectPage(ErpBomPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ErpBomDO::getFactoryNumber, reqVO.getFactoryNumber()) - .eqIfPresent(ErpBomDO::getUpMaterial, reqVO.getUpMaterial()) + .likeIfPresent(ErpBomDO::getFactoryNumber, reqVO.getFactoryNumber()) + .likeIfPresent(ErpBomDO::getUpMaterial, reqVO.getUpMaterial()) .eqIfPresent(ErpBomDO::getUseItem, reqVO.getUseItem()) - .eqIfPresent(ErpBomDO::getMaterialDescription, reqVO.getMaterialDescription()) + .likeIfPresent(ErpBomDO::getMaterialDescription, reqVO.getMaterialDescription()) .eqIfPresent(ErpBomDO::getQuantity, reqVO.getQuantity()) .eqIfPresent(ErpBomDO::getUnit, reqVO.getUnit()) .orderByDesc(ErpBomDO::getId)); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCompanyMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCompanyMapper.java index 65e57bb1..45d8fd78 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCompanyMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCompanyMapper.java @@ -18,7 +18,7 @@ public interface ErpCompanyMapper extends BaseMapperX { default PageResult selectPage(ErpCompanyPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(ErpCompanyDO::getName, reqVO.getName()) - .eqIfPresent(ErpCompanyDO::getNumber, reqVO.getNumber()) + .likeIfPresent(ErpCompanyDO::getNumber, reqVO.getNumber()) .eqIfPresent(ErpCompanyDO::getCurrency, reqVO.getCurrency()) .orderByDesc(ErpCompanyDO::getId)); } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpContractMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpContractMapper.java index b6f51a75..da80f209 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpContractMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpContractMapper.java @@ -19,17 +19,17 @@ public interface ErpContractMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(ErpContractDO::getOperationId, reqVO.getOperationId()) .eqIfPresent(ErpContractDO::getContractMainId, reqVO.getContractMainId()) - .eqIfPresent(ErpContractDO::getContractPaperNumber, reqVO.getContractPaperNumber()) + .likeIfPresent(ErpContractDO::getContractPaperNumber, reqVO.getContractPaperNumber()) .likeIfPresent(ErpContractDO::getContractName, reqVO.getContractName()) - .eqIfPresent(ErpContractDO::getContractTypeNumber, reqVO.getContractTypeNumber()) + .likeIfPresent(ErpContractDO::getContractTypeNumber, reqVO.getContractTypeNumber()) .likeIfPresent(ErpContractDO::getContractTypeName, reqVO.getContractTypeName()) .eqIfPresent(ErpContractDO::getContractCategory, reqVO.getContractCategory()) .eqIfPresent(ErpContractDO::getIsVirtualContract, reqVO.getIsVirtualContract()) - .eqIfPresent(ErpContractDO::getSupplierNumber, reqVO.getSupplierNumber()) + .likeIfPresent(ErpContractDO::getSupplierNumber, reqVO.getSupplierNumber()) .likeIfPresent(ErpContractDO::getSupplierName, reqVO.getSupplierName()) .eqIfPresent(ErpContractDO::getAgent, reqVO.getAgent()) - .eqIfPresent(ErpContractDO::getContractImplementNumber, reqVO.getContractImplementNumber()) - .eqIfPresent(ErpContractDO::getContractSignNumber, reqVO.getContractSignNumber()) + .likeIfPresent(ErpContractDO::getContractImplementNumber, reqVO.getContractImplementNumber()) + .likeIfPresent(ErpContractDO::getContractSignNumber, reqVO.getContractSignNumber()) .betweenIfPresent(ErpContractDO::getSignDate, reqVO.getSignDate()) .betweenIfPresent(ErpContractDO::getStartDate, reqVO.getStartDate()) .betweenIfPresent(ErpContractDO::getStopDate, reqVO.getStopDate()) @@ -52,7 +52,7 @@ public interface ErpContractMapper extends BaseMapperX { .eqIfPresent(ErpContractDO::getQualityassuranceAmount, reqVO.getQualityassuranceAmount()) .eqIfPresent(ErpContractDO::getIsInternal, reqVO.getIsInternal()) .eqIfPresent(ErpContractDO::getNature, reqVO.getNature()) - .eqIfPresent(ErpContractDO::getRemark, reqVO.getRemark()) + .likeIfPresent(ErpContractDO::getRemark, reqVO.getRemark()) .eqIfPresent(ErpContractDO::getSourceAccumulateSettlementAmount, reqVO.getSourceAccumulateSettlementAmount()) .eqIfPresent(ErpContractDO::getBasicAccumulateSettlementAmount, reqVO.getBasicAccumulateSettlementAmount()) .eqIfPresent(ErpContractDO::getSourceUseAmount, reqVO.getSourceUseAmount()) diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCostcenterMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCostcenterMapper.java index de7d71e1..67e5930a 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCostcenterMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCostcenterMapper.java @@ -20,7 +20,7 @@ public interface ErpCostcenterMapper extends BaseMapperX { default PageResult selectPage(ErpCostcenterPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ErpCostcenterDO::getNumber, reqVO.getNumber()) + .likeIfPresent(ErpCostcenterDO::getNumber, reqVO.getNumber()) .likeIfPresent(ErpCostcenterDO::getName, reqVO.getName()) .eqIfPresent(ErpCostcenterDO::getIsUse, reqVO.getIsUse()) .eqIfPresent(ErpCostcenterDO::getScopeNumber, reqVO.getScopeNumber()) diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCustomerMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCustomerMapper.java index aa7574f3..fda05c37 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCustomerMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCustomerMapper.java @@ -17,10 +17,10 @@ public interface ErpCustomerMapper extends BaseMapperX { default PageResult selectPage(ErpCustomerPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ErpCustomerDO::getNumber, reqVO.getNumber()) + .likeIfPresent(ErpCustomerDO::getNumber, reqVO.getNumber()) .likeIfPresent(ErpCustomerDO::getName, reqVO.getName()) .eqIfPresent(ErpCustomerDO::getAccountGroup, reqVO.getAccountGroup()) - .eqIfPresent(ErpCustomerDO::getDescription, reqVO.getDescription()) + .likeIfPresent(ErpCustomerDO::getDescription, reqVO.getDescription()) .eqIfPresent(ErpCustomerDO::getCenterNumber, reqVO.getCenterNumber()) .betweenIfPresent(ErpCustomerDO::getCreateDate, reqVO.getCreateDate()) .betweenIfPresent(ErpCustomerDO::getRepairDate, reqVO.getRepairDate()) diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpInternalOrderMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpInternalOrderMapper.java index 20ab8327..6331933c 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpInternalOrderMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpInternalOrderMapper.java @@ -17,7 +17,7 @@ public interface ErpInternalOrderMapper extends BaseMapperX default PageResult selectPage(ErpInternalOrderPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ErpInternalOrderDO::getNumber, reqVO.getNumber()) + .likeIfPresent(ErpInternalOrderDO::getNumber, reqVO.getNumber()) .likeIfPresent(ErpInternalOrderDO::getName, reqVO.getName()) .eqIfPresent(ErpInternalOrderDO::getType, reqVO.getType()) .eqIfPresent(ErpInternalOrderDO::getIsOff, reqVO.getIsOff()) diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java index d1a95595..ad76d140 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java @@ -27,12 +27,12 @@ public interface ErpMaterialMapper extends BaseMapperX { .betweenIfPresent(ErpMaterialDO::getMaterialGroupDate, reqVO.getMaterialGroupDate()) .betweenIfPresent(ErpMaterialDO::getExternalMaterialGroupDate, reqVO.getExternalMaterialGroupDate()) .eqIfPresent(ErpMaterialDO::getUnit, reqVO.getUnit()) - .eqIfPresent(ErpMaterialDO::getUnitDescription, reqVO.getUnitDescription()) - .eqIfPresent(ErpMaterialDO::getMaterialTypeDescription, reqVO.getMaterialTypeDescription()) - .eqIfPresent(ErpMaterialDO::getMaterialGroupDescription, reqVO.getMaterialGroupDescription()) + .likeIfPresent(ErpMaterialDO::getUnitDescription, reqVO.getUnitDescription()) + .likeIfPresent(ErpMaterialDO::getMaterialTypeDescription, reqVO.getMaterialTypeDescription()) + .likeIfPresent(ErpMaterialDO::getMaterialGroupDescription, reqVO.getMaterialGroupDescription()) .eqIfPresent(ErpMaterialDO::getExternalMaterialGroupDescription, reqVO.getExternalMaterialGroupDescription()) .likeIfPresent(ErpMaterialDO::getMaterialName, reqVO.getMaterialName()) - .eqIfPresent(ErpMaterialDO::getMaterialLengthDescription, reqVO.getMaterialLengthDescription()) + .likeIfPresent(ErpMaterialDO::getMaterialLengthDescription, reqVO.getMaterialLengthDescription()) .orderByDesc(ErpMaterialDO::getId)); } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProcessDetailMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProcessDetailMapper.java index 7161e058..ee34fd09 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProcessDetailMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProcessDetailMapper.java @@ -18,10 +18,10 @@ public interface ErpProcessDetailMapper extends BaseMapperX default PageResult selectPage(ErpProcessDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(ErpProcessDetailDO::getProcessId, reqVO.getProcessId()) - .eqIfPresent(ErpProcessDetailDO::getProcessingNumber, reqVO.getProcessingNumber()) + .likeIfPresent(ErpProcessDetailDO::getProcessingNumber, reqVO.getProcessingNumber()) .likeIfPresent(ErpProcessDetailDO::getProcessingName, reqVO.getProcessingName()) .eqIfPresent(ErpProcessDetailDO::getUom, reqVO.getUom()) - .eqIfPresent(ErpProcessDetailDO::getWorkCenterNumber, reqVO.getWorkCenterNumber()) + .likeIfPresent(ErpProcessDetailDO::getWorkCenterNumber, reqVO.getWorkCenterNumber()) .likeIfPresent(ErpProcessDetailDO::getWorkCenterName, reqVO.getWorkCenterName()) .orderByDesc(ErpProcessDetailDO::getId)); } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProcessMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProcessMapper.java index ca94d8ce..8b34a246 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProcessMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProcessMapper.java @@ -17,12 +17,12 @@ public interface ErpProcessMapper extends BaseMapperX { default PageResult selectPage(ErpProcessPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ErpProcessDO::getFactoryNumber, reqVO.getFactoryNumber()) - .eqIfPresent(ErpProcessDO::getMaterialNumber, reqVO.getMaterialNumber()) + .likeIfPresent(ErpProcessDO::getFactoryNumber, reqVO.getFactoryNumber()) + .likeIfPresent(ErpProcessDO::getMaterialNumber, reqVO.getMaterialNumber()) .likeIfPresent(ErpProcessDO::getMaterialName, reqVO.getMaterialName()) .eqIfPresent(ErpProcessDO::getBlineGroup, reqVO.getBlineGroup()) .eqIfPresent(ErpProcessDO::getGroupCount, reqVO.getGroupCount()) - .eqIfPresent(ErpProcessDO::getBlineDescription, reqVO.getBlineDescription()) + .likeIfPresent(ErpProcessDO::getBlineDescription, reqVO.getBlineDescription()) .eqIfPresent(ErpProcessDO::getUom, reqVO.getUom()) .eqIfPresent(ErpProcessDO::getUseDescription, reqVO.getUseDescription()) .eqIfPresent(ErpProcessDO::getStatus, reqVO.getStatus()) diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProductiveOrderMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProductiveOrderMapper.java index 7779bd83..d383bd8c 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProductiveOrderMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProductiveOrderMapper.java @@ -17,21 +17,21 @@ public interface ErpProductiveOrderMapper extends BaseMapperX selectPage(ErpProductiveOrderPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ErpProductiveOrderDO::getCompanyNumber, reqVO.getCompanyNumber()) - .eqIfPresent(ErpProductiveOrderDO::getFactoryNumber, reqVO.getFactoryNumber()) + .likeIfPresent(ErpProductiveOrderDO::getCompanyNumber, reqVO.getCompanyNumber()) + .likeIfPresent(ErpProductiveOrderDO::getFactoryNumber, reqVO.getFactoryNumber()) .likeIfPresent(ErpProductiveOrderDO::getFactoryName, reqVO.getFactoryName()) - .eqIfPresent(ErpProductiveOrderDO::getOrderNumber, reqVO.getOrderNumber()) + .likeIfPresent(ErpProductiveOrderDO::getOrderNumber, reqVO.getOrderNumber()) .betweenIfPresent(ErpProductiveOrderDO::getStartDate, reqVO.getStartDate()) .betweenIfPresent(ErpProductiveOrderDO::getEndDate, reqVO.getEndDate()) - .eqIfPresent(ErpProductiveOrderDO::getMainMaterialNumber, reqVO.getMainMaterialNumber()) + .likeIfPresent(ErpProductiveOrderDO::getMainMaterialNumber, reqVO.getMainMaterialNumber()) .eqIfPresent(ErpProductiveOrderDO::getUnit, reqVO.getUnit()) - .eqIfPresent(ErpProductiveOrderDO::getMaterialDescription, reqVO.getMaterialDescription()) + .likeIfPresent(ErpProductiveOrderDO::getMaterialDescription, reqVO.getMaterialDescription()) .eqIfPresent(ErpProductiveOrderDO::getProcessingList, reqVO.getProcessingList()) .eqIfPresent(ErpProductiveOrderDO::getProcessingNumber, reqVO.getProcessingNumber()) - .eqIfPresent(ErpProductiveOrderDO::getProcessingDescription, reqVO.getProcessingDescription()) + .likeIfPresent(ErpProductiveOrderDO::getProcessingDescription, reqVO.getProcessingDescription()) .eqIfPresent(ErpProductiveOrderDO::getObjectNumber, reqVO.getObjectNumber()) .eqIfPresent(ErpProductiveOrderDO::getWorkCenterNumber, reqVO.getWorkCenterNumber()) - .eqIfPresent(ErpProductiveOrderDO::getWorkCenterDescription, reqVO.getWorkCenterDescription()) + .likeIfPresent(ErpProductiveOrderDO::getWorkCenterDescription, reqVO.getWorkCenterDescription()) .eqIfPresent(ErpProductiveOrderDO::getCostcenterNumber, reqVO.getCostcenterNumber()) .likeIfPresent(ErpProductiveOrderDO::getCostcenterName, reqVO.getCostcenterName()) .orderByDesc(ErpProductiveOrderDO::getId)); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProductiveVersionMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProductiveVersionMapper.java index 26001f03..f2364cdc 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProductiveVersionMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpProductiveVersionMapper.java @@ -19,11 +19,11 @@ public interface ErpProductiveVersionMapper extends BaseMapperX selectPage(ErpProductiveVersionPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ErpProductiveVersionDO::getFactoryNumber, reqVO.getFactoryNumber()) - .eqIfPresent(ErpProductiveVersionDO::getMaterialNumber, reqVO.getMaterialNumber()) - .eqIfPresent(ErpProductiveVersionDO::getProductiveVersionNumber, reqVO.getProductiveVersionNumber()) + .likeIfPresent(ErpProductiveVersionDO::getFactoryNumber, reqVO.getFactoryNumber()) + .likeIfPresent(ErpProductiveVersionDO::getMaterialNumber, reqVO.getMaterialNumber()) + .likeIfPresent(ErpProductiveVersionDO::getProductiveVersionNumber, reqVO.getProductiveVersionNumber()) .likeIfPresent(ErpProductiveVersionDO::getProductiveVersionName, reqVO.getProductiveVersionName()) - .eqIfPresent(ErpProductiveVersionDO::getBomNumber, reqVO.getBomNumber()) + .likeIfPresent(ErpProductiveVersionDO::getBomNumber, reqVO.getBomNumber()) .eqIfPresent(ErpProductiveVersionDO::getBlineGroup, reqVO.getBlineGroup()) .eqIfPresent(ErpProductiveVersionDO::getGroupCount, reqVO.getGroupCount()) .orderByDesc(ErpProductiveVersionDO::getId)); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpPurchaseOrganizationMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpPurchaseOrganizationMapper.java index 460c81e2..04711e3d 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpPurchaseOrganizationMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpPurchaseOrganizationMapper.java @@ -17,9 +17,9 @@ public interface ErpPurchaseOrganizationMapper extends BaseMapperX selectPage(ErpPurchaseOrganizationPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ErpPurchaseOrganizationDO::getNumber, reqVO.getNumber()) + .likeIfPresent(ErpPurchaseOrganizationDO::getNumber, reqVO.getNumber()) .likeIfPresent(ErpPurchaseOrganizationDO::getName, reqVO.getName()) - .eqIfPresent(ErpPurchaseOrganizationDO::getCompanyNumber, reqVO.getCompanyNumber()) + .likeIfPresent(ErpPurchaseOrganizationDO::getCompanyNumber, reqVO.getCompanyNumber()) .orderByDesc(ErpPurchaseOrganizationDO::getId)); } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpSalesOrganizationMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpSalesOrganizationMapper.java index 495bcdfb..f2220c4d 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpSalesOrganizationMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpSalesOrganizationMapper.java @@ -17,9 +17,9 @@ public interface ErpSalesOrganizationMapper extends BaseMapperX selectPage(ErpSalesOrganizationPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ErpSalesOrganizationDO::getNumber, reqVO.getNumber()) + .likeIfPresent(ErpSalesOrganizationDO::getNumber, reqVO.getNumber()) .likeIfPresent(ErpSalesOrganizationDO::getName, reqVO.getName()) - .eqIfPresent(ErpSalesOrganizationDO::getCompanyNumber, reqVO.getCompanyNumber()) + .likeIfPresent(ErpSalesOrganizationDO::getCompanyNumber, reqVO.getCompanyNumber()) .orderByDesc(ErpSalesOrganizationDO::getId)); } From e76b5f099057a4dfda34e4abbdd12b0ab43ff682 Mon Sep 17 00:00:00 2001 From: guojunyun Date: Thu, 30 Oct 2025 15:10:55 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C?= =?UTF-8?q?=EF=BC=9A=E6=89=A7=E8=A1=8C=E4=B8=AD=E5=90=88=E5=90=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=90=8E=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4erp?= =?UTF-8?q?=EF=BC=9B=E9=A9=B3=E5=9B=9E=E7=8A=B6=E6=80=81=E5=90=88=E5=90=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E4=B8=8D=E4=BF=AE=E6=94=B9=E5=90=88?= =?UTF-8?q?=E5=90=8C=E7=8A=B6=E6=80=81=E4=B8=BA=E5=BE=85=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=20=E5=90=88=E5=90=8C=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=EF=BC=9A=E9=A9=B3=E5=9B=9E=E7=8A=B6=E6=80=81=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=8F=AF=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=A0=B8=EF=BC=8C=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=BE=85=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=20?= =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AE=A1=E6=A0=B8=EF=BC=9Abpm=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=AE=8C=E6=88=90=E9=87=8D=E6=96=B0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9=E5=B9=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=88=E5=90=8C=E5=AE=A1=E6=89=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/contract/ContractServiceImpl.java | 59 +++++++++++-------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index 2dfb4f83..8d8091a1 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -917,16 +917,17 @@ public class ContractServiceImpl implements ContractService { if (DictEnum.BSE_CTRT_STS_PUSH_ERROR.getCode().equals(oldContractMainDO.getStatus())) { // “推送失败”的状态编辑后状态变为“待推送” newContractMainDO.setStatus(DictEnum.BSE_CTRT_STS_WAIT_PUSH.getCode()); - } else if (DictEnum.BSE_CTRT_STS_REJECTED.getCode().equals(oldContractMainDO.getStatus()) - || DictEnum.BSE_CTRT_STS_IN_PROGRESS.getCode().equals(oldContractMainDO.getStatus())) { - // 其它状态编辑后都为“待审核” - newContractMainDO.setStatus(DictEnum.BSE_CTRT_STS_WAIT_AUDIT.getCode()); } // 更新合同主信息 - int updateNum = contractMainMapper.updateById(newContractMainDO); + contractMainMapper.updateById(newContractMainDO); - return updateNum > 0; + if (DictEnum.BSE_CTRT_STS_IN_PROGRESS.getCode().equals(newContractMainDO.getStatus())) { + // 执行中合同重新提交erp + submitErp(newContractMainDO.getId()); + } + + return true; } @Override @@ -1025,7 +1026,7 @@ public class ContractServiceImpl implements ContractService { // 合同状态校验 if (!(DictEnum.BSE_CTRT_STS_DRAFT.getCode().equals(contractMainDO.getStatus()) - || DictEnum.BSE_CTRT_STS_WAIT_AUDIT.getCode().equals(contractMainDO.getStatus()))) { + || DictEnum.BSE_CTRT_STS_REJECTED.getCode().equals(contractMainDO.getStatus()))) { throw exception(CONTRACT_STATUS_NOT_SUBMIT_APPROVAL, DictEnum.getByCodeAndType(contractMainDO.getStatus(), DictTypeConstants.BSE_CTRT_STS).getLabel()); @@ -1128,6 +1129,33 @@ public class ContractServiceImpl implements ContractService { badrDto.setTaskId(undoTask.getId()); // 当前审核任务节点id BpmApprovalDetailRespDTO approvalDetail = bpmProcessInstanceApi.getApprovalDetail(SecurityFrameworkUtils.getLoginUserId(), badrDto).getData(); + // 需要调用bpm 审核接口更新审批中的状态 + if (DictEnum.BSE_CTRT_STS_WAIT_PUSH.getCode().equals(reqVO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) { + if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) { + BpmTaskApproveReqDTO btarDto = new BpmTaskApproveReqDTO(); + btarDto.setId(undoTask.getId()); + btarDto.setReason(reqVO.getReviewOpinion()); + bpmProcessInstanceApi.approveTask(btarDto); + } + } else if (DictEnum.BSE_CTRT_STS_REJECTED.getCode().equals(reqVO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) { + if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) { + BpmTaskRejectReqDTO btrrDto = new BpmTaskRejectReqDTO(); + btrrDto.setId(undoTask.getId()); + btrrDto.setReason(reqVO.getReviewOpinion()); + bpmProcessInstanceApi.rejectTask(btrrDto); + } + } + + // 获取当前流程正在审批的任务节点 + taskList = bpmTaskApi.getTaskListByProcessInstanceId(contractMainDO.getProcessInstanceId()).getData(); + undoTask = taskList.get(taskList.size() - 1); + + // 判断是否流程已经通过、驳回 + badrDto = new BpmApprovalDetailReqDTO(); + badrDto.setProcessInstanceId(contractMainDO.getProcessInstanceId()); // 流程实例id + badrDto.setTaskId(undoTask.getId()); // 当前审核任务节点id + approvalDetail = bpmProcessInstanceApi.getApprovalDetail(SecurityFrameworkUtils.getLoginUserId(), badrDto).getData(); + // 更新合同状态,状态需要根据流程的状态进行判断 contractMainDO.setReviewOpinion(reqVO.getReviewOpinion()); if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.NOT_START.getStatus())) { @@ -1147,23 +1175,6 @@ public class ContractServiceImpl implements ContractService { } contractMainMapper.updateById(contractMainDO); - // 需要调用bpm 审核接口更新审批中的状态 - if (DictEnum.BSE_CTRT_STS_WAIT_PUSH.getCode().equals(reqVO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) { - if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) { - BpmTaskApproveReqDTO btarDto = new BpmTaskApproveReqDTO(); - btarDto.setId(undoTask.getId()); - btarDto.setReason(reqVO.getReviewOpinion()); - bpmProcessInstanceApi.approveTask(btarDto); - } - } else if (DictEnum.BSE_CTRT_STS_REJECTED.getCode().equals(reqVO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) { - if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) { - BpmTaskRejectReqDTO btrrDto = new BpmTaskRejectReqDTO(); - btrrDto.setId(undoTask.getId()); - btrrDto.setReason(reqVO.getReviewOpinion()); - bpmProcessInstanceApi.rejectTask(btrrDto); - } - } - return true; } From 172fa2be8e7eefbf0f41fd57018a802596f44fff Mon Sep 17 00:00:00 2001 From: guojunyun Date: Thu, 30 Oct 2025 15:25:04 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=88=E5=90=8C?= =?UTF-8?q?=EF=BC=9A=E5=B7=B2=E9=A9=B3=E5=9B=9E=E7=8A=B6=E6=80=81=E5=90=88?= =?UTF-8?q?=E5=90=8C=E5=8F=AF=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contractorder/service/contract/ContractServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index 8d8091a1..f620cf0f 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -945,7 +945,8 @@ public class ContractServiceImpl implements ContractService { } // 合同状态校验 - if (!DictEnum.BSE_CTRT_STS_DRAFT.getCode().equals(contractMainDO.getStatus())) { + if (!(DictEnum.BSE_CTRT_STS_DRAFT.getCode().equals(contractMainDO.getStatus()) + || DictEnum.BSE_CTRT_STS_REJECTED.getCode().equals(contractMainDO.getStatus()))) { String msg = id.toString() + ":" + CONTRACT_STATUS_NOT_DELETE.getMsg() From 3b41c22f8ad3c5a2e88bdb466b1fb9cee2ef07d2 Mon Sep 17 00:00:00 2001 From: guojunyun Date: Thu, 30 Oct 2025 16:12:55 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=88=E5=90=8C?= =?UTF-8?q?=EF=BC=9A=E6=A8=A1=E6=9D=BF=E5=AE=9E=E4=BE=8BID=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=B8=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/contract/ContractServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index f620cf0f..f02f2c7e 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -3,6 +3,7 @@ package com.zt.plat.module.contractorder.service.contract; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; @@ -921,6 +922,12 @@ public class ContractServiceImpl implements ContractService { // 更新合同主信息 contractMainMapper.updateById(newContractMainDO); + // 模板实例ID更新为null + if (newContractMainDO.getInstanceId() == null) { + contractMainMapper.update(new LambdaUpdateWrapper<>(ContractMainDO.class) + .set(ContractMainDO::getInstanceId, null) + .eq(ContractMainDO::getId, newContractMainDO.getId())); + } if (DictEnum.BSE_CTRT_STS_IN_PROGRESS.getCode().equals(newContractMainDO.getStatus())) { // 执行中合同重新提交erp From 9eb7efd088a2c3daab87cbbb0eb36aed6c7f4759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Thu, 30 Oct 2025 16:15:15 +0800 Subject: [PATCH 7/8] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/tmpltp/TmplTpServiceImpl.java | 23 ++++++++++++------- .../purchaseorder/ErrorCodeConstants.java | 1 + .../enums/purchaseorder/OrderStatusEnum.java | 3 ++- .../purchaseorder/PurchaseOrderMapper.java | 6 ++--- .../PurchaseOrderServiceImpl.java | 15 +++++++----- .../salesorder/SalesOrderServiceImpl.java | 11 ++++++++- 6 files changed, 40 insertions(+), 19 deletions(-) diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplTpServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplTpServiceImpl.java index c5efe3cd..8cdb974f 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplTpServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplTpServiceImpl.java @@ -393,12 +393,7 @@ public class TmplTpServiceImpl extends ServiceImpl imple String nodeId = node.getId().toString(); String parentId = node.getPrnId() != null ? node.getPrnId().toString() : null; - // 如果是查询条件匹配的根节点 - if (rootIds.contains(nodeId)) { - roots.add(node); - } - - // 如果有父节点且父节点在当前节点集合中，建立父子关系 + // 建立父子关系 if (parentId != null && nodeMap.containsKey(parentId)) { TmplTpTreeVO parent = nodeMap.get(parentId); if (parent.getChildren() == null) { @@ -408,14 +403,26 @@ public class TmplTpServiceImpl extends ServiceImpl imple } } - // 3. 对所有节点的子节点进行排序 + // 3. 只将匹配的节点（rootIds）且没有父节点在结果集中的，作为根节点 + for (String rootId : rootIds) { + TmplTpTreeVO node = nodeMap.get(rootId); + if (node != null) { + String parentId = node.getPrnId() != null ? node.getPrnId().toString() : null; + // 如果父节点不在当前结果集中，则作为根节点 + if (parentId == null || !nodeMap.containsKey(parentId)) { + roots.add(node); + } + } + } + + // 4. 对所有节点的子节点进行排序 nodeMap.values().forEach(node -> { if (node.getChildren() != null && !node.getChildren().isEmpty()) { node.getChildren().sort(Comparator.comparing(TmplTpTreeVO::getSrt)); } }); - // 4. 对根节点排序 + // 5. 对根节点排序 roots.sort(Comparator.comparing(TmplTpTreeVO::getSrt)); return roots; diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/ErrorCodeConstants.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/ErrorCodeConstants.java index 4ac0e3ab..de4b96dc 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/ErrorCodeConstants.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/ErrorCodeConstants.java @@ -17,4 +17,5 @@ public interface ErrorCodeConstants { ErrorCode PURCHASE_ORDER_STATUS_ERROR = new ErrorCode(1_008_001_020, "非法的订单状态"); ErrorCode Sales_ORDER_NOT_EXISTS = new ErrorCode(1_008_000_030, "销售订单不存在"); ErrorCode Sales_ORD_DTL_NOT_EXISTS = new ErrorCode(1_008_001_040, "销售订单明细不存在"); + ErrorCode ORDER_DONT_SUBMIT = new ErrorCode(1_008_000_050, "该订单不支持审批"); } diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/OrderStatusEnum.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/OrderStatusEnum.java index e79428d3..8a995a6d 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/OrderStatusEnum.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/OrderStatusEnum.java @@ -13,7 +13,8 @@ public enum OrderStatusEnum { // 执行中状态 IN_PROGRESS("IN_PROGRESS", "执行中"), // 关闭状态 - CLOSED("CLOSE", "关闭"); + CLOSED("CLOSE", "关闭"), + REJECTED("REJECT", "驳回"); /** 状态编码 */ private final String code; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java index 9eed981b..92f90585 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java @@ -39,8 +39,8 @@ public interface PurchaseOrderMapper extends BaseMapperX { .eqIfPresent(PurchaseOrderDO::getPurchaseGroup, reqVO.getPurchaseGroup()) .eqIfPresent(PurchaseOrderDO::getCurrencyNumber, reqVO.getCurrencyNumber()) .eqIfPresent(PurchaseOrderDO::getExchangeRate, reqVO.getExchangeRate()) - .eqIfPresent(PurchaseOrderDO::getPaperContractNumber, reqVO.getPaperContractNumber()) - .eqIfPresent(PurchaseOrderDO::getAgreementNumber, reqVO.getAgreementNumber()) + .likeIfPresent(PurchaseOrderDO::getPaperContractNumber, reqVO.getPaperContractNumber()) + .likeIfPresent(PurchaseOrderDO::getAgreementNumber, reqVO.getAgreementNumber()) .eqIfPresent(PurchaseOrderDO::getRemark, reqVO.getRemark()) .eqIfPresent(PurchaseOrderDO::getAgentNumber, reqVO.getAgentNumber()) .likeIfPresent(PurchaseOrderDO::getAgentName, reqVO.getAgentName()) @@ -49,7 +49,7 @@ public interface PurchaseOrderMapper extends BaseMapperX { .eqIfPresent(PurchaseOrderDO::getMaterialNumber, reqVO.getMaterialNumber()) .likeIfPresent(PurchaseOrderDO::getMaterialName, reqVO.getMaterialName()) .likeIfPresent(PurchaseOrderDO::getContractName, reqVO.getContractName()) - .eqIfPresent(PurchaseOrderDO::getTenantNumber, reqVO.getTenantNumber()) + .likeIfPresent(PurchaseOrderDO::getTenantNumber, reqVO.getTenantNumber()) .betweenIfPresent(PurchaseOrderDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(PurchaseOrderDO::getErpPurchaseCompanyNumber, reqVO.getErpPurchaseCompanyNumber()) .likeIfPresent(PurchaseOrderDO::getErpPurchaseCompanyName, reqVO.getErpPurchaseCompanyName()) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java index bf0b6928..9caae58c 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java @@ -94,11 +94,11 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { public PurchaseOrderRespVO createPurchaseOrder(PurchaseOrderSaveReqVO createReqVO) { // 插入 PurchaseOrderDO purchaseOrder = BeanUtils.toBean(createReqVO, PurchaseOrderDO.class); -// if (Objects.equals(createReqVO.getIsPush(), 0)) { + if (Objects.equals(createReqVO.getIsPush(), 0)) { purchaseOrder.setStatus(OrderStatusEnum.DRAFT.getCode()); //设置初始状态 -// } else { -// purchaseOrder.setStatus(OrderStatusEnum.TO_SUBMIT_ERP.getCode()); -// } + } else { + purchaseOrder.setStatus(OrderStatusEnum.TO_SUBMIT_ERP.getCode()); + } //生成订单号 String orderNumber = generateOrderNumber(purchaseOrder.getMtrlTp()); purchaseOrder.setSystemOrderNumber(orderNumber); @@ -193,6 +193,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { if (ObjectUtils.isEmpty(purchaseOrderDO)) { throw exception(ORDER_ID_NOT_EXISTS); } + if (purchaseOrderDO.getIsPush()==0) { + throw exception(ORDER_DONT_SUBMIT); + } AdminUserRespDTO adminUserRespDTO = adminUserApi.getUser(SecurityFrameworkUtils.getLoginUserId()).getData(); if (ObjectUtils.isEmpty(purchaseOrderDO.getProcessInstanceId())) { BpmProcessInstanceCreateReqDTO pidto = new BpmProcessInstanceCreateReqDTO(); @@ -762,8 +765,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { return Optional.ofNullable(code) .map(c -> switch (c) { case -1, 3, 4 -> { - log.debug("BPM状态码 {} 转换为: {}", c, OrderStatusEnum.DRAFT.getCode()); - yield OrderStatusEnum.DRAFT.getCode(); + log.debug("BPM状态码 {} 转换为: {}", c, OrderStatusEnum.REJECTED.getCode()); + yield OrderStatusEnum.REJECTED.getCode(); } case 1 -> { log.debug("BPM状态码 {} 转换为: {}", c, OrderStatusEnum.APPROVING.getCode()); diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java index f7df6612..616ea10d 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java @@ -42,6 +42,7 @@ import org.springframework.validation.annotation.Validated; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.Optional; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -93,6 +94,11 @@ public class SalesOrderServiceImpl implements SalesOrderService { SalesOrderDO salesOrderDO = BeanUtils.toBean(createReqVO, SalesOrderDO.class); //订单号 //生成订单号 + if (Objects.equals(createReqVO.getIsPush(), 0)) { + createReqVO.setStatus(OrderStatusEnum.DRAFT.getCode()); //设置初始状态 + } else { + createReqVO.setStatus(OrderStatusEnum.TO_SUBMIT_ERP.getCode()); + } String orderNumber = generateOrderNumber(salesOrderDO.getMtrlTp()); salesOrderDO.setSystemOrderNumber(orderNumber); salesOrderDO.setStatus(OrderStatusEnum.DRAFT.getCode()); @@ -259,11 +265,14 @@ public class SalesOrderServiceImpl implements SalesOrderService { if (ObjectUtils.isEmpty(salesOrderDO)) { throw exception(ORDER_ID_NOT_EXISTS); } + if (salesOrderDO.getIsPush()==0) { + throw exception(ORDER_DONT_SUBMIT); + } AdminUserRespDTO adminUserRespDTO = adminUserApi.getUser(SecurityFrameworkUtils.getLoginUserId()).getData(); if (ObjectUtils.isEmpty(salesOrderDO.getProcessInstanceId())) { BpmProcessInstanceCreateReqDTO pidto = new BpmProcessInstanceCreateReqDTO(); pidto.setProcessDefinitionKey(ProcessDefinitionKeyConstants.SALES_ORDER_REVIEW_PROCESS); - pidto.setBusinessKey(String.valueOf(id)); + pidto.setBusinessKey(id); String data = bpmProcessInstanceApi.createProcessInstance(adminUserRespDTO.getId(), pidto).getData(); if (StringUtils.isNotBlank(data)) { // 获取流程当前审批的任务节点 From 28fdeee2480b26b70b0ca265ff4cf8a34fa923d6 Mon Sep 17 00:00:00 2001 From: guojunyun Date: Thu, 30 Oct 2025 16:48:23 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=8F=90=E4=BA=A4erp?= =?UTF-8?q?=EF=BC=9A=E6=8F=90=E4=BA=A4=E5=A4=B1=E8=B4=A5=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/contract/ContractController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java index 6988a2ab..2d79e74b 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java @@ -21,7 +21,9 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +import static com.zt.plat.framework.common.pojo.CommonResult.error; import static com.zt.plat.framework.common.pojo.CommonResult.success; +import static com.zt.plat.module.contractorder.enums.ErrorCodeConstants.CONTRACT_SUBMIT_ERP_FAIL; @Slf4j @Tag(name = "管理后台 - 合同管理") @@ -146,7 +148,8 @@ public class ContractController implements BusinessControllerMarker { @Operation(summary = "提交ERP") @PreAuthorize("@ss.hasPermission('base:contract:erp')") public CommonResult submitErp(@RequestParam("id") Long id) { - return success(contractService.submitErp(id)); + JSONObject res = contractService.submitErp(id); + return res.getBool("success") ? success(res) : error(CONTRACT_SUBMIT_ERP_FAIL.getCode(), res.getStr("data")); } @GetMapping("/list/up-not-relation")