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 | 91 ++++++++++++++++++++++-----------------------
1 files changed, 45 insertions(+), 46 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index a095b94..fdd1ebd
--- a/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml
@@ -3,8 +3,6 @@
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">
<id column="applyOrderId" property="applyOrderId"/>
<result column="description" property="description"/>
@@ -25,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,48 +59,51 @@
</foreach>
</insert>
-
<!-- 淇濆瓨閲囪喘鏄庣粏琛�-->
<insert id="savePurchaseApplyDetailInfo" parameterType="List">
- insert into purchase_apply_detail (id,apply_order_id,res_id,quantity,remark,b_id,operate,status_cd)
+ 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},
#{item.remark},
'-1',
'ADD',
- '0'
+ '0',
+ #{item.price},
+ #{item.purchaseQuantity},
+ #{item.purchaseRemark},
+ #{item.originalStock}
)
</foreach>
</insert>
-
<!-- 鏌ヨ閲囪喘鐢宠淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessPurchaseApplyInfo" parameterType="Map" resultType="Map">
select
- t.operate,
- t.res_order_type,
- t.res_order_type resOrderType,
- t.description,
- t.apply_order_id,
- t.apply_order_id applyOrderId,
- t.state,
- t.store_id,
- t.store_id storeId,
- t.user_name userName,
- t.b_id bId,
- t.b_id,
- t.user_id,
- t.user_id userId,
- t.status_cd statusCd,
- t.end_user_name,
- t.end_user_tel,
- t.end_user_name endUserName,
- t.end_user_tel endUserTel
+ t.operate,
+ t.res_order_type,
+ t.res_order_type resOrderType,
+ t.description,
+ t.apply_order_id,
+ t.apply_order_id applyOrderId,
+ t.state,
+ t.store_id,
+ t.store_id storeId,
+ t.user_name userName,
+ t.b_id bId,
+ t.b_id,
+ t.user_id,
+ t.user_id userId,
+ t.status_cd statusCd,
+ t.end_user_name,
+ t.end_user_tel,
+ t.end_user_name endUserName,
+ t.end_user_tel endUserTel
from business_purchase_apply t
where 1 =1
<if test="operate !=null and operate != ''">
@@ -134,7 +136,6 @@
<if test="endUserTel !=null and endUserTel != ''">
and t.end_user_tel= #{endUserTel}
</if>
-
</select>
<select id="getBusinessPurchaseApplyDetailInfo" parameterType="Map" resultType="Map">
@@ -156,7 +157,6 @@
and t.b_id= #{bId}
</if>
</select>
-
<!-- 淇濆瓨閲囪喘鐢宠淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="savePurchaseApplyInfoInstance" parameterType="Map">
@@ -187,9 +187,7 @@
<if test="userId !=null and userId != ''">
and t.user_id= #{userId}
</if>
-
</insert>
-
<!-- 鏌ヨ閲囪喘鐢宠淇℃伅 add by wuxw 2018-07-03 -->
<select id="getPurchaseApplyInfo" parameterType="Map" resultType="Map">
@@ -202,10 +200,13 @@
t.end_user_tel,
t.end_user_name endUserName,
t.end_user_tel endUserTel,
- t.description
+ t.description,
+ t.create_user_id createUserId,
+ t.create_user_name createUserName,
+ t.warehousing_way warehousingWay
from purchase_apply t
inner join t_dict d on t.state = d.status_cd and d.table_name = 'purchase_apply' and d.table_columns = 'state'
- where 1 =1
+ where 1 = 1
<if test="resOrderType !=null and resOrderType != ''">
and t.res_order_type= #{resOrderType}
</if>
@@ -244,14 +245,14 @@
<if test="endUserTel !=null and endUserTel != ''">
and t.end_user_tel= #{endUserTel}
</if>
-
+ <if test="userId !=null and userId != ''">
+ and t.user_id= #{userId}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<select id="getPurchaseApplyInfo2" parameterType="Map" resultMap="applyMap">
select
@@ -269,12 +270,10 @@
inner join t_dict d on t.state = d.status_cd and d.table_name = 'purchase_apply' and d.table_columns = 'state'
inner join purchase_apply_detail de on de.apply_order_id = t.apply_order_id
inner join resource_store rs on de.res_id = rs.res_id
-
where 1 =1
<if test="resOrderType !=null and resOrderType != ''">
and t.res_order_type= #{resOrderType}
</if>
-
<if test="applyOrderId !=null and applyOrderId != ''">
and t.apply_order_id= #{applyOrderId}
</if>
@@ -296,7 +295,6 @@
<if test="endUserTel !=null and endUserTel != ''">
and t.end_user_tel= #{endUserTel}
</if>
-
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -308,11 +306,14 @@
select
p.id,
p.apply_order_id applyOrderId,
- p.res_id resId,p.quantity,p.remark,
+ 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">
@@ -331,7 +332,6 @@
and p.operate= #{operate}
</if>
</select>
-
<!-- 淇敼閲囪喘鐢宠淇℃伅 add by wuxw 2018-07-03 -->
<update id="updatePurchaseApplyInfoInstance" parameterType="Map">
@@ -370,7 +370,6 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</update>
<!-- 鏌ヨ閲囪喘鐢宠鏁伴噺 add by wuxw 2018-07-03 -->
@@ -405,16 +404,16 @@
<if test="endUserTel !=null and endUserTel != ''">
and t.end_user_tel= #{endUserTel}
</if>
-
+ <if test="userId !=null and userId != ''">
+ and t.user_id= #{userId}
+ </if>
</select>
-
<!-- 淇濆瓨閲囪喘鐢宠淇℃伅 add by wuxw 2018-07-03 -->
<insert id="savePurchaseApply" parameterType="Map">
insert into purchase_apply
- (status_cd,res_order_type,description,apply_order_id,state,store_id,user_id,user_name,b_id,end_user_name,end_user_tel)
+ (status_cd,res_order_type,description,apply_order_id,state,store_id,user_id,user_name,b_id,end_user_name,end_user_tel,create_time,create_user_id,create_user_name,warehousing_way)
values
- ('0',#{resOrderType},#{description},#{applyOrderId},#{state},#{storeId},#{userId},#{userName},'-1',#{endUserName},#{endUserTel})
+ ('0',#{resOrderType},#{description},#{applyOrderId},#{state},#{storeId},#{userId},#{userName},'-1',#{endUserName},#{endUserTel},#{createTime},#{createUserId},#{createUserName},#{warehousingWay})
</insert>
-
</mapper>
--
Gitblit v1.8.0