zy-asrs.git - Gitblit

			@@ -386,7 +386,15 @@
			from asr_loc_detl_merge a
			left join asr_loc_mast_man_node_merge b on a.loc_no = b.loc_no
			where 1=1
			and a.loc_no = #{locNo}
			<if test="locNo != null and locNo !=''">
			and a.loc_no = #{locNo}
			</if>
			<if test="zpallet != null and zpallet !=''">
			and a.zpallet = #{zpallet}
			</if>
			<if test="matnr != null and matnr !='' and matnr !='null'">
			and a.matnr = #{matnr}
			</if>
			</select>
			<select id="queryStockViewMergeCount" resultType="java.lang.Integer">
			select count(1) from asr_loc_mast_man_node_merge
			@@ -443,7 +451,7 @@
			</choose>

			order by
			a.price,a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
			a.price asc,a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
			desc,
			NEWID(),
			case
			@@ -506,10 +514,10 @@
			<if test="matnr != null and matnr !='' ">
			and t.matnr like '%' + #{matnr} + '%'
			</if>
			<if test="owner != null and owner !='' ">
			and t.owner like '%' + #{owner} + '%'
			<if test="owner != null">
			and t.owner = #{owner}
			</if>
			<if test="payment != null and payment !='' ">
			<if test="payment != null">
			and t.payment = #{payment}
			</if>

			@@ -540,6 +548,7 @@
			SELECT * FROM asr_loc_detl_all
			) t
			WHERE 1=1

			<include refid="selectAllSql"></include>
			) a
			WHERE a.row BETWEEN ((#{pageNumber}-1)#{pageSize}+1) and (#{pageNumber}#{pageSize})
			@@ -624,7 +633,7 @@
			</choose>

			order by
			a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
			a.price desc,a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
			desc,
			NEWID(),
			case