From 4d4805096b898a6e99f31794facb81794bd1fcf7 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 09:39:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0
---
zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardAssembleDao.xml | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardAssembleDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardAssembleDao.xml
index 213bd3a..62d7d53 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardAssembleDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardAssembleDao.xml
@@ -224,4 +224,24 @@
card_id
from money_card_assemble where card_id=#{cardId}
</select>
+
+ <select id="selectCardRelationGoods" resultType="com.matrix.system.app.vo.ShoppingGoodsDetailVo">
+ select
+ b.name goodsName,
+ b.measure measure,
+ b.volume volume
+ from money_card_assemble a
+ inner join shopping_goods b on a.goods_id=b.id
+ where a.card_id=#{cardId}
+ </select>
+
+ <select id="selectCardRelationCategory" resultType="com.matrix.system.hive.bean.ShoppingGoodsCategory">
+ select
+ a.id id,
+ a.name name,
+ a.parent_id parentId
+ from shopping_goods_category a
+ inner join money_card_assemble b on a.id=b.cate_id
+ where b.card_id=#{cardId};
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1