From 1fdf3a8e089c5bc079dff182cfcf67ddd74ec0a5 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 13 Nov 2024 15:41:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/lease/domain/LeaseApplyDetails.java | 15 ++++++++++++++- .../material/lease/LeaseApplyDetailsMapper.xml | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java index 0dac353a..16f2e15c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyDetails.java @@ -61,8 +61,21 @@ public class LeaseApplyDetails extends BaseEntity { @ApiModelProperty(value = "已领数量") private Long alNum; + /** + * 此数量是剩余需要出库的数量（preNum - alNum） + */ + @ApiModelProperty(value = "剩余最大出库数量") + private Integer outNum; + + /** + * 装备管理方式(0编号 1计数) + */ + @ApiModelProperty(name = "装备管理方式") + @Excel(name = "装备管理方式", readConverterExp = "0=编号,1=计数") + private int manageType; + /** 状态（0待审批，1进行中，2已出库） */ - @Excel(name = "状态", readConverterExp = "0=待审批，1进行中，2已出库") + @Excel(name = "状态", readConverterExp = "0=待审批,1=进行中,2=已出库") private String status; /** 数据所属组织 */ diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml index c7619d26..a1eb5b01 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml @@ -31,6 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select lad.id, lad.parent_id, mt.type_id, mt.type_name, mt2.type_name as ma_type_name, mt.storage_num, + mt.manage_type as manageType, + (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum, lad.pre_num, lad.audit_num, lad.al_num, lad.status, mt.unit_name, lad.create_by, lad.create_time, lad.update_by, lad.update_time, lad.remark, lad.company_id from