From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
index f59a7d1..c5932c9 100755
--- a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="purchaseApplyServiceDaoImpl">
- <resultMap type="com.java110.dto.purchaseApply.PurchaseApplyDto" id="applyMap">
+ <resultMap type="com.java110.dto.purchase.PurchaseApplyDto" id="applyMap">
<id column="applyOrderId" property="applyOrderId"/>
<result column="description" property="description"/>
<result column="resOrderType" property="resOrderType"/>
@@ -63,7 +63,7 @@
<!-- 淇濆瓨閲囪喘鏄庣粏琛�-->
<insert id="savePurchaseApplyDetailInfo" parameterType="List">
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)
+ (id,rs_id,apply_order_id,res_id,quantity,remark,b_id,operate,status_cd,price,purchase_quantity,purchase_remark,original_stock,times_id,consult_price)
values
<foreach collection="list" item="item" index="index" separator=",">
(
@@ -79,7 +79,9 @@
#{item.price},
#{item.purchaseQuantity},
#{item.purchaseRemark},
- #{item.originalStock}
+ #{item.originalStock},
+ #{item.timesId},
+ #{item.consultPrice}
)
</foreach>
</insert>
@@ -324,9 +326,9 @@
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.original_stock originalStock,
+ purchasePrice,p.original_stock originalStock,p.consult_price consultPrice,p.times_id timesId,
r.res_name resName,r.res_code resCode,
- r.price,r.price standardPrice,r.stock,rst.name rstName,rst1.name parentRstName,rss.spec_name specName,rs.supplier_name supplierName,
+ r.price,r.price standardPrice,rstime.stock,rst.name rstName,rst1.name parentRstName,rss.spec_name specName,rs.supplier_name supplierName,
td1.name unitCodeName,
td2.name miniUnitCodeName
from
@@ -338,6 +340,7 @@
LEFT JOIN resource_store_type rst on r.rst_id=rst.rst_id
LEFT JOIN resource_store_type rst1 on r.parent_rst_id=rst1.rst_id
LEFT JOIN resource_store_specification rss on r.rss_id=rss.rss_id
+ left join resource_store_times rstime on p.times_id = rstime.times_id and rstime.status_cd = '0'
where 1=1
and p.status_cd = '0'
<if test="applyOrderIds !=null">
--
Gitblit v1.8.0