bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into macode20240818

This commit is contained in:
sxu 2024-08-19 17:36:12 +08:00
parent 25523e3f4b 5ba4540133
commit 9443198007
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java
View File

@ -353,4 +353,7 @@ public class BackApplyInfo extends BaseEntity {
/** 操作后库存 */ /** 操作后库存 */
private int postStoreNum; private int postStoreNum;
/** 库管员 */
private long userId;
} }

2
sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -669,6 +669,7 @@
bad.status as status, bad.status as status,
IFNULL(bad.audit_num,0)-IFNULL(aa.back_num,0) as num, IFNULL(bad.audit_num,0)-IFNULL(aa.back_num,0) as num,
mt.manage_type as manageType, mt.manage_type as manageType,
mtk.user_id,
CONCAT('NSJJ',mt.`code`,mt.model_code) as `code` CONCAT('NSJJ',mt.`code`,mt.model_code) as `code`
FROM FROM
back_apply_details bad back_apply_details bad
@ -676,6 +677,7 @@
LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id 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 mt on mt.type_id=bad.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id=mt.parent_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 ( LEFT JOIN (
SELECT SELECT
type_id as typeId, type_id as typeId,