领料接口优化

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseOutDetails.java

@@ -67,4 +67,7 @@ public class LeaseOutDetails extends BaseEntity {
 
     @ApiModelProperty(value = "数量出库-出库数量")
     private Long inputNum;
+
+    @ApiModelProperty(value = "0工程1长期")
+    private String leaseType;
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java

@@ -170,6 +170,7 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService {
                 return AjaxResult.error("已领数量大于预领数量或该机具未在库");
             }
         } catch (Exception e) {
+            log.error(e.getMessage());
             return AjaxResult.error("出库失败");
         }
         return AjaxResult.success("出库成功");

bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml

@@ -662,8 +662,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select lease_price as leasePrice,
                rent_price as rentPrice,
                buy_price as buyPrice,
-               pay_price as payPrice,
-               company_id as companyId
+               pay_price as payPrice
         from ma_type
         where type_id = #{typeId} and del_flag = 0
     </select>