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

去除退料审核

This commit is contained in:
sxu 2024-07-29 19:05:09 +08:00
parent c979a28e26
commit 10bf893ff4
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java
View File

@ -161,6 +161,9 @@ public class Constants
/** 退库任务*/ /** 退库任务*/
public static final int BACK_TASK_TYPE = 36; //退料核查中 public static final int BACK_TASK_TYPE = 36; //退料核查中
/** 退库状态 - 退料已提交*/
public static final String BACK_SUBMIT_STATUS = "38"; //退料已提交
/** 退库状态 - 退料核查中*/ /** 退库状态 - 退料核查中*/
public static final String BACK_CHECKING_STATUS = "39"; //退料核查中 public static final String BACK_CHECKING_STATUS = "39"; //退料核查中

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

@ -164,7 +164,7 @@ public class BackApplyController extends BaseController {
} }
bean.setCode(code); bean.setCode(code);
bean.setTaskType(Constants.BACK_TASK_TYPE); bean.setTaskType(Constants.BACK_TASK_TYPE);
bean.setTaskStatus(Constants.BACK_CHECKING_STATUS); bean.setTaskStatus(Constants.BACK_SUBMIT_STATUS);
// 创建任务 // 创建任务
boolean addTaskResult = backApplyService.insertSelective(bean) > 0; boolean addTaskResult = backApplyService.insertSelective(bean) > 0;
if (addTaskResult && bean.getTaskId() != null) { if (addTaskResult && bean.getTaskId() != null) {
@ -177,7 +177,6 @@ public class BackApplyController extends BaseController {
if (StringUtils.isNull(bean.getBackApplyInfo())) { if (StringUtils.isNull(bean.getBackApplyInfo())) {
return AjaxResult.error("退料任务信息为空，请重新选择后上传!"); return AjaxResult.error("退料任务信息为空，请重新选择后上传!");
} }
Integer taskId = bean.getTaskId(); Integer taskId = bean.getTaskId();
// 根据设备所属分公司拆分集合 // 根据设备所属分公司拆分集合
List<List<BackApplyInfo>> backApplyInfoList = CollUtil.groupByField(bean.getBackApplyDetails(), "companyId"); List<List<BackApplyInfo>> backApplyInfoList = CollUtil.groupByField(bean.getBackApplyDetails(), "companyId");
@ -196,6 +195,15 @@ public class BackApplyController extends BaseController {
backApplyInfo.setTaskId(taskId); backApplyInfo.setTaskId(taskId);
/*设置设备所属分公司,用于交给哪家审核*/ /*设置设备所属分公司,用于交给哪家审核*/
backApplyInfo.setCompanyId(backApplyInfo1.getCompanyId()); backApplyInfo.setCompanyId(backApplyInfo1.getCompanyId());
if (backApplyInfo1.getCompanyId() != null && backApplyInfo1.getCompanyId().equals(101L)) {
backApplyInfo.setStatus("1");
}
if (backApplyInfo1.getCompanyId() != null && backApplyInfo1.getCompanyId().equals(102L)) {
backApplyInfo.setStatus("3");
}
backApplyInfo.setDirectAuditBy(1);
backApplyInfo.setDirectAuditTime(DateUtils.getTime());
backApplyInfo.setDirectAuditRemark("系统自动审批");
// 创建领料任务，返回领料任务编号 // 创建领料任务，返回领料任务编号
addLeaseTaskResult = backApplyService.insertBackApply(backApplyInfo) > 0; addLeaseTaskResult = backApplyService.insertBackApply(backApplyInfo) > 0;
// 领料任务编号 // 领料任务编号
@ -207,6 +215,8 @@ public class BackApplyController extends BaseController {
for (BackApplyInfo leaseApplyDetails : leaseApplyDetailsList) { for (BackApplyInfo leaseApplyDetails : leaseApplyDetailsList) {
/* 设置领料任务ID*/ /* 设置领料任务ID*/
leaseApplyDetails.setId(backApplyInfoId); leaseApplyDetails.setId(backApplyInfoId);
leaseApplyDetails.setRemark("系统自动审核");
leaseApplyDetails.setAuditNum(leaseApplyDetails.getNum());
// 插入领料任务明细 // 插入领料任务明细
boolean addLeaseTaskDetailsResult = backApplyService.upload(leaseApplyDetails) > 0; boolean addLeaseTaskDetailsResult = backApplyService.upload(leaseApplyDetails) > 0;
if (!addLeaseTaskDetailsResult) { if (!addLeaseTaskDetailsResult) {
@ -253,7 +263,7 @@ public class BackApplyController extends BaseController {
} }
bean.setCode(code); bean.setCode(code);
bean.setTaskType(Constants.BACK_TASK_TYPE); bean.setTaskType(Constants.BACK_TASK_TYPE);
bean.setTaskStatus(Constants.BACK_CHECKING_STATUS); bean.setTaskStatus(Constants.BACK_SUBMIT_STATUS);
bean.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString()); bean.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString());
// 创建任务 // 创建任务
boolean addTaskResult = backApplyService.insertSelective(bean) > 0; boolean addTaskResult = backApplyService.insertSelective(bean) > 0;
@ -302,6 +312,7 @@ public class BackApplyController extends BaseController {
leaseApplyDetails.setId(backApplyInfoId); leaseApplyDetails.setId(backApplyInfoId);
leaseApplyDetails.setUpdateBy("admin"); leaseApplyDetails.setUpdateBy("admin");
leaseApplyDetails.setRemark("系统自动审核"); leaseApplyDetails.setRemark("系统自动审核");
leaseApplyDetails.setAuditNum(leaseApplyDetails.getNum());
// 插入领料任务明细 // 插入领料任务明细
boolean addLeaseTaskDetailsResult = backApplyService.uploadByCq(leaseApplyDetails) > 0; boolean addLeaseTaskDetailsResult = backApplyService.uploadByCq(leaseApplyDetails) > 0;
if (!addLeaseTaskDetailsResult) { if (!addLeaseTaskDetailsResult) {
@ -352,7 +363,7 @@ public class BackApplyController extends BaseController {
} }
bean.setCode(code); bean.setCode(code);
bean.setTaskType(Constants.BACK_TASK_TYPE); bean.setTaskType(Constants.BACK_TASK_TYPE);
bean.setTaskStatus(Constants.BACK_CHECKING_STATUS); bean.setTaskStatus(Constants.BACK_SUBMIT_STATUS);
boolean addTaskResult = backApplyService.insertSelective(bean) > 0; boolean addTaskResult = backApplyService.insertSelective(bean) > 0;
// 创建任务 // 创建任务
if (addTaskResult && bean.getTaskId() != null) { if (addTaskResult && bean.getTaskId() != null) {
@ -382,6 +393,15 @@ public class BackApplyController extends BaseController {
backApplyInfo.setTaskId(taskId); backApplyInfo.setTaskId(taskId);
/*设置设备所属分公司,用于交给哪家审核*/ /*设置设备所属分公司,用于交给哪家审核*/
backApplyInfo.setCompanyId(backApplyInfo1.getCompanyId()); backApplyInfo.setCompanyId(backApplyInfo1.getCompanyId());
if (backApplyInfo1.getCompanyId() != null && backApplyInfo1.getCompanyId().equals(101L)) {
backApplyInfo.setStatus("1");
}
if (backApplyInfo1.getCompanyId() != null && backApplyInfo1.getCompanyId().equals(102L)) {
backApplyInfo.setStatus("3");
}
backApplyInfo.setDirectAuditBy(1);
backApplyInfo.setDirectAuditTime(DateUtils.getTime());
backApplyInfo.setDirectAuditRemark("系统自动审批");
// 创建领料任务，返回领料任务编号 // 创建领料任务，返回领料任务编号
addLeaseTaskResult = backApplyService.insertBackApply(backApplyInfo) > 0; addLeaseTaskResult = backApplyService.insertBackApply(backApplyInfo) > 0;
// 领料任务编号 // 领料任务编号
@ -393,6 +413,8 @@ public class BackApplyController extends BaseController {
for (BackApplyInfo leaseApplyDetails : leaseApplyDetailsList) { for (BackApplyInfo leaseApplyDetails : leaseApplyDetailsList) {
/* 设置领料任务ID*/ /* 设置领料任务ID*/
leaseApplyDetails.setId(backApplyInfoId); leaseApplyDetails.setId(backApplyInfoId);
leaseApplyDetails.setRemark("系统自动审核");
leaseApplyDetails.setAuditNum(leaseApplyDetails.getNum());
// 插入领料任务明细 // 插入领料任务明细
boolean addLeaseTaskDetailsResult = backApplyService.upload(leaseApplyDetails) > 0; boolean addLeaseTaskDetailsResult = backApplyService.upload(leaseApplyDetails) > 0;
if (!addLeaseTaskDetailsResult) { if (!addLeaseTaskDetailsResult) {