From 2373be59e6a7f1553f2d20ffad8f2b26f2dc06f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Fri, 17 Jul 2026 15:27:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B4=A7=E6=80=A5=E4=BB=BB=E5=8A=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BillingStatementApplicationService.java | 3 ++ .../BmsInvoiceListServiceImpl.java | 22 +++++++++- .../ShiftManageApplicationService.java | 11 +++++ .../service/ShiftManageDomainService.java | 44 +++++++++++++++++++ .../facadeApi/shiftManage/ShiftManageApi.java | 10 +++++ 5 files changed, 89 insertions(+), 1 deletion(-) diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java index 2a56b025c..9e56458e6 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java +++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java @@ -598,6 +598,9 @@ public class BillingStatementApplicationService { billingStatementPO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); billingStatementPO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); billingStatementPO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); + // 默认填充当前登录人为业务员 + billingStatementPO.setSalesmanId(String.valueOf(loginUser.getUserid())); + billingStatementPO.setSalesmanName(loginUser.getUserPo().getUserName()); return billingStatementPO; } diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java index 1a6b37416..9f2015bdb 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mhd.bms.domain.billManage.entity.BillManage; import com.mhd.bms.domain.billManage.repository.mapper.BillManageMapper; +import com.mhd.common.core.web.domain.AjaxResult; import com.mhd.bms.domain.bmsInvoiceList.entity.BmsInvoiceList; import com.mhd.bms.domain.bmsInvoiceList.entity.BmsSettlementPartyInvoice; import com.mhd.bms.domain.bmsInvoiceList.repository.facade.IBmsInvoiceListService; @@ -56,6 +57,8 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl shiftManageIds = shiftManageDO.getShiftManageIds(); + if (CollectionUtils.isEmpty(shiftManageIds)) { + throw new ServiceException("移位单id不能为空"); + } + List shiftManageList = shiftManageService.listByIds(shiftManageIds); + if (CollectionUtils.isEmpty(shiftManageList)) { + throw new ServiceException("移位单不存在"); + } + for (ShiftManage shiftManage : shiftManageList) { + if (!Integer.valueOf(2).equals(shiftManage.getShiftStatus())) { + throw new ServiceException("移位单【" + shiftManage.getShiftNumber() + "】状态不为待移位，不可撤回"); + } + } + // 删除生成的配送任务（taskType=5，trackingNumber=shiftNumber） + List shiftNumbers = shiftManageList.stream() + .map(ShiftManage::getShiftNumber) + .collect(Collectors.toList()); + deliveTaskService.remove(new QueryWrapper().lambda() + .in(DeliveTask::getTrackingNumber, shiftNumbers) + .eq(DeliveTask::getTaskType, 5)); + // 回退：shiftStatus=1（已创建），taskDistribution=2（未下发），auditStatus=1（未审核） + shiftManageService.update(null, new UpdateWrapper().lambda() + .set(ShiftManage::getShiftStatus, 1) + .set(ShiftManage::getTaskDistribution, 2) + .set(ShiftManage::getAuditStatus, 1) + .set(ShiftManage::getUpdateBy, loginUser.getUserid()) + .set(ShiftManage::getUpdateByName, loginUser.getUsername()) + .set(ShiftManage::getUpdateTime, new Date()) + .in(ShiftManage::getShiftManageId, shiftManageIds)); + return true; + } + /** * 物料移位 */ diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/shiftManage/ShiftManageApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/shiftManage/ShiftManageApi.java index 45b49754e..af8da1375 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/shiftManage/ShiftManageApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/shiftManage/ShiftManageApi.java @@ -120,4 +120,14 @@ public class ShiftManageApi extends BaseController { return AjaxResult.success(shiftManageApplicationService.taskDistribution(shiftManageDO)); } + /** + * 撤回审核 + */ + @ApiOperation("撤回审核") + @PostMapping(value = "/revokeAudit") + public AjaxResult revokeAudit(@RequestBody ShiftManageDTO shiftManageDTO) { + ShiftManageDO shiftManageDO = shiftManageAssembler.toDO(shiftManageDTO); + return AjaxResult.success(shiftManageApplicationService.revokeAudit(shiftManageDO)); + } + }