From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3

---
 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