diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java index 3870cedc..d90496d3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java @@ -797,7 +797,7 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { res = leaseApplyDetailsMapper.updateLeaseApplyDetailsOutNum(record); leaseApplyDetails = leaseApplyDetailsMapper.getLeaseApplyDetails(record); } - if (leaseApplyDetails.getPreNum().equals(leaseApplyDetails.getAlNum()) || leaseApplyDetails.getAuditNum().equals(leaseApplyDetails.getAlNum())) { + if (leaseApplyDetails.getPreNum().compareTo(leaseApplyDetails.getAlNum()) == 0 || leaseApplyDetails.getAuditNum().compareTo(leaseApplyDetails.getAlNum()) == 0) { leaseApplyDetailsMapper.updateLeaseApplyDetailsByLeaseOutRecord(record); } if (res > GlobalConstants.INT_0) { @@ -807,6 +807,11 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { res = leaseOutDetailsMapper.insertLeaseOutDetails(record); type.setOutNum(record.getOutNum()); if (res > GlobalConstants.INT_0) { + type.setTypeId(record.getTypeId()); + type.setStyle("1"); + type.setModelTitle("领料出库"); + type.setCode(record.getCode()); + res = typeService.updateNumAddOrSubtract(type); if (record.getMaId() != null) { if (record.getJiJuType() == GlobalConstants.INT_1) { record.setThisCheckTime(DateUtils.getNowDate()); @@ -820,11 +825,6 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { type.setOutNum(BigDecimal.valueOf(GlobalConstants.INT_1)); type.setMaId(record.getMaId()); } - type.setTypeId(record.getTypeId()); - type.setStyle("1"); - type.setModelTitle("领料出库"); - type.setCode(record.getCode()); - res = typeService.updateNumAddOrSubtract(type); } } return res;