库区+货位

highway
A0010407 1 year ago
parent 420dba1ecf
commit 8e6c8bcfa2

@ -202,6 +202,17 @@ public class BaseLocation extends BaseEntity {
@Excel(name = "工厂") @Excel(name = "工厂")
private String factoryCode; private String factoryCode;
/** 删除标志 */
@Excel(name = "删除标志")
private String delFlag;
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
/** $column.columnComment */ /** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String syntozk; private String syntozk;
@ -599,6 +610,7 @@ public class BaseLocation extends BaseEntity {
.append("remark", getRemark()) .append("remark", getRemark())
.append("factoryCode", getFactoryCode()) .append("factoryCode", getFactoryCode())
.append("syntozk", getSyntozk()) .append("syntozk", getSyntozk())
.append("delFlag", getDelFlag())
.toString(); .toString();
} }
} }

@ -36,7 +36,7 @@
<result property="activeFlag" column="active_flag" /> <result property="activeFlag" column="active_flag" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="factoryCode" column="factory_code" /> <result property="factoryCode" column="factory_code" />
<result property="delFlag" column="delFlag" /> <result property="delFlag" column="del_flag" />
</resultMap> </resultMap>
<sql id="selectBaseAreaVo"> <sql id="selectBaseAreaVo">

@ -58,10 +58,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="factoryCode" column="factory_code" /> <result property="factoryCode" column="factory_code" />
<result property="syntozk" column="syntozk" /> <result property="syntozk" column="syntozk" />
<result property="delFlag" column="del_flag" />
</resultMap> </resultMap>
<sql id="selectBaseLocationVo"> <sql id="selectBaseLocationVo">
select location_id, location_code, shelf_order, check_order, pick_order, location_use, pick_flag, is_open_kn_flag, location_type, location_scrap_type, location_attr, turn_demand, stock_env, warehouse_code, region_code, area_code, check_code, work_area, port1, port2, port3, volume_limit, weight_limit, box_limit, qty_limit, pallet_limit, length, width, height, x_coordinate, y_coordinate, z_coordinate, x_pixels, y_pixels, z_pixels, loc_row, layer_num, loc_column, bord, product_mix, batch_mix, ignore_id, active_flag, user_defined1, user_defined2, user_defined3, create_by, create_time, update_by, update_time, remark, factory_code, syntozk from base_location select location_id, location_code, shelf_order, check_order, pick_order, location_use, pick_flag, is_open_kn_flag, location_type, location_scrap_type, location_attr, turn_demand, stock_env, warehouse_code, region_code, area_code, check_code, work_area, port1, port2, port3, volume_limit, weight_limit, box_limit, qty_limit, pallet_limit, length, width, height, x_coordinate, y_coordinate, z_coordinate, x_pixels, y_pixels, z_pixels, loc_row, layer_num, loc_column, bord, product_mix, batch_mix, ignore_id, active_flag, user_defined1, user_defined2, user_defined3, create_by, create_time, update_by, update_time, remark, factory_code, syntozk,del_flag from base_location
</sql> </sql>
<select id="selectBaseLocationList" parameterType="BaseLocation" resultMap="BaseLocationResult"> <select id="selectBaseLocationList" parameterType="BaseLocation" resultMap="BaseLocationResult">
@ -114,12 +115,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userDefined3 != null and userDefined3 != ''"> and user_defined3 = #{userDefined3}</if> <if test="userDefined3 != null and userDefined3 != ''"> and user_defined3 = #{userDefined3}</if>
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if> <if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
<if test="syntozk != null and syntozk != ''"> and syntozk = #{syntozk}</if> <if test="syntozk != null and syntozk != ''"> and syntozk = #{syntozk}</if>
and del_flag = '0'
</where> </where>
</select> </select>
<select id="selectBaseLocationByLocationId" parameterType="String" resultMap="BaseLocationResult"> <select id="selectBaseLocationByLocationId" parameterType="String" resultMap="BaseLocationResult">
<include refid="selectBaseLocationVo"/> <include refid="selectBaseLocationVo"/>
where location_id = #{locationId} where location_id = #{locationId}
and del_flag = '0'
</select> </select>
<insert id="insertBaseLocation" parameterType="BaseLocation"> <insert id="insertBaseLocation" parameterType="BaseLocation">
@ -295,21 +298,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where location_id = #{locationId} where location_id = #{locationId}
</update> </update>
<delete id="deleteBaseLocationByLocationId" parameterType="String"> <update id="deleteBaseLocationByLocationId" parameterType="String">
delete from base_location where location_id = #{locationId} update base_location
</delete> set del_flag = '1'
where location_id = #{locationId}
</update>
<delete id="deleteBaseLocationByLocationIds" parameterType="String"> <update id="deleteBaseLocationByLocationIds" parameterType="String">
delete from base_location where location_id in update base_location
set del_flag = '1'
where location_id in
<foreach item="locationId" collection="array" open="(" separator="," close=")"> <foreach item="locationId" collection="array" open="(" separator="," close=")">
#{locationId} #{locationId}
</foreach> </foreach>
</delete> </update>
<select id="checkCodeUnique" parameterType="BaseLocation" resultType ="java.lang.String"> <select id="checkCodeUnique" parameterType="BaseLocation" resultType ="java.lang.String">
select location_code select location_code
from base_location from base_location
where location_code = #{locationCode} where location_code = #{locationCode}
and del_flag = '0'
</select> </select>
</mapper> </mapper>
Loading…
Cancel
Save