From 9c39f36d8e02c5bf773121de4f27c5f39d322b80 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 6 Sep 2024 13:46:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=AD=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E3=80=81=E6=95=B0=E9=87=8F=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/base/api/domain/MaInputRecord.java | 6 +++--- .../sgzb/base/api/domain/SltAgreementDetails.java | 2 +- .../com/bonus/sgzb/app/mapper/BackReceiveMapper.java | 4 ++-- .../app/service/impl/BackReceiveServiceImpl.java | 6 +++--- .../bonus/sgzb/base/domain/RepairApplyRecord.java | 2 +- .../bonus/sgzb/base/domain/RepairPartDetails.java | 4 ++-- .../com/bonus/sgzb/material/domain/BackRecord.java | 2 +- .../sgzb/material/domain/RepairInputDetails.java | 12 ++++++------ .../com/bonus/sgzb/material/domain/ScrapRecord.java | 4 ++-- .../bonus/sgzb/material/domain/TeamLeaseInfo.java | 2 +- .../service/impl/PurchaseMacodeInfoServiceImpl.java | 2 +- .../service/impl/RepairAuditDetailsServiceImpl.java | 8 +++----- .../bonus/sgzb/material/vo/RepairAuditDetailsVO.java | 6 +++--- .../bonus/sgzb/material/vo/ScrapApplyDetailsVO.java | 2 +- 14 files changed, 30 insertions(+), 32 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputRecord.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputRecord.java index 03d4f3e..8af1833 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputRecord.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaInputRecord.java @@ -45,7 +45,7 @@ public class MaInputRecord extends BaseEntity * 库存数量 */ @ApiModelProperty(value = "库存数量") - private Double num; + private Integer num; /** 入库数量 */ @ApiModelProperty(value = "入库数量") @@ -117,11 +117,11 @@ public class MaInputRecord extends BaseEntity return inputType; } - public Double getNum() { + public Integer getNum() { return num; } - public void setNum(Double num) { + public void setNum(Integer num) { this.num = num; } diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementDetails.java index 114c552..e11d41a 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementDetails.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementDetails.java @@ -34,7 +34,7 @@ public class SltAgreementDetails { /** *数量 */ - private String num; + private Integer num; /** *开始时间 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java index 6f35191..3334bc4 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java @@ -186,9 +186,9 @@ public interface BackReceiveMapper { int updateStlInfo(@Param("info") SltAgreementInfo info,@Param("record") BackApplyInfo record); - int updateStlInfoTwo(@Param("info") SltAgreementInfo info,@Param("record") BackApplyInfo record, @Param("backNum") Double backNum); + int updateStlInfoTwo(@Param("info") SltAgreementInfo info,@Param("record") BackApplyInfo record, @Param("backNum") Integer backNum); - int insStlInfoTwo(@Param("info")SltAgreementInfo info, @Param("many")Double many); + int insStlInfoTwo(@Param("info")SltAgreementInfo info, @Param("many")Integer many); List getAllList(BackApplyInfo record); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index cfafc40..c38c4bc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -290,9 +290,9 @@ public class BackReceiveServiceImpl implements BackReceiveService { for (BackApplyInfo bean : hgList) { List infoList = backReceiveMapper.getStlInfo(bean); if (infoList.size() > 0) { - Double backNum = Double.valueOf(bean.getBackNum()); + Integer backNum = bean.getBackNum(); for (SltAgreementInfo info : infoList) { - Double num = Double.valueOf(info.getNum()); + Integer num = info.getNum(); if (backNum.equals(num)) { backReceiveMapper.updateStlInfo(info, record); break; @@ -300,7 +300,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { backNum = backNum - num; backReceiveMapper.updateStlInfo(info, record); } else if (backNum < num) { - Double many = num - backNum; + Integer many = num - backNum; backReceiveMapper.updateStlInfoTwo(info, record, backNum); backReceiveMapper.insStlInfoTwo(info, many); break; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java index 8242fde..6776476 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java @@ -36,7 +36,7 @@ public class RepairApplyRecord implements Serializable { * 维修数量 */ @ApiModelProperty(value = "维修数量") - private int repairNum; + private Integer repairNum; /** * 报废数量 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairPartDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairPartDetails.java index 48d08aa..22f4b4e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairPartDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairPartDetails.java @@ -47,7 +47,7 @@ public class RepairPartDetails { * 配件数量 */ @ApiModelProperty(value = "配件数量") - private int partNum; + private Integer partNum; /** * 配件费用 */ @@ -96,5 +96,5 @@ public class RepairPartDetails { private Long companyId; private Long repairer; @ApiModelProperty(value = "维修数量") - private int repairNum; + private Integer repairNum; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackRecord.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackRecord.java index ab1d466..fd4330d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackRecord.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackRecord.java @@ -74,7 +74,7 @@ public class BackRecord { */ @ApiModelProperty(value = "退料数量") @Excel(name = "退料数量",cellType = Excel.ColumnType.NUMERIC) - private Double backNum; + private Integer backNum; /** * 退料人 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInputDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInputDetails.java index 9490a83..a2d8e99 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInputDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInputDetails.java @@ -43,11 +43,11 @@ public class RepairInputDetails extends BaseEntity /** 维修合格数量 */ @Excel(name = "维修合格数量") - private BigDecimal repairNum; + private Integer repairNum; /** 入库数量 */ @Excel(name = "入库数量") - private BigDecimal inputNum; + private Integer inputNum; /** 0未审核，1已入库，2驳回 */ @Excel(name = "0未审核，1已入库，2驳回") @@ -112,21 +112,21 @@ public class RepairInputDetails extends BaseEntity { return typeId; } - public void setRepairNum(BigDecimal repairNum) + public void setRepairNum(Integer repairNum) { this.repairNum = repairNum; } - public BigDecimal getRepairNum() + public Integer getRepairNum() { return repairNum; } - public void setInputNum(BigDecimal inputNum) + public void setInputNum(Integer inputNum) { this.inputNum = inputNum; } - public BigDecimal getInputNum() + public Integer getInputNum() { return inputNum; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapRecord.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapRecord.java index b6432d4..99f1bb1 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapRecord.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapRecord.java @@ -117,7 +117,7 @@ public class ScrapRecord { */ @ApiModelProperty(value = "报废数量") @Excel(name = "报废数量",cellType = Excel.ColumnType.NUMERIC) - private Double scrapNum; + private Integer scrapNum; /** * 退料人 @@ -204,6 +204,6 @@ public class ScrapRecord { * 实时库存 */ @ApiModelProperty(value = "实时库存") - private Double num; + private Integer num; } \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TeamLeaseInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TeamLeaseInfo.java index d8a5b49..4766c61 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TeamLeaseInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TeamLeaseInfo.java @@ -81,7 +81,7 @@ public class TeamLeaseInfo { * 数量 */ @Excel(name = "出库数量") - private String num; + private Integer num; /** * 规格型号id */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java index 301e054..43cc763 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java @@ -335,7 +335,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService if ("0".equals(maType.getManageType())) { //编码设备 int countOfMachineByTypeId = purchaseMacodeInfoMapper.getCountOfMachineByTypeId(typeId); - maInputRecord.setNum((double) countOfMachineByTypeId); + maInputRecord.setNum(countOfMachineByTypeId); } //判断是否是成套机具，是的话配件库存也要增加 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java index 5afdbf8..f6f6d9f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java @@ -223,7 +223,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService for (RepairAuditDetails inputDetails : repairInputList) { Long typeId = inputDetails.getTypeId(); Long maId = inputDetails.getMaId(); - BigDecimal repairNum = inputDetails.getRepairedNum(); + Integer repairNum = inputDetails.getRepairedNum(); // 创建修饰后入库任务 if (repairNum.compareTo(b) > 0) { // 添加修试后入库任务 @@ -321,10 +321,8 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService repairTaskDetails.setTaskId(String.valueOf(inputTaskId)); repairTaskDetails.setMaId(inputDetails.getMaId()); repairTaskDetails.setTypeId(inputDetails.getTypeId()); - BigDecimal repairNum = inputDetails.getRepairNum(); - /* 直接转换*/ - int i = repairNum.intValue(); - repairTaskDetails.setRepairNum(i); + Integer repairNum = inputDetails.getRepairNum(); + repairTaskDetails.setRepairNum(repairNum); repairTaskDetails.setStatus("0"); repairTaskDetails.setCreateBy(SecurityUtils.getLoginUser().getUserid()); repairTaskDetails.setCompanyId((long) companyId); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/RepairAuditDetailsVO.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/RepairAuditDetailsVO.java index 87219ad..fc6c1ff 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/RepairAuditDetailsVO.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/RepairAuditDetailsVO.java @@ -95,13 +95,13 @@ public class RepairAuditDetailsVO { /** 维修总量 */ @Excel(name = "维修总量") - private BigDecimal repairNum2; + private Integer repairNum2; /** 维修数量 */ @Excel(name = "维修数量") - private BigDecimal repairedNum2; + private Integer repairedNum2; /** 报废数量 */ @Excel(name = "报废数量") - private BigDecimal scrapNum2; + private Integer scrapNum2; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapApplyDetailsVO.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapApplyDetailsVO.java index 8999d84..ea31e47 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapApplyDetailsVO.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapApplyDetailsVO.java @@ -96,7 +96,7 @@ public class ScrapApplyDetailsVO { /** 报废数量 */ @Excel(name = "报废数量") - private BigDecimal scrapNum2; + private Integer scrapNum2; /**