From 6b029e51efa82ced748b81a829fc4afe5d3b9558 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Mon, 1 Apr 2024 15:43:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/sgzb/base/api/domain/LeaseOutDetails.java    | 4 +++-
 .../src/main/java/com/bonus/sgzb/app/domain/TmTask.java    | 5 +++++
 .../sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java  | 3 +++
 .../src/main/resources/mapper/app/TmTaskMapper.xml         | 7 +++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

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 @@
     <if test="userId != 1">
       and mtk.user_id = #{userId}
     </if>
+    <if test="userName != null and userName != ''">
+      and su.user_name = #{userName}
+    </if>
+    <if test="typeId != null and typeId != ''">
+      and lad.type_id = #{typeId}
+    </if>
   </select>
 </mapper>