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

优化

This commit is contained in:
mashuai 2025-07-05 21:27:36 +08:00
parent 0ccb1f92fe
commit a431d047c4
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java
View File

@ -302,7 +302,7 @@ public class BmQrBoxServiceImpl implements BmQrBoxService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public AjaxResult appReceive(BmQrBoxInfo bmQrBoxInfo) { public AjaxResult appReceive(BmQrBoxInfo bmQrBoxInfo) {
int result = 0; /* int result = 0;
// 用来存储每个 taskId 的出现次数 // 用来存储每个 taskId 的出现次数
Map<String, Integer> taskIdCountMap = new HashMap<>(); Map<String, Integer> taskIdCountMap = new HashMap<>();
final List<BmQrBoxInfo> bmQrBoxInfos = bmQrBoxMapper.find(new BmQrBoxInfo().setBoxId(bmQrBoxInfo.getBoxId())); final List<BmQrBoxInfo> bmQrBoxInfos = bmQrBoxMapper.find(new BmQrBoxInfo().setBoxId(bmQrBoxInfo.getBoxId()));
@ -348,13 +348,13 @@ public class BmQrBoxServiceImpl implements BmQrBoxService {
} }
} else { } else {
return AjaxResult.error(500, "接收失败,无此标准箱信息!"); return AjaxResult.error(500, "接收失败,无此标准箱信息!");
} }*/
bmQrBoxInfo.setBoxCode(null).setBoxName(null).setBoxType(null) bmQrBoxInfo.setBoxCode(null).setBoxName(null).setBoxType(null)
.setInputUser(SecurityUtils.getLoginUser().getUserid()) .setInputUser(SecurityUtils.getLoginUser().getUserid())
.setStatus(QrBoxStatusEnum.QR_BOX_STATUS_ON_RECEIVE.getStatus().toString()); .setStatus(QrBoxStatusEnum.QR_BOX_STATUS_ON_RECEIVE.getStatus().toString());
return 0 < bmQrBoxMapper.updateBmQrcodeInfoById(bmQrBoxInfo) ? return 0 < bmQrBoxMapper.updateBmQrcodeInfoById(bmQrBoxInfo) ?
AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg()) : AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg()) :
AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); AjaxResult.error(500, HttpCodeEnum.FAIL.getMsg());
} }
/** /**

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java
View File

@ -860,7 +860,8 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService {
if (allMatch) { if (allMatch) {
TmTask tmTask = new TmTask(); TmTask tmTask = new TmTask();
tmTask.setTaskId(leaseApplyInfo.getTaskId()); tmTask.setTaskId(leaseApplyInfo.getTaskId());
tmTask.setTaskStatus(LeaseTaskStatusEnum.LEASE_TASK_IN_PROGRESS.getStatus()); // 出库完成
tmTask.setTaskStatus(3);
result = tmTaskMapper.updateTmTask(tmTask); result = tmTaskMapper.updateTmTask(tmTask);
if (result == 0) { if (result == 0) {
return AjaxResult.error("发布失败,请联系管理员"); return AjaxResult.error("发布失败,请联系管理员");

2
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
View File

@ -766,7 +766,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id
and mt4.`level` = '1' and mt4.del_flag = '0' and mt4.`level` = '1' and mt4.del_flag = '0'
WHERE WHERE
wsi.lease_unit is null and wsi.lease_project is null 1 = 1
<if test="typeId != null "> <if test="typeId != null ">
and wsi.model_id = #{typeId} and wsi.model_id = #{typeId}
</if> </if>