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

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-06-13 14:58:01 +08:00
parent 8fffbb4c67 8292dacb38
commit e4e4ce6dea
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
View File

@ -209,7 +209,11 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi
return res;
}
//插入ma_type_put_in_storage_info表,返回主键id
/**
* 插入ma_type_put_in_storage_info表,返回主键id
* @param machIneDto
* @return
*/
private int insertInfo(MachIneDto machIneDto) {
return inventoryAndWarehousingMapper.saveInfo(machIneDto);
}
@ -267,6 +271,8 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi
machIneDto.setCreator(dto.getCreator());
machIneDto.setIsCode(dto.getIsCode());
machIneDto.setTotalNum(total);
machIneDto.setUnitId(dto.getUnitId());
machIneDto.setProId(dto.getProId());
machIneDto.setRemarks(dto.getRemarks());
res += insertInfo(machIneDto);
machIneDto.setInfoId(machIneDto.getId());

1
sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
View File

@ -267,7 +267,6 @@
pisd.MACODE like concat('%',#{keyWord},'%')
)
</if>
order by pisi.CREATE_DATE desc
</select>
<select id="selectByMaCode" resultType="java.lang.Integer">
select count(*)