From d2cb36959b65ece32cec7e2db4d6764f5c788b1d Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 30 四月 2025 08:33:24 +0800 Subject: [PATCH] 1. 波次删除判断是否有子任务列表 2. 任务明细添加字段:执行数量,完成数量, 源单据号,源单据ID --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java index d0ab07b..e4a9178 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java @@ -9,9 +9,12 @@ import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.KeyValVo; import com.vincent.rsf.server.common.domain.PageParam; +import com.vincent.rsf.server.manager.entity.Companys; import com.vincent.rsf.server.manager.entity.DeliveryItem; +import com.vincent.rsf.server.manager.service.CompanysService; import com.vincent.rsf.server.manager.service.DeliveryItemService; import com.vincent.rsf.server.system.controller.BaseController; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -24,6 +27,10 @@ @Autowired private DeliveryItemService deliveryItemService; + + + @Autowired + private CompanysService companysService; @PreAuthorize("hasAuthority('manager:deliveryItem:list')") @PostMapping("/deliveryItem/page") @@ -59,6 +66,10 @@ deliveryItem.setCreateTime(new Date()); deliveryItem.setUpdateBy(getLoginUserId()); deliveryItem.setUpdateTime(new Date()); + if (StringUtils.isNotBlank(deliveryItem.getSplrName())) { + Companys companys = companysService.getById(deliveryItem.getSplrName()); + deliveryItem.setSplrName(companys.getName()).setSplrCode(companys.getCode()); + } if (!deliveryItemService.save(deliveryItem)) { return R.error("Save Fail"); } -- Gitblit v1.9.1