1/19代码提交

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);
 }

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);
         }

sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml

@@ -19,6 +19,11 @@
         from lease_apply_info
         where id = #{parentId}
     </select>
+    <select id="getMachineStatus" resultType="java.lang.String">
+        select ma_status
+        from ma_machine
+        where ma_id = #{maId}
+    </select>
 
     <update id="updateLeaseApplyDetailsOutNum">
         UPDATE