Merge remote-tracking branch 'origin/master'

This commit is contained in:
jjLv 2024-11-14 16:39:47 +08:00
commit 0f4e023a24
1 changed files with 3 additions and 3 deletions

View File

@ -33,9 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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,
IFNULL(lad.pre_num,0) as preNum,
IFNULL(lad.audit_num,0) as auditNum,
IFNULL(lad.al_num,0) as alNum,
IFNULL(lad.pre_num,0) as pre_num,
IFNULL(lad.audit_num,0) as audit_num,
IFNULL(lad.al_num,0) as 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