diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java index b02de04..c334c68 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java @@ -58,6 +58,17 @@ public class BackReceiveController extends BaseController { } } + /** + * 退料接收明细 + * @param record + * @return + */ + @Log(title = "退料接收明细", businessType = BusinessType.QUERY) + @GetMapping("getDetailsReceiveList") + public AjaxResult getDetailsReceiveList(BackApplyInfo record) { + return backReceiveService.getDetailsReceiveList(record); + } + /** * 导出 * diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java index 5fc3e4f..5a1a8b5 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java @@ -2,6 +2,7 @@ package com.bonus.sgzb.app.service; import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.base.api.domain.BackApplyInfo; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; import java.util.List; @@ -105,4 +106,11 @@ public interface BackReceiveService { int insertTt(List hgList, Integer taskType, String createBy); int insertTta(int taskId, List list); + + /** + * 退料接收明细 + * @param record + * @return + */ + AjaxResult getDetailsReceiveList(BackApplyInfo record); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index ae61bbe..bc94cbb 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -16,6 +16,7 @@ import com.bonus.sgzb.common.core.enums.TaskStatusEnum; import com.bonus.sgzb.common.core.enums.TaskTypeEnum; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.HttpHelper; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -496,6 +497,26 @@ public class BackReceiveServiceImpl implements BackReceiveService { return res; } + /** + * 退料接收明细 + * @param record + * @return + */ + @Override + public AjaxResult getDetailsReceiveList(BackApplyInfo record) { + BackApplyInfo backApplyInfo = new BackApplyInfo(); + List backApplyInfos = backReceiveMapper.getbackReceiveList(record); + if (!CollectionUtils.isEmpty(backApplyInfos)) { + backApplyInfo.setBackApplyInfo(backApplyInfos.get(0)); + record.setId(backApplyInfos.get(0).getId()); + } + List backApplyInfoList = receiveView(record); + if (!CollectionUtils.isEmpty(backApplyInfoList)) { + backApplyInfo.setBackApplyDetails(backApplyInfoList); + } + return AjaxResult.success(backApplyInfo); + } + public int insertTt(List hgList, Integer taskType, String createBy) { int newTask; //生成单号 diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml index 634d97f..62c2be7 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -635,6 +635,9 @@ and bai.code like concat('%', #{keyWord}, '%') + + and bai.task_id = #{taskId} + and bui.unit_id = #{unitId}