diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java
index ba3ec9a2..764b3b95 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java
@@ -153,7 +153,9 @@ public class LeaseOutDetails implements Serializable {
*/
@ApiModelProperty(value = "数据所属组织")
private Integer companyId;
- @ApiModelProperty(value = "出库类型")
+ @ApiModelProperty(value = "出库类型 0编码出库 1数量出库")
private Integer manageType;
+ @ApiModelProperty(value = "数量出库-出库数量")
+ private Integer inputNum;
}
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
index 4a91114c..eaab5730 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
@@ -59,6 +59,11 @@ public class TmTask implements Serializable {
*/
@ApiModelProperty(value="已出库数量")
private Integer alNum;
+ /**
+ * 库存
+ */
+ @ApiModelProperty(value="库存")
+ private Integer num;
/**
* 编号
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 90ff9047..de5a7849 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
@@ -147,6 +147,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
// 1、判断是否重复提交
res = checkRepeatSubmit(record);
if (res > 0) {
+ if (record.getManageType() == 1 && record.getInputNum() != null) {
+ record.setOutNum(record.getInputNum().doubleValue());
+ }
//2、判断库存是否足够
res = checkStorageNum(record);
if (res > 0) {
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index fd87eabe..5487ffd8 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -945,6 +945,7 @@
mt2.type_name as typeName,
mt.type_name as typeModelName,
mt.manage_type as manageType,
+ mt.num as num,
su.user_name as userName,
lad.type_id as typeId
FROM
@@ -959,5 +960,11 @@
and mtk.user_id = #{userId}
+
+ and su.user_name = #{userName}
+
+
+ and lad.type_id = #{typeId}
+