zy-asrs.git - Gitblit

			@@ -44,6 +44,20 @@
			<result column="appe_user" property="appeUser" />
			<result column="appe_time" property="appeTime" />
			<result column="memo" property="memo" />


			<result column="i_no" property="iNo" />
			<result column="temp1" property="temp1" />
			<result column="temp2" property="temp2" />
			<result column="temp3" property="temp3" />
			<result column="pg_no" property="sPgNO" />
			<result column="pro_type" property="proType" />
			<result column="auto_id" property="autoId" />
			<result column="out_order_no" property="outOrderNo" />
			<result column="lu_hao" property="luHao" />
			<result column="ware_id" property="wareId" />
			<result column="ware_mame" property="wareName" />
			<result column="packing" property="packing" />
			</resultMap>

			<sql id="batchSeq">
			@@ -64,6 +78,14 @@
			and loc_no = #{locNo}
			and matnr = #{matnr}
			<include refid="batchSeq"></include>
			</select>

			<select id="selectItem2" resultMap="BaseResultMap">
			select top 1 *
			from asr_loc_detl
			where 1=1
			and loc_no = #{locNo}
			and matnr = #{matnr}
			</select>

			<delete id="deleteItem">
			@@ -94,6 +116,9 @@
			<if test="maktx!=null and maktx!='' ">
			and a.maktx like '%' + #{maktx} + '%'
			</if>
			<if test="model!=null and model!='' ">
			and a.model like '%' + #{model} + '%'
			</if>
			<if test="anfme!=null and anfme!='' ">
			and a.anfme like '%' + #{anfme} + '%'
			</if>
			@@ -108,6 +133,16 @@
			</if>
			<if test="specs!=null and specs!='' ">
			and a.specs like '%' + #{specs} + '%'
			</if>

			<if test="sPgNO!=null and sPgNO!='' ">
			and a.pg_no like '%' + #{sPgNO} + '%'
			</if>
			<if test="outOrderNo!=null and outOrderNo!='' ">
			and a.out_order_no like '%' + #{outOrderNo} + '%'
			</if>
			<if test="zpallet!=null and zpallet!='' ">
			and a.zpallet like '%' + #{zpallet} + '%'
			</if>
			</sql>

			@@ -208,25 +243,42 @@
			left join asr_loc_mast b on a.loc_no = b.loc_no
			where 1=1
			and b.loc_sts = 'F'
			and a.matnr = #{matnr}
			<!-- <choose>-->
			<!-- <when test="batch != null and batch != ''">-->
			<!-- and a.batch = #{batch}-->
			<!-- </when>-->
			<!-- <otherwise>-->
			<!-- and (a.batch IS NULL OR a.batch = '')-->
			<!-- </otherwise>-->
			<!-- </choose>-->

			<!-- <choose>-->
			<!-- <when test="batch != null and batch != ''">-->
			<!-- and a.batch = #{batch}-->
			<!-- </when>-->
			<!-- <otherwise>-->
			<!-- and (a.batch IS NULL OR a.batch = '')-->
			<!-- </otherwise>-->
			<!-- </choose>-->


			<if test="sPgNO != null and sPgNO != ''">
			and a.pg_no = #{sPgNO}
			</if>
			<if test="batch != null and batch != ''">
			and a.batch = #{batch}
			</if>
			<if test="orderNo != null and orderNo != ''">
			and a.order_no = #{orderNo}
			<!-- <choose>-->
			<!-- <when test="batch != null and batch != ''">-->
			<!-- and batch = #{batch}-->
			<!-- </when>-->
			<!-- <otherwise>-->
			<!-- and (batch IS NULL OR batch = '')-->
			<!-- </otherwise>-->
			<!-- </choose>-->
			<!-- <if test="orderNo != null and orderNo != ''">-->
			<!-- and a.order_no = #{orderNo}-->
			<!-- </if>-->
			<if test="matnr != null and matnr != ''">
			and a.matnr = #{matnr}
			and (a.pg_no is null or LEN(LTRIM(RTRIM(pg_no))) = 0)
			</if>

			<if test="locNos != null and locNos.size > 0">
			and b.loc_no not in
			<foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
			<foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
			#{item}
			</foreach>
			</if>
			@@ -416,7 +468,7 @@
			<id column="pgNo" property="pgNo" />
			<id column="outOrderNo" property="outOrderNo" />
			<id column="batch" property="batch" />

			<id column="model" property="model" />
			</resultMap>

			<select id="asrsAndErpList" resultMap="stockStatisDTO">
			@@ -427,22 +479,25 @@
			and asrsQty != erpQty
			</if>
			<if test="different != null and different == 0 ">
			and asrsQty = erpQty

			</if>
			<if test="matnr != null and matnr != ''">
			AND matnr like #{matnr}
			AND matnr like '%' + #{matnr}+ '%'
			</if>
			<if test="model != null and model != ''">
			AND model like '%' + #{model}+ '%'
			</if>
			<if test="maktx != null and maktx != ''">
			AND maktx like #{maktx}
			AND maktx like '%' + #{maktx}+ '%'
			</if>
			<if test="specs != null and specs != ''">
			AND specs like #{specs}
			AND specs like '%' + #{specs}+ '%'
			</if>
			<if test="sPgNO != null">
			AND pgNO like #{sPgNO}
			<if test="sPgNO != null and sPgNO != ''">
			AND pgNO like '%' + #{sPgNO} + '%'
			</if>
			<if test="outOrderNo != null">
			AND outOrderNo like #{outOrderNo}
			<if test="outOrderNo != null and outOrderNo != ''">
			AND outOrderNo like '%' + #{outOrderNo} + '%'
			</if>
			) d ) e WHERE 1=1 and e.row between ((#{pageNumber}-1)#{pageSize}+1) and (#{pageNumber}#{pageSize})
			</select>
			@@ -453,22 +508,25 @@
			and asrsQty != erpQty
			</if>
			<if test="different != null and different == 0 ">
			and asrsQty = erpQty

			</if>
			<if test="matnr != null">
			AND matnr like #{matnr}
			<if test="matnr != null and matnr != ''">
			AND matnr like '%' + #{matnr}+ '%'
			</if>
			<if test="maktx != null">
			AND maktx like #{maktx}
			<if test="model != null and model != ''">
			AND model like '%' + #{model}+ '%'
			</if>
			<if test="specs != null">
			AND specs like #{specs}
			<if test="maktx != null and maktx != ''">
			AND maktx like '%' + #{maktx}+ '%'
			</if>
			<if test="sPgNO != null">
			AND pgNO like #{sPgNO}
			<if test="specs != null and specs != ''">
			AND specs like '%' + #{specs}+ '%'
			</if>
			<if test="outOrderNo != null">
			AND outOrderNo like #{outOrderNo}
			<if test="sPgNO != null and sPgNO != ''">
			AND pgNO like '%' + #{sPgNO} + '%'
			</if>
			<if test="outOrderNo != null and outOrderNo != ''">
			AND outOrderNo like '%' + #{outOrderNo} + '%'
			</if>
			</select>
			</mapper>