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

合并

This commit is contained in:
zhouzy062 2024-01-31 13:57:52 +08:00
parent 2ed5a78cec
commit d801158d54
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
View File

@ -143,19 +143,11 @@ public class BackApplyController extends BaseController {
if (CollUtil.isNotEmpty(leaseApplyDetailsList)) { if (CollUtil.isNotEmpty(leaseApplyDetailsList)) {
// 对领料任务表的对象做数据处理 // 对领料任务表的对象做数据处理
BackApplyInfo backApplyInfo = bean.getBackApplyInfo(); BackApplyInfo backApplyInfo = bean.getBackApplyInfo();
<<<<<<< HEAD
// 创建领料单号
backApplyInfo.setCode(code);
// 设置任务ID
backApplyInfo.setTaskId(taskId);
// 设置设备所属分公司,用于交给哪家审核
=======
/* 创建领料单号*/ /* 创建领料单号*/
backApplyInfo.setCode(code); backApplyInfo.setCode(code);
/*设置任务ID*/ /*设置任务ID*/
backApplyInfo.setTaskId(taskId); backApplyInfo.setTaskId(taskId);
/*设置设备所属分公司,用于交给哪家审核*/ /*设置设备所属分公司,用于交给哪家审核*/
>>>>>>> origin/dev
backApplyInfo.setCompanyId(leaseApplyDetailsList.get(0).getCompanyId()); backApplyInfo.setCompanyId(leaseApplyDetailsList.get(0).getCompanyId());
// 创建领料任务，返回领料任务编号 // 创建领料任务，返回领料任务编号
@ -166,11 +158,7 @@ public class BackApplyController extends BaseController {
Long backApplyInfoId = backApplyInfo.getId(); Long backApplyInfoId = backApplyInfo.getId();
if (StringUtils.isNotNull(backApplyInfoId)) { if (StringUtils.isNotNull(backApplyInfoId)) {
for (BackApplyInfo leaseApplyDetails : leaseApplyDetailsList) { for (BackApplyInfo leaseApplyDetails : leaseApplyDetailsList) {
<<<<<<< HEAD
// 设置领料任务ID
=======
/* 设置领料任务ID*/ /* 设置领料任务ID*/
>>>>>>> origin/dev
leaseApplyDetails.setId(backApplyInfoId); leaseApplyDetails.setId(backApplyInfoId);
// 插入领料任务明细 // 插入领料任务明细
boolean addLeaseTaskDetailsResult = backApplyService.upload(leaseApplyDetails) > 0; boolean addLeaseTaskDetailsResult = backApplyService.upload(leaseApplyDetails) > 0;