Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt-general

kmall-admin/src/main/resources/mybatis/mapper/StoreTransferInventoryOrderDao.xml

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.kmall.admin.dao.StoreTransferInventoryOrderDao">
+
+    <resultMap type="com.kmall.admin.entity.StoreTransferInventoryOrderEntity" id="storeTransferInventoryOrderMap">
+        <result property="id" column="id"/>
+        <result property="merchSn" column="merch_sn"/>
+        <result property="merchName" column="merch_name"/>
+        <result property="inStoreSn" column="in_store_sn"/>
+        <result property="inStoreName" column="in_store_name"/>
+        <result property="outStoreSn" column="out_store_sn"/>
+        <result property="outStoreName" column="out_store_name"/>
+        <result property="status" column="status"/>
+        <result property="remark" column="remark"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createSn" column="create_sn"/>
+        <result property="modifyTime" column="modify_time"/>
+        <result property="modifySn" column="modify_sn"/>
+    </resultMap>
+
+	<select id="queryObject" resultType="com.kmall.admin.entity.StoreTransferInventoryOrderEntity">
+		select
+			`id`,
+			`merch_sn`,
+			`merch_name`,
+			`in_store_sn`,
+			`in_store_name`,
+			`out_store_sn`,
+			`out_store_name`,
+			`status`,
+			`remark`,
+			`create_time`,
+			`create_sn`,
+			`modify_time`,
+			`modify_sn`
+		from mall_store_transfer_inventory_order
+		where id = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.StoreTransferInventoryOrderEntity">
+		select
+    		`id`,
+    		`merch_sn`,
+    		`merch_name`,
+    		`in_store_sn`,
+    		`in_store_name`,
+    		`out_store_sn`,
+    		`out_store_name`,
+    		`status`,
+    		`remark`,
+    		`create_time`,
+    		`create_sn`,
+    		`modify_time`,
+    		`modify_sn`
+		from mall_store_transfer_inventory_order
+		WHERE 1=1
+		<if test="name != null and name.trim() != ''">
+			AND name LIKE concat('%',#{name},'%')
+		</if>
+        <choose>
+            <when test="sidx != null and sidx.trim() != ''">
+                order by ${sidx} ${order}
+            </when>
+			<otherwise>
+                order by id desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+	
+ 	<select id="queryTotal" resultType="int">
+		select count(*) from mall_store_transfer_inventory_order
+		WHERE 1=1
+        <if test="name != null and name.trim() != ''">
+            AND name LIKE concat('%',#{name},'%')
+        </if>
+	</select>
+	 
+	<insert id="save" parameterType="com.kmall.admin.entity.StoreTransferInventoryOrderEntity" useGeneratedKeys="true" keyProperty="id">
+		insert into mall_store_transfer_inventory_order(
+			`merch_sn`,
+			`merch_name`,
+			`in_store_sn`,
+			`in_store_name`,
+			`out_store_sn`,
+			`out_store_name`,
+			`status`,
+			`remark`,
+			`create_time`,
+			`create_sn`,
+			`modify_time`,
+			`modify_sn`)
+		values(
+			#{merchSn},
+			#{merchName},
+			#{inStoreSn},
+			#{inStoreName},
+			#{outStoreSn},
+			#{outStoreName},
+			#{status},
+			#{remark},
+			#{createTime},
+			#{createSn},
+			#{modifyTime},
+			#{modifySn})
+	</insert>
+	 
+	<update id="update" parameterType="com.kmall.admin.entity.StoreTransferInventoryOrderEntity">
+		update mall_store_transfer_inventory_order 
+		<set>
+			<if test="merchSn != null">`merch_sn` = #{merchSn}, </if>
+			<if test="merchName != null">`merch_name` = #{merchName}, </if>
+			<if test="inStoreSn != null">`in_store_sn` = #{inStoreSn}, </if>
+			<if test="inStoreName != null">`in_store_name` = #{inStoreName}, </if>
+			<if test="outStoreSn != null">`out_store_sn` = #{outStoreSn}, </if>
+			<if test="outStoreName != null">`out_store_name` = #{outStoreName}, </if>
+			<if test="status != null">`status` = #{status}, </if>
+			<if test="remark != null">`remark` = #{remark}, </if>
+			<if test="createTime != null">`create_time` = #{createTime}, </if>
+			<if test="createSn != null">`create_sn` = #{createSn}, </if>
+			<if test="modifyTime != null">`modify_time` = #{modifyTime}, </if>
+			<if test="modifySn != null">`modify_sn` = #{modifySn}</if>
+		</set>
+		where id = #{id}
+	</update>
+	
+	<delete id="delete">
+		delete from mall_store_transfer_inventory_order where id = #{value}
+	</delete>
+	
+	<delete id="deleteBatch">
+		delete from mall_store_transfer_inventory_order where id in 
+		<foreach item="id" collection="array" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</delete>
+
+</mapper>

kmall-admin/src/main/resources/mybatis/mapper/StoreTransferInventoryOrderDetailDao.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.kmall.admin.dao.StoreTransferInventoryOrderDetailDao">
+
+    <resultMap type="com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity" id="storeTransferInventoryOrderDetailMap">
+        <result property="id" column="id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="sku" column="sku"/>
+        <result property="num" column="num"/>
+        <result property="remark" column="remark"/>
+        <result property="createSn" column="create_sn"/>
+        <result property="modifyTime" column="modify_time"/>
+        <result property="modifySn" column="modify_sn"/>
+    </resultMap>
+
+	<select id="queryObject" resultType="com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity">
+		select
+			`id`,
+			`order_id`,
+			`sku`,
+			`num`,
+			`remark`,
+			`create_sn`,
+			`modify_time`,
+			`modify_sn`
+		from mall_store_transfer_inventory_order_detail
+		where id = #{id}
+	</select>
+
+	<select id="queryList" resultType="com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity">
+		select
+    		`id`,
+    		`order_id`,
+    		`sku`,
+    		`num`,
+    		`remark`,
+    		`create_sn`,
+    		`modify_time`,
+    		`modify_sn`
+		from mall_store_transfer_inventory_order_detail
+		WHERE 1=1
+		<if test="name != null and name.trim() != ''">
+			AND name LIKE concat('%',#{name},'%')
+		</if>
+        <choose>
+            <when test="sidx != null and sidx.trim() != ''">
+                order by ${sidx} ${order}
+            </when>
+			<otherwise>
+                order by id desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+	
+ 	<select id="queryTotal" resultType="int">
+		select count(*) from mall_store_transfer_inventory_order_detail
+		WHERE 1=1
+        <if test="name != null and name.trim() != ''">
+            AND name LIKE concat('%',#{name},'%')
+        </if>
+	</select>
+	 
+	<insert id="save" parameterType="com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity" useGeneratedKeys="true" keyProperty="id">
+		insert into mall_store_transfer_inventory_order_detail(
+			`order_id`,
+			`sku`,
+			`num`,
+			`remark`,
+			`create_sn`,
+			`modify_time`,
+			`modify_sn`)
+		values(
+			#{orderId},
+			#{sku},
+			#{num},
+			#{remark},
+			#{createSn},
+			#{modifyTime},
+			#{modifySn})
+	</insert>
+	 
+	<update id="update" parameterType="com.kmall.admin.entity.StoreTransferInventoryOrderDetailEntity">
+		update mall_store_transfer_inventory_order_detail 
+		<set>
+			<if test="orderId != null">`order_id` = #{orderId}, </if>
+			<if test="sku != null">`sku` = #{sku}, </if>
+			<if test="num != null">`num` = #{num}, </if>
+			<if test="remark != null">`remark` = #{remark}, </if>
+			<if test="createSn != null">`create_sn` = #{createSn}, </if>
+			<if test="modifyTime != null">`modify_time` = #{modifyTime}, </if>
+			<if test="modifySn != null">`modify_sn` = #{modifySn}</if>
+		</set>
+		where id = #{id}
+	</update>
+	
+	<delete id="delete">
+		delete from mall_store_transfer_inventory_order_detail where id = #{value}
+	</delete>
+	
+	<delete id="deleteBatch">
+		delete from mall_store_transfer_inventory_order_detail where id in 
+		<foreach item="id" collection="array" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</delete>
+
+</mapper>