From 153d739c69792e7a946baa69cafdd689d1b306d4 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Sat, 8 Mar 2025 17:19:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/sgzb/app/domain/LeaseApplyDetails.java | 10 ++++++++++ .../bonus/sgzb/app/service/impl/TmTaskServiceImpl.java | 2 +- .../sgzb/base/service/impl/RepairServiceImpl.java | 4 +++- .../src/main/resources/mapper/app/TmTaskMapper.xml | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java index f949c02..854c3b2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java @@ -42,6 +42,16 @@ public class LeaseApplyDetails implements Serializable { */ @ApiModelProperty(value = "规格ID") private Integer typeId; + /** + * 规格ID + */ + @ApiModelProperty(value = "规格ID") + private Integer maTypeId; + /** + * 规格ID + */ + @ApiModelProperty(value = "默认0,1替换") + private String isReplace; /** * 类型名称 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index c6af152..3153617 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -1207,7 +1207,7 @@ public class TmTaskServiceImpl implements TmTaskService { if (CollUtil.isNotEmpty(leaseApplyDetails)) { for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { if (leaseApplyDetail.getPreNum() == null || leaseApplyDetail.getPreNum().equals(0)) { - return 0; + throw new RuntimeException("请输入预领数量"); } LeaseApplyInfo leaseApplyInfos = new LeaseApplyInfo(); if (leaseApplyDetail.getCompanyId() == null) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index c54f0ad..a862232 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -221,7 +221,9 @@ public class RepairServiceImpl implements RepairService { for (FileInfo fileInfo : fileList) { fileInfo.setModelId(bean.getId()); fileInfo.setTypeId(Integer.parseInt(bean.getTypeId())); - fileInfo.setMaId(Integer.parseInt(bean.getMaId())); + if (bean.getMaId() != null){ + fileInfo.setMaId(Integer.parseInt(bean.getMaId())); + } fileInfo.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString()); fileInfo.setCreateTime(DateUtils.getNowDate()); backReceiveMapper.insertBmFileInfo(fileInfo); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml index 7946c6d..a09a20a 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml @@ -961,7 +961,7 @@