From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
index 2afc548..fdd1ebd 100755
--- a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
@@ -23,6 +23,7 @@
<id property="id" column="id"/>
<result property="applyOrderId" column="applyOrderId"/>
<result property="resId" column="resId"/>
+ <result column="rsId" property="rsId"/>
<result property="quantity" column="quantity"/>
<result property="resName" column="resName"/>
<result property="remark" column="remark"/>
@@ -60,11 +61,12 @@
<!-- 淇濆瓨閲囪喘鏄庣粏琛�-->
<insert id="savePurchaseApplyDetailInfo" parameterType="List">
- insert into purchase_apply_detail (id,apply_order_id,res_id,quantity,remark,b_id,operate,status_cd,price,purchase_quantity,purchase_remark)
+ insert into purchase_apply_detail (id,rs_id,apply_order_id,res_id,quantity,remark,b_id,operate,status_cd,price,purchase_quantity,purchase_remark,original_stock)
values
<foreach collection="list" item="item" index="index" separator=",">
(
#{item.id},
+ #{item.rsId},
#{item.applyOrderId},
#{item.resId},
#{item.quantity},
@@ -74,7 +76,8 @@
'0',
#{item.price},
#{item.purchaseQuantity},
- #{item.purchaseRemark}
+ #{item.purchaseRemark},
+ #{item.originalStock}
)
</foreach>
</insert>
@@ -303,11 +306,14 @@
select
p.id,
p.apply_order_id applyOrderId,
- p.res_id resId,p.quantity,p.remark,p.purchase_quantity purchaseQuantity,p.purchase_remark purchaseRemark,p.price purchasePrice,
+ 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.stock
+ r.price,r.price standardPrice,r.stock,rst.name rstName,rss.spec_name specName,rs.supplier_name supplierName
from
purchase_apply_detail p inner join resource_store r on p.res_id = r.res_id and r.status_cd = '0'
+ 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
where 1=1
and p.status_cd = '0'
<if test="applyOrderIds !=null">
--
Gitblit v1.8.0