From 5ba4540133e6a2f3c3cadc4e2195e57c535f3261 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 19 Aug 2024 16:04:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=BA=93=E7=AE=A1=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java | 3 +++ .../src/main/resources/mapper/app/BackReceiveMapper.xml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java index 9582698..e916f52 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java @@ -353,4 +353,7 @@ public class BackApplyInfo extends BaseEntity { /** 操作后库存 */ private int postStoreNum; + + /** 库管员 */ + private long userId; } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml index 8928f75..e9a59cb 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -669,6 +669,7 @@ bad.status as status, IFNULL(bad.audit_num,0)-IFNULL(aa.back_num,0) as num, mt.manage_type as manageType, + mtk.user_id, CONCAT('NSJJ',mt.`code`,mt.model_code) as `code` FROM back_apply_details bad @@ -676,6 +677,7 @@ LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id LEFT JOIN ma_type mt on mt.type_id=bad.type_id LEFT JOIN ma_type mt2 ON mt2.type_id=mt.parent_id + LEFT JOIN ma_type_keeper mtk on mt.type_id=mtk.type_id LEFT JOIN ( SELECT type_id as typeId,