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/AllocationStorehouseServiceDaoImplMapper.xml | 92 +++++++++++++++++++++++++++++++++------------
1 files changed, 67 insertions(+), 25 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/AllocationStorehouseServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/AllocationStorehouseServiceDaoImplMapper.xml
index 76ee231..5484672 100644
--- a/java110-db/src/main/resources/mapper/store/AllocationStorehouseServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/AllocationStorehouseServiceDaoImplMapper.xml
@@ -7,18 +7,17 @@
<!-- 淇濆瓨浠撳簱璋冩嫧淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessAllocationStorehouseInfo" parameterType="Map">
insert into business_allocation_storehouse(
- as_id,store_id,res_id,sh_id_z,res_name,start_user_id,operate,sh_id_a,start_user_name,state,b_id,stock,remark
+ as_id,store_id,res_id,sh_id_z,res_name,start_user_id,operate,sh_id_a,start_user_name,state,b_id,stock,original_stock,remark,apply_id
) values (
- #{asId},#{storeId},#{resId},#{shIdz},#{resName},#{startUserId},#{operate},#{shIda},#{startUserName},#{state},#{bId},#{stock},#{remark}
+ #{asId},#{storeId},#{resId},#{shIdz},#{resName},#{startUserId},#{operate},#{shIda},#{startUserName},#{state},#{bId},#{stock},#{originalStock},#{remark},#{applyId}
)
</insert>
-
<!-- 鏌ヨ浠撳簱璋冩嫧淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessAllocationStorehouseInfo" parameterType="Map" resultType="Map">
select t.as_id,t.as_id asId,t.store_id,t.store_id storeId,t.res_id,t.res_id resId,t.sh_id_z,t.sh_id_z
shIdz,t.res_name,t.res_name resName,t.start_user_id,t.start_user_id startUserId,t.operate,t.sh_id_a,t.sh_id_a
- shIda,t.start_user_name,t.start_user_name startUserName,t.state,t.b_id,t.b_id bId,t.stock,t.remark
+ shIda,t.start_user_name,t.start_user_name startUserName,t.state,t.b_id,t.b_id bId,t.stock,t.original_stock,t.original_stock originalStock,t.remark,t.apply_id,t.apply_id applyId
from business_allocation_storehouse t
where 1 =1
<if test="asId !=null and asId != ''">
@@ -57,16 +56,17 @@
<if test="stock !=null and stock != ''">
and t.stock= #{stock}
</if>
-
+ <if test="originalStock !=null and originalStock != ''">
+ and t.original_stock= #{originalStock}
+ </if>
</select>
-
<!-- 淇濆瓨浠撳簱璋冩嫧淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveAllocationStorehouseInfoInstance" parameterType="Map">
insert into allocation_storehouse(
- as_id,status_cd,store_id,res_id,sh_id_z,res_name,start_user_id,sh_id_a,start_user_name,state,b_id,stock,remark
+ as_id,status_cd,store_id,res_id,sh_id_z,res_name,start_user_id,sh_id_a,start_user_name,state,b_id,stock,original_stock,remark,apply_id
) select
- t.as_id,'0',t.store_id,t.res_id,t.sh_id_z,t.res_name,t.start_user_id,t.sh_id_a,t.start_user_name,t.state,t.b_id,t.stock,t.remark
+ t.as_id,'0',t.store_id,t.res_id,t.sh_id_z,t.res_name,t.start_user_id,t.sh_id_a,t.start_user_name,t.state,t.b_id,t.stock,t.original_stock,t.remark,t.apply_id
from business_allocation_storehouse t where 1=1
<if test="asId !=null and asId != ''">
and t.as_id= #{asId}
@@ -102,21 +102,28 @@
<if test="stock !=null and stock != ''">
and t.stock= #{stock}
</if>
-
+ <if test="originalStock !=null and originalStock != ''">
+ and t.original_stock= #{originalStock}
+ </if>
</insert>
-
<!-- 鏌ヨ浠撳簱璋冩嫧淇℃伅 add by wuxw 2018-07-03 -->
<select id="getAllocationStorehouseInfo" parameterType="Map" resultType="Map">
select t.as_id,t.as_id asId,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.res_id,t.res_id
resId,t.sh_id_z,t.sh_id_z shIdz,t.res_name,t.res_name resName,t.start_user_id,t.start_user_id
- startUserId,t.sh_id_a,t.sh_id_a shIda,t.start_user_name,t.start_user_name startUserName,t.state,t.b_id,t.b_id
- bId,t.stock,t.remark,t.create_time createTime,td.name stateName,a.sh_name shaName,z.sh_name shzName
+ startUserId,t.sh_id_a,t.sh_id_a shIda,t.start_user_name,t.start_user_name startUserName,asa.state,t.b_id,t.b_id
+ bId,t.stock,t.original_stock,t.original_stock originalStock,t.remark,t.create_time createTime,td.name stateName,a.sh_name shaName,z.sh_name shzName,
+ rs.res_code,rs.res_code resCode,t.apply_id,t.apply_id applyId,rst.name rstName,rss.spec_name specName
from allocation_storehouse t
- left join t_dict td on t.state = td.status_cd and td.table_name = 'allocation_storehouse' and td.table_columns = 'state'
+ left join allocation_storehouse_apply asa on asa.apply_id = t.apply_id and asa.status_cd = '0'
+ left join t_dict td on asa.state = td.status_cd and td.table_name = 'allocation_storehouse_apply' and td.table_columns =
+ 'state'
left join storehouse a on t.sh_id_a = a.sh_id and a.store_id = t.store_id and a.status_cd = '0'
left join storehouse z on t.sh_id_z = z.sh_id and z.store_id = t.store_id and z.status_cd = '0'
- where 1 =1
+ left join resource_store rs on t.res_id = rs.res_id and rs.status_cd = '0'
+ left join resource_store_type rst on rs.rst_id = rst.rst_id and rst.status_cd = '0'
+ left join resource_store_specification rss on rs.rss_id = rss.rss_id and rss.status_cd = '0'
+ where 1 = 1
<if test="asId !=null and asId != ''">
and t.as_id= #{asId}
</if>
@@ -129,6 +136,9 @@
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
+ <if test="applyId !=null and applyId != ''">
+ and t.apply_id= #{applyId}
+ </if>
<if test="storeId !=null and storeId != ''">
and t.store_id= #{storeId}
</if>
@@ -139,7 +149,7 @@
and t.sh_id_z= #{shIdz}
</if>
<if test="resName !=null and resName != ''">
- and t.res_name= #{resName}
+ and t.res_name like '%${resName}%'
</if>
<if test="startUserId !=null and startUserId != ''">
and t.start_user_id= #{startUserId}
@@ -151,7 +161,7 @@
and t.start_user_name= #{startUserName}
</if>
<if test="state !=null and state != ''">
- and t.state= #{state}
+ and asa.state= #{state}
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -159,13 +169,23 @@
<if test="stock !=null and stock != ''">
and t.stock= #{stock}
</if>
+ <if test="originalStock !=null and originalStock != ''">
+ and t.original_stock= #{originalStock}
+ </if>
+ <if test="resCode !=null and resCode != ''">
+ and rs.res_code= #{resCode}
+ </if>
+ <if test="rstId !=null and rstId != ''">
+ and rs.rst_id= #{rstId}
+ </if>
+ <if test="rssId !=null and rssId != ''">
+ and rs.rss_id= #{rssId}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼浠撳簱璋冩嫧淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateAllocationStorehouseInfoInstance" parameterType="Map">
@@ -200,6 +220,9 @@
<if test="stock !=null and stock != ''">
, t.stock= #{stock}
</if>
+ <if test="originalStock !=null and originalStock != ''">
+ and t.original_stock= #{originalStock}
+ </if>
where 1=1
<if test="asId !=null and asId != ''">
and t.as_id= #{asId}
@@ -207,14 +230,21 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</update>
<!-- 鏌ヨ浠撳簱璋冩嫧鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryAllocationStorehousesCount" parameterType="Map" resultType="Map">
select count(1) count
from allocation_storehouse t
- where 1 =1
+ left join allocation_storehouse_apply asa on asa.apply_id = t.apply_id and asa.status_cd = '0'
+ left join t_dict td on t.state = td.status_cd and td.table_name = 'allocation_storehouse_apply' and td.table_columns =
+ 'state'
+ left join storehouse a on t.sh_id_a = a.sh_id and a.store_id = t.store_id and a.status_cd = '0'
+ left join storehouse z on t.sh_id_z = z.sh_id and z.store_id = t.store_id and z.status_cd = '0'
+ left join resource_store rs on t.res_id = rs.res_id and rs.status_cd = '0'
+ left join resource_store_type rst on rs.rst_id = rst.rst_id and rst.status_cd = '0'
+ left join resource_store_specification rss on rs.rss_id = rss.rss_id and rss.status_cd = '0'
+ where 1 = 1
<if test="asId !=null and asId != ''">
and t.as_id= #{asId}
</if>
@@ -227,6 +257,9 @@
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
</if>
+ <if test="applyId !=null and applyId != ''">
+ and t.apply_id= #{applyId}
+ </if>
<if test="storeId !=null and storeId != ''">
and t.store_id= #{storeId}
</if>
@@ -237,7 +270,7 @@
and t.sh_id_z= #{shIdz}
</if>
<if test="resName !=null and resName != ''">
- and t.res_name= #{resName}
+ and t.res_name like '%${resName}%'
</if>
<if test="startUserId !=null and startUserId != ''">
and t.start_user_id= #{startUserId}
@@ -249,7 +282,7 @@
and t.start_user_name= #{startUserName}
</if>
<if test="state !=null and state != ''">
- and t.state= #{state}
+ and asa.state= #{state}
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -257,8 +290,17 @@
<if test="stock !=null and stock != ''">
and t.stock= #{stock}
</if>
-
-
+ <if test="originalStock !=null and originalStock != ''">
+ and t.original_stock= #{originalStock}
+ </if>
+ <if test="resCode !=null and resCode != ''">
+ and rs.res_code= #{resCode}
+ </if>
+ <if test="rstId !=null and rstId != ''">
+ and rs.rst_id= #{rstId}
+ </if>
+ <if test="rssId !=null and rssId != ''">
+ and rs.rss_id= #{rssId}
+ </if>
</select>
-
</mapper>
--
Gitblit v1.8.0