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

代码提交

This commit is contained in:
liang.chao 2025-03-08 17:19:30 +08:00
parent 802c34d487
commit 153d739c69
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java
View File

@ -42,6 +42,16 @@ public class LeaseApplyDetails implements Serializable {
*/ */
@ApiModelProperty(value = "规格ID") @ApiModelProperty(value = "规格ID")
private Integer typeId; private Integer typeId;
/**
* 规格ID
*/
@ApiModelProperty(value = "规格ID")
private Integer maTypeId;
/**
* 规格ID
*/
@ApiModelProperty(value = "默认0,1替换")
private String isReplace;
/** /**
* 类型名称 * 类型名称

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -1207,7 +1207,7 @@ public class TmTaskServiceImpl implements TmTaskService {
if (CollUtil.isNotEmpty(leaseApplyDetails)) { if (CollUtil.isNotEmpty(leaseApplyDetails)) {
for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) {
if (leaseApplyDetail.getPreNum() == null || leaseApplyDetail.getPreNum().equals(0)) { if (leaseApplyDetail.getPreNum() == null || leaseApplyDetail.getPreNum().equals(0)) {
return 0; throw new RuntimeException("请输入预领数量");
} }
LeaseApplyInfo leaseApplyInfos = new LeaseApplyInfo(); LeaseApplyInfo leaseApplyInfos = new LeaseApplyInfo();
if (leaseApplyDetail.getCompanyId() == null) { if (leaseApplyDetail.getCompanyId() == null) {

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java
View File

@ -221,7 +221,9 @@ public class RepairServiceImpl implements RepairService {
for (FileInfo fileInfo : fileList) { for (FileInfo fileInfo : fileList) {
fileInfo.setModelId(bean.getId()); fileInfo.setModelId(bean.getId());
fileInfo.setTypeId(Integer.parseInt(bean.getTypeId())); fileInfo.setTypeId(Integer.parseInt(bean.getTypeId()));
if (bean.getMaId() != null){
fileInfo.setMaId(Integer.parseInt(bean.getMaId())); fileInfo.setMaId(Integer.parseInt(bean.getMaId()));
}
fileInfo.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString()); fileInfo.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString());
fileInfo.setCreateTime(DateUtils.getNowDate()); fileInfo.setCreateTime(DateUtils.getNowDate());
backReceiveMapper.insertBmFileInfo(fileInfo); backReceiveMapper.insertBmFileInfo(fileInfo);

2
sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -961,7 +961,7 @@
</select> </select>
<select id="getLeaseApplyDetailsByApply" resultType="com.bonus.sgzb.app.domain.LeaseApplyDetails"> <select id="getLeaseApplyDetailsByApply" resultType="com.bonus.sgzb.app.domain.LeaseApplyDetails">
SELECT SELECT
lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType, lad.*, mt.type_name AS typeModelName, lad.replace_type_id as replaceTypeId, mt.is_replace as isReplace, mt1.type_id as maTypeId, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType,
case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName, case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName,
CASE mt.manage_type CASE mt.manage_type
WHEN 0 THEN WHEN 0 THEN