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

BUG修改

This commit is contained in:
syruan 2025-01-10 14:11:26 +08:00
parent 476eaf3a81
commit d75a7fbc24
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java
View File

@ -57,7 +57,7 @@ public interface BmQrBoxMapper {
* @param boxId 标准箱id * @param boxId 标准箱id
* @return 标准箱物资的绑定批次 buyTask * @return 标准箱物资的绑定批次 buyTask
*/ */
Long getBoxBindMaBuyTaskByBoxId(Long boxId); String getBoxBindMaBuyTaskByBoxId(Long boxId);
/** /**
* 查询此机具是否已经被标准箱绑定过 * 查询此机具是否已经被标准箱绑定过

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

@ -361,7 +361,7 @@ public class BmQrBoxServiceImpl implements BmQrBoxService {
if (null == machineVo.getBuyTask()) { if (null == machineVo.getBuyTask()) {
return AjaxResult.error("物资未关联采购批次，请完善后重试!"); return AjaxResult.error("物资未关联采购批次，请完善后重试!");
} }
Long boxBindMaBuyTaskId = bmQrBoxMapper.getBoxBindMaBuyTaskByBoxId(bmQrBoxInfo.getBoxId()); String boxBindMaBuyTaskId = bmQrBoxMapper.getBoxBindMaBuyTaskByBoxId(bmQrBoxInfo.getBoxId());
if (null != boxBindMaBuyTaskId && !Objects.equals(boxBindMaBuyTaskId, machineVo.getBuyTask())) { if (null != boxBindMaBuyTaskId && !Objects.equals(boxBindMaBuyTaskId, machineVo.getBuyTask())) {
return AjaxResult.error("该物资批次与标准箱已存在批次不匹配，请完善后重试!"); return AjaxResult.error("该物资批次与标准箱已存在批次不匹配，请完善后重试!");
} }

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java
View File

@ -42,7 +42,4 @@ public class MachineVo extends Machine {
@ApiModelProperty("状态名称") @ApiModelProperty("状态名称")
private String statusName; private String statusName;
@ApiModelProperty("购置批次")
private Long buyTask;
} }

2
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml
View File

@ -256,7 +256,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.type_id = #{maTypeId} mt.type_id = #{maTypeId}
</select> </select>
<select id="getBoxBindMaBuyTaskByBoxId" resultType="java.lang.Long"> <select id="getBoxBindMaBuyTaskByBoxId" resultType="java.lang.String">
select select
mm.buy_task mm.buy_task
from from