bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

退料申请表数据问题修改

This commit is contained in:
liang.chao 2024-03-18 16:04:29 +08:00
parent 78b6f03bb3
commit 56292de5dd
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
View File

@ -544,7 +544,7 @@ public class TmTaskController extends BaseController {
*/ */
@Log(title = "查询机具领料出库列表- app", businessType = BusinessType.QUERY) @Log(title = "查询机具领料出库列表- app", businessType = BusinessType.QUERY)
@GetMapping(value = "getLeaseAuditList") @GetMapping(value = "getLeaseAuditList")
public AjaxResult getLeaseAuditList(TmTask task, String role) { public AjaxResult getLeaseAuditList(TmTask task) {
if (StringUtils.isNull(task)) { if (StringUtils.isNull(task)) {
return AjaxResult.error("参数错误"); return AjaxResult.error("参数错误");
} }

9
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -49,9 +49,6 @@ public class TmTaskServiceImpl implements TmTaskService {
@Resource @Resource
private BmFlowRelationService bmFlowRelationService; private BmFlowRelationService bmFlowRelationService;
@Resource
private TmTaskService tmTaskService;
// 领料申请表Service // 领料申请表Service
@Resource @Resource
private LeaseApplyInfoService leaseApplyInfoService; private LeaseApplyInfoService leaseApplyInfoService;
@ -253,14 +250,14 @@ public class TmTaskServiceImpl implements TmTaskService {
// -----------审批流处理结束 ------------- // -----------审批流处理结束 -------------
// 生成领料编码 // 生成领料编码
String code = tmTaskService.genderLeaseCode(); String code = genderLeaseCode();
if (StringUtils.isEmpty(code)) { return AjaxResult.error("后台生成CODE编号异常，请重试!"); } if (StringUtils.isEmpty(code)) { return AjaxResult.error("后台生成CODE编号异常，请重试!"); }
task.setCode(code); task.setCode(code);
// 创建任务 // 创建任务
if (tmTaskService.insertSelective(task) < 1) { return AjaxResult.error("创建领料任务失败，请重试!"); } if (insertSelective(task) < 1) { return AjaxResult.error("创建领料任务失败，请重试!"); }
//任务与协议建立关联关系 //任务与协议建立关联关系
if (tmTaskService.insertAgreement(task) < 1) { return AjaxResult.error("领料任务与协议建立关联关系失败，请重试!"); } if (insertAgreement(task) < 1) { return AjaxResult.error("领料任务与协议建立关联关系失败，请重试!"); }
// 获取任务编号 // 获取任务编号
String taskId = task.getId(); String taskId = task.getId();