This commit is contained in:
parent
b475151988
commit
e97baeffca
|
|
@ -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);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 导出
|
* 导出
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package com.bonus.sgzb.app.service;
|
||||||
|
|
||||||
import com.bonus.sgzb.app.domain.TmTask;
|
import com.bonus.sgzb.app.domain.TmTask;
|
||||||
import com.bonus.sgzb.base.api.domain.BackApplyInfo;
|
import com.bonus.sgzb.base.api.domain.BackApplyInfo;
|
||||||
|
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
@ -105,4 +106,11 @@ public interface BackReceiveService {
|
||||||
int insertTt(List<BackApplyInfo> hgList, Integer taskType, String createBy);
|
int insertTt(List<BackApplyInfo> hgList, Integer taskType, String createBy);
|
||||||
|
|
||||||
int insertTta(int taskId, List<BackApplyInfo> list);
|
int insertTta(int taskId, List<BackApplyInfo> list);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 退料接收明细
|
||||||
|
* @param record
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
AjaxResult getDetailsReceiveList(BackApplyInfo record);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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.enums.TaskTypeEnum;
|
||||||
import com.bonus.sgzb.common.core.utils.DateUtils;
|
import com.bonus.sgzb.common.core.utils.DateUtils;
|
||||||
import com.bonus.sgzb.common.core.utils.HttpHelper;
|
import com.bonus.sgzb.common.core.utils.HttpHelper;
|
||||||
|
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
|
@ -496,6 +497,26 @@ public class BackReceiveServiceImpl implements BackReceiveService {
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 退料接收明细
|
||||||
|
* @param record
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public AjaxResult getDetailsReceiveList(BackApplyInfo record) {
|
||||||
|
BackApplyInfo backApplyInfo = new BackApplyInfo();
|
||||||
|
List<BackApplyInfo> backApplyInfos = backReceiveMapper.getbackReceiveList(record);
|
||||||
|
if (!CollectionUtils.isEmpty(backApplyInfos)) {
|
||||||
|
backApplyInfo.setBackApplyInfo(backApplyInfos.get(0));
|
||||||
|
record.setId(backApplyInfos.get(0).getId());
|
||||||
|
}
|
||||||
|
List<BackApplyInfo> backApplyInfoList = receiveView(record);
|
||||||
|
if (!CollectionUtils.isEmpty(backApplyInfoList)) {
|
||||||
|
backApplyInfo.setBackApplyDetails(backApplyInfoList);
|
||||||
|
}
|
||||||
|
return AjaxResult.success(backApplyInfo);
|
||||||
|
}
|
||||||
|
|
||||||
public int insertTt(List<BackApplyInfo> hgList, Integer taskType, String createBy) {
|
public int insertTt(List<BackApplyInfo> hgList, Integer taskType, String createBy) {
|
||||||
int newTask;
|
int newTask;
|
||||||
//生成单号
|
//生成单号
|
||||||
|
|
|
||||||
|
|
@ -635,6 +635,9 @@
|
||||||
<if test="keyWord != null and keyWord != ''">
|
<if test="keyWord != null and keyWord != ''">
|
||||||
and bai.code like concat('%', #{keyWord}, '%')
|
and bai.code like concat('%', #{keyWord}, '%')
|
||||||
</if>
|
</if>
|
||||||
|
<if test="taskId != null">
|
||||||
|
and bai.task_id = #{taskId}
|
||||||
|
</if>
|
||||||
<if test="unitId != null and unitId != ''">
|
<if test="unitId != null and unitId != ''">
|
||||||
and bui.unit_id = #{unitId}
|
and bui.unit_id = #{unitId}
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue