Lianxun_Java.git

			@@ -7,9 +7,9 @@
			<!-- 保存仓库调拨信息 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,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},#{remark},#{applyId}
			)
			</insert>

			@@ -17,7 +17,7 @@
			<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.remark,t.apply_id,t.apply_id applyId
			from business_allocation_storehouse t
			where 1 =1
			<if test="asId !=null and asId != ''">
			@@ -61,9 +61,9 @@
			<!-- 保存仓库调拨信息至 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,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.remark,t.apply_id
			from business_allocation_storehouse t where 1=1
			<if test="asId !=null and asId != ''">
			and t.as_id= #{asId}
			@@ -106,12 +106,15 @@
			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
			bId,t.stock,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
			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 t_dict td on t.state = td.status_cd and td.table_name = 'allocation_storehouse' 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'
			where 1 = 1
			<if test="asId !=null and asId != ''">
			and t.as_id= #{asId}
			</if>
			@@ -124,6 +127,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>
			@@ -134,7 +140,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}
			@@ -153,6 +159,9 @@
			</if>
			<if test="stock !=null and stock != ''">
			and t.stock= #{stock}
			</if>
			<if test="resCode !=null and resCode != ''">
			and rs.res_code= #{resCode}
			</if>
			order by t.create_time desc
			<if test="page != -1 and page != null ">
			@@ -206,7 +215,12 @@
			<select id="queryAllocationStorehousesCount" parameterType="Map" resultType="Map">
			select count(1) count
			from allocation_storehouse t
			where 1 =1
			left join t_dict td on t.state = td.status_cd and td.table_name = 'allocation_storehouse' 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'
			where 1 = 1
			<if test="asId !=null and asId != ''">
			and t.as_id= #{asId}
			</if>
			@@ -219,6 +233,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>
			@@ -229,7 +246,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,6 +266,8 @@
			<if test="stock !=null and stock != ''">
			and t.stock= #{stock}
			</if>
			<if test="resCode !=null and resCode != ''">
			and rs.res_code= #{resCode}
			</if>
			</select>

			</mapper>