bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新购模块优化

This commit is contained in:
sxu 2024-11-18 15:31:17 +08:00
parent a8956fa0f8
commit 6fe995e8d8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -272,7 +272,6 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
updateCount += purchaseCheckDetailsMapper.updatePurchaseDetails4Check(details); updateCount += purchaseCheckDetailsMapper.updatePurchaseDetails4Check(details);
} }
} }
// 注意： 维护tm_task的状态，但因为新购任务中的物资可以部分流转，所以汇总的状态失去意义，不再维护
} }
return updateCount > 0 ? AjaxResult.success("验证成功") : AjaxResult.error("无验证信息"); return updateCount > 0 ? AjaxResult.success("验证成功") : AjaxResult.error("无验证信息");
} catch (Exception e) { } catch (Exception e) {
@ -286,8 +285,6 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
try { try {
AjaxResult result = new AjaxResult(); AjaxResult result = new AjaxResult();
if (!CollectionUtils.isEmpty(purchaseVerifyVo.getPurchaseCheckDetailsList())) { if (!CollectionUtils.isEmpty(purchaseVerifyVo.getPurchaseCheckDetailsList())) {
//Long taskId = purchaseVerifyVo.getPurchaseCheckDetailsList().get(0).getTaskId();
//Integer status = purchaseCheckDetailsList.get(0).getStatus();
if (BooleanUtils.isTrue(purchaseVerifyVo.getVerifyPass())) { if (BooleanUtils.isTrue(purchaseVerifyVo.getVerifyPass())) {
for (PurchaseCheckDetails details : purchaseVerifyVo.getPurchaseCheckDetailsList()) { for (PurchaseCheckDetails details : purchaseVerifyVo.getPurchaseCheckDetailsList()) {
if (MaTypeManageTypeEnum.CODE_DEVICE.getTypeId().equals(details.getManageType())) { if (MaTypeManageTypeEnum.CODE_DEVICE.getTypeId().equals(details.getManageType())) {
@ -301,9 +298,12 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
for (PurchaseCheckDetails details : purchaseVerifyVo.getPurchaseCheckDetailsList()) { for (PurchaseCheckDetails details : purchaseVerifyVo.getPurchaseCheckDetailsList()) {
details.setStatus(PurchaseTaskStatusEnum.TO_NOTICE.getStatus()); details.setStatus(PurchaseTaskStatusEnum.TO_NOTICE.getStatus());
result = purchaseCheckDetailsMapper.updatePurchaseDetails4Check(details) > 0 ? AjaxResult.success("detail验证驳回成功") : AjaxResult.error("details无验证信息"); result = purchaseCheckDetailsMapper.updatePurchaseDetails4Check(details) > 0 ? AjaxResult.success("detail验证驳回成功") : AjaxResult.error("details无验证信息");
tmTaskMapper.updateTmTask(new TmTask()
.setTaskId(details.getTaskId())
.setTaskType(TmTaskTypeEnum.TM_TASK_PURCHASE.getTaskTypeId())
.setTaskStatus(PurchaseTaskStatusEnum.TASK_TO_START.getStatus()));
} }
} }
// 注意： 维护tm_task的状态，但因为新购任务中的物资可以部分流转，所以汇总的状态失去意义，不再维护
} }
return result; return result;
} catch (Exception e) { } catch (Exception e) {

2
bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml
View File

@ -78,9 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="companyId != null">company_id = #{companyId},</if> <if test="companyId != null">company_id = #{companyId},</if>
update_time = NOW()
</trim> </trim>
where task_id = #{taskId} where task_id = #{taskId}
</update> </update>