From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
index 5d4c0e9..44447f3 100755
--- a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
@@ -326,9 +326,14 @@
p.res_id resId,p.quantity,p.remark,p.purchase_quantity purchaseQuantity,p.purchase_remark purchaseRemark,p.price
purchasePrice,p.original_stock originalStock,
r.res_name resName,r.res_code resCode,
- r.price,r.price standardPrice,r.stock,rst.name rstName,rss.spec_name specName,rs.supplier_name supplierName
+ r.price,r.price standardPrice,r.stock,rst.name rstName,rss.spec_name specName,rs.supplier_name supplierName,
+ td1.name unitCodeName,
+ td2.name miniUnitCodeName
from
- purchase_apply_detail p inner join resource_store r on p.res_id = r.res_id and r.status_cd = '0'
+ purchase_apply_detail p
+ inner join resource_store r on p.res_id = r.res_id and r.status_cd = '0'
+ left join t_dict td1 on r.unit_code = td1.status_cd and td1.table_name = 'resource_store' and td1.table_columns = 'unit_code'
+ left join t_dict td2 on r.mini_unit_code = td2.status_cd and td2.table_name = 'resource_store' and td2.table_columns = 'unit_code'
LEFT JOIN resource_supplier rs on p.rs_id=rs.rs_id
LEFT JOIN resource_store_type rst on r.rst_id=rst.rst_id
LEFT JOIN resource_store_specification rss on r.rss_id=rss.rss_id
--
Gitblit v1.8.0