diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java index ab830e3e..cec88c8d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseOutDetailsMapper.java @@ -49,4 +49,6 @@ public interface LeaseOutDetailsMapper { String getTaskId(Integer parentId); int updateTaskStatus(@Param("taskId") String taskId,@Param("status")int status); + + String getMachineStatus(LeaseOutDetails record); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index 80bd3716..f1260027 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -53,6 +53,10 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { if (StringUtils.isNull(record)) { return AjaxResult.error("领料出库失败,请检查参数是否填写完整!"); } + String status = leaseOutDetailsMapper.getMachineStatus(record); + if (status.equals("16")){ + return AjaxResult.error("领料出库失败,该设备不是在库状态!"); + } if (record.getOutNum() == null || record.getOutNum() < 0.1) { record.setOutNum(1.00); } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml index 78463002..c784a62c 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml @@ -19,6 +19,11 @@ from lease_apply_info where id = #{parentId} + UPDATE