From b5a63b29313463d1c2fd1b5678a2d6b2bb8a7044 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 18 八月 2023 19:33:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/resources/mappers/MaterialDistributeExtMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/server/src/main/resources/mappers/MaterialDistributeExtMapper.xml b/server/src/main/resources/mappers/MaterialDistributeExtMapper.xml
index 31c73ce..58d867a 100644
--- a/server/src/main/resources/mappers/MaterialDistributeExtMapper.xml
+++ b/server/src/main/resources/mappers/MaterialDistributeExtMapper.xml
@@ -717,7 +717,8 @@
mmodel.UNION_NAME as MMODEL_UNION_NAME,
mmodel.code as MMODEL_CODE,
umodel.name as UMODEL_NAME,
- umodel.ATTRIBUTE_DATA as UMODEL_ATTRIBUTE_DATA
+ umodel.ATTRIBUTE_DATA as UMODEL_ATTRIBUTE_DATA,
+ (select count(1) from bom b where a.id = b.MATERIAL_ID and b.`STATUS` = 1 and b.DELETED = 0 ) as hasBom
FROM `material_distribute` `a`
LEFT JOIN `material` `mmodel` ON a.MATERIAL_ID=mmodel.ID
--
Gitblit v1.9.3