班次+客户+工厂+仓库

op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamT.java

@@ -117,6 +117,17 @@ public class BaseTeamT extends BaseEntity {
 
 	private List<String> rightData;
 
+	/** 删除标志 */
+	@Excel(name = "删除标志")
+	private String delFlag;
+
+	public void setDelFlag(String delFlag) {
+		this.delFlag = delFlag;
+	}
+	public String getDelFlag() {
+		return delFlag;
+	}
+
 	public void setRightData(List<String> rightData) {
 		this.rightData = rightData;
 	}
@@ -334,7 +345,8 @@ public class BaseTeamT extends BaseEntity {
 			.append("teamProperties", getTeamProperties())
 			.append("attendanceQuantity", getAttendanceQuantity())
 			.append("assignedQuantity", getAssignedQuantity())
-				.append("teamType", getTeamType())
+			.append("teamType", getTeamType())
+			.append("delFlag", getDelFlag())
 			.toString();
 	}
 }

op-modules/op-wms/src/main/java/com/op/wms/domain/BaseWarehouse.java

@@ -69,6 +69,17 @@ public class BaseWarehouse extends BaseEntity {
 	@Excel(name = "仓库类型")
 	private String warehouseType2;
 
+	/** 删除标志 */
+	@Excel(name = "删除标志")
+	private String delFlag;
+
+	public void setDelFlag(String delFlag) {
+		this.delFlag = delFlag;
+	}
+	public String getDelFlag() {
+		return delFlag;
+	}
+
 	public void setWarehouseId(String warehouseId) {
 		this.warehouseId = warehouseId;
 	}
@@ -190,6 +201,7 @@ public class BaseWarehouse extends BaseEntity {
 			.append("remark", getRemark())
 			.append("lineFlag", getLineFlag())
 			.append("warehouseType2", getWarehouseType2())
+			.append("delFlag", getDelFlag())
 			.toString();
 	}
 }

op-modules/op-wms/src/main/java/com/op/wms/domain/SysCustomer.java

@@ -109,6 +109,17 @@ public class SysCustomer extends BaseEntity {
 	@Excel(name = "预留字段4")
 	private Long attr4;
 
+	/** 删除标志 */
+	@Excel(name = "删除标志")
+	private String delFlag;
+
+	public void setDelFlag(String delFlag) {
+		this.delFlag = delFlag;
+	}
+	public String getDelFlag() {
+		return delFlag;
+	}
+
 	public void setClientId(String clientId) {
 		this.clientId = clientId;
 	}
@@ -310,6 +321,7 @@ public class SysCustomer extends BaseEntity {
 			.append("createTime", getCreateTime())
 			.append("updateBy", getUpdateBy())
 			.append("updateTime", getUpdateTime())
+			.append("delFlag", getDelFlag())
 			.toString();
 	}
 }

op-modules/op-wms/src/main/java/com/op/wms/domain/SysFactory.java

@@ -40,7 +40,7 @@ public class SysFactory extends TreeEntity {
 	@Excel(name = "工厂状态")
 	private String status;
 
-	/** 删除标志（0代表存在 */
+	/** 删除标志（1代表存在 */
 	private String delFlag;
 
 	/** 工厂编码 */
@@ -150,8 +150,8 @@ public class SysFactory extends TreeEntity {
 			.append("updateBy", getUpdateBy())
 			.append("updateTime", getUpdateTime())
 			.append("factoryCode", getFactoryCode())
-				.append("value", getValue())
+			.append("value", getValue())
-				.append("label", getLabel())
+			.append("label", getLabel())
 			.toString();
 	}
 }

op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamTMapper.xml

@@ -30,10 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="attendanceQuantity"	column="attendance_quantity"	/>
 		<result property="assignedQuantity"	column="assigned_quantity"	/>
 		<result property="teamType"	column="team_type"	/>
+		<result property="delFlag"	column="del_flag"	/>
 	</resultMap>
 
 	<sql id="selectBaseTeamTVo">
-		select Team_Id, ORG_Id, Team_Code, Team_Desc, Team_Desc_Global, Team_Desc_Extended, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code, Site_Id, Site_Code, production_line_code, team_leader_code, team_leader_name,plan_post_quantity, actual_post_quantity, salary_type, team_properties, attendance_quantity, assigned_quantity ,team_type from base_team_t
+		select Team_Id, ORG_Id, Team_Code, Team_Desc, Team_Desc_Global, Team_Desc_Extended, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code, Site_Id, Site_Code, production_line_code, team_leader_code, team_leader_name,plan_post_quantity, actual_post_quantity, salary_type, team_properties, attendance_quantity, assigned_quantity ,team_type,del_flag from base_team_t
 	</sql>
 
 	<select id="selectBaseTeamTList" parameterType="BaseTeamT" resultMap="BaseTeamTResult">
@@ -63,12 +64,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="attendanceQuantity != null "> and attendance_quantity = #{attendanceQuantity}</if>
 			<if test="assignedQuantity != null "> and assigned_quantity = #{assignedQuantity}</if>
 			<if test="teamType != null "> and team_type = #{teamType}</if>
+			and del_flag = '0'
 		</where>
 	</select>
 	
 	<select id="selectBaseTeamTByTeamId" parameterType="String" resultMap="BaseTeamTResult">
 		<include refid="selectBaseTeamTVo"/>
 		where Team_Id = #{teamId}
+		and del_flag = '0'
 	</select>
 		
 	<insert id="insertBaseTeamT" parameterType="BaseTeamT">
@@ -160,33 +163,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where Team_Id = #{teamId}
 	</update>
 
-	<delete id="deleteBaseTeamTByTeamId" parameterType="String">
+	<update id="deleteBaseTeamTByTeamId" parameterType="String">
-		delete from base_team_t where Team_Id = #{teamId}
+		update base_team_t
-	</delete>
+		set del_flag = '1'
+		where Team_Id = #{teamId}
+	</update>
 
-	<delete id="deleteBaseTeamTByTeamIds" parameterType="String">
+	<update id="deleteBaseTeamTByTeamIds" parameterType="String">
-		delete from base_team_t where Team_Id in 
+		update base_team_t
+		set del_flag = '1'
+		where Team_Id in
 		<foreach item="teamId" collection="array" open="(" separator="," close=")">
 			#{teamId}
 		</foreach>
-	</delete>
+	</update>
 
 	<select id="checkTeamCodeUnique" parameterType="BaseTeamT" resultType ="java.lang.String">
 		select Team_Code
 		from base_team_t
 		where Team_Code = #{teamCode}
+		and del_flag = '0'
 	</select>
 
 	<select id="checkTeamDescUnique" parameterType="BaseTeamT" resultType ="java.lang.String">
 		select Team_Desc
 		from base_team_t
 		where Team_Desc = #{teamDesc}
+		and del_flag = '0'
 	</select>
 
 	<select id="getBaseTeamTByCode" parameterType="BaseTeamT" resultType ="java.lang.String">
 		select Team_Id
 		from base_team_t
 		where Team_Code = #{teamCode}
+		and del_flag = '0'
 	</select>
 
 </mapper>

op-modules/op-wms/src/main/resources/mapper/wms/BaseWarehouseMapper.xml

@@ -24,10 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="remark"	column="remark"	/>
 		<result property="lineFlag"	column="line_flag"	/>
 		<result property="warehouseType2"	column="warehouse_type2"	/>
+		<result property="delFlag"	column="del_flag"	/>
 	</resultMap>
 
 	<sql id="selectBaseWarehouseVo">
-		select warehouse_id, warehouse_type, warehouse_code, warehouse_name, factory_code, factory_name, data_source, schame, active_flag, user_defined1, user_defined2, user_defined3, create_by, create_time, update_by, update_time, remark, line_flag, warehouse_type2 from base_warehouse
+		select warehouse_id, warehouse_type, warehouse_code, warehouse_name, factory_code, factory_name, data_source, schame, active_flag, user_defined1, user_defined2, user_defined3, create_by, create_time, update_by, update_time, remark, line_flag, warehouse_type2 ,del_flag from base_warehouse
 	</sql>
 
 	<select id="selectBaseWarehouseList" parameterType="BaseWarehouse" resultMap="BaseWarehouseResult">
@@ -46,12 +47,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="userDefined3 != null  and userDefined3 != ''"> and user_defined3 = #{userDefined3}</if>
 			<if test="lineFlag != null  and lineFlag != ''"> and line_flag = #{lineFlag}</if>
 			<if test="warehouseType2 != null  and warehouseType2 != ''"> and warehouse_type2 = #{warehouseType2}</if>
+			and del_flag = '0'
 		</where>
 	</select>
 	
 	<select id="selectBaseWarehouseByWarehouseId" parameterType="String" resultMap="BaseWarehouseResult">
 		<include refid="selectBaseWarehouseVo"/>
 		where warehouse_id = #{warehouseId}
+		and del_flag = '0'
 	</select>
 		
 	<insert id="insertBaseWarehouse" parameterType="BaseWarehouse">
@@ -125,32 +128,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where warehouse_id = #{warehouseId}
 	</update>
 
-	<delete id="deleteBaseWarehouseByWarehouseId" parameterType="String">
+	<update id="deleteBaseWarehouseByWarehouseId" parameterType="String">
-		delete from base_warehouse where warehouse_id = #{warehouseId}
+		update base_warehouse
-	</delete>
+		set del_flag = '1'
+		where warehouse_id = #{warehouseId}
+	</update>
 
-	<delete id="deleteBaseWarehouseByWarehouseIds" parameterType="String">
+	<update id="deleteBaseWarehouseByWarehouseIds" parameterType="String">
-		delete from base_warehouse where warehouse_id in 
+		update base_warehouse
+		set del_flag = '1'
+		where warehouse_id in
 		<foreach item="warehouseId" collection="array" open="(" separator="," close=")">
 			#{warehouseId}
 		</foreach>
-	</delete>
+	</update>
 
 	<select id="queryCount" parameterType="BaseWarehouse" resultType="java.lang.Integer">
 		select count(*)
 		from base_warehouse
+		and del_flag = '0'
 	</select>
 
 	<select id="checkWarehouseNameUnique" parameterType="BaseWarehouse" resultType ="java.lang.String">
 		select warehouse_name
 		from base_warehouse
 		where warehouse_name = #{warehouseName}
+		and del_flag = '0'
 	</select>
 
 	<select id="checkWarehouseCodeUnique" parameterType="BaseWarehouse" resultType ="java.lang.String">
 		select warehouse_code
 		from base_warehouse
 		where warehouse_code = #{warehouseCode}
+		and del_flag = '0'
 	</select>
 
 </mapper>

op-modules/op-wms/src/main/resources/mapper/wms/SysCustomerMapper.xml

@@ -34,10 +34,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="createTime"	column="create_time"	/>
 		<result property="updateBy"	column="update_by"	/>
 		<result property="updateTime"	column="update_time"	/>
+		<result property="delFlag"	column="del_flag"	/>
 	</resultMap>
 
 	<sql id="selectSysCustomerVo">
-		select client_id, client_code, client_name, client_nick, client_en, client_des, client_logo, client_type, address, website, email, tel, contact1, contact1_tel, contact1_email, contact2, contact2_tel, contact2_email, credit_code, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from sys_customer
+		select client_id, client_code, client_name, client_nick, client_en, client_des, client_logo, client_type, address, website, email, tel, contact1, contact1_tel, contact1_email, contact2, contact2_tel, contact2_email, credit_code, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time ,del_flag from sys_customer
 	</sql>
 
 	<select id="selectSysCustomerList" parameterType="SysCustomer" resultMap="SysCustomerResult">
@@ -67,12 +68,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="attr2 != null  and attr2 != ''"> and attr2 = #{attr2}</if>
 			<if test="attr3 != null "> and attr3 = #{attr3}</if>
 			<if test="attr4 != null "> and attr4 = #{attr4}</if>
+			and del_flag = '0'
 		</where>
 	</select>
 	
 	<select id="selectSysCustomerByClientId" parameterType="java.lang.String" resultMap="SysCustomerResult">
 		<include refid="selectSysCustomerVo"/>
 		where client_id = #{clientId}
+		and del_flag = '0'
 	</select>
 		
 	<insert id="insertSysCustomer" parameterType="SysCustomer" useGeneratedKeys="true" keyProperty="clientId">
@@ -176,27 +179,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where client_id = #{clientId}
 	</update>
 
-	<delete id="deleteSysCustomerByClientId" parameterType="java.lang.String">
+	<update id="deleteSysCustomerByClientId" parameterType="java.lang.String">
-		delete from sys_customer where client_id = #{clientId}
+		update sys_customer
-	</delete>
+		set del_flag = '1'
+		where client_id = #{clientId}
+	</update>
 
-	<delete id="deleteSysCustomerByClientIds" parameterType="String">
+	<update id="deleteSysCustomerByClientIds" parameterType="String">
-		delete from sys_customer where client_id in 
+		update sys_customer
+		set del_flag = '1'
+		where client_id in
 		<foreach item="clientId" collection="array" open="(" separator="," close=")">
 			#{clientId}
 		</foreach>
-	</delete>
+	</update>
 
 	<select id="checkClientCodeUnique" parameterType="SysCustomer" resultType ="java.lang.String">
 		select client_code
 		from sys_customer
 		where client_code = #{clientCode}
+		and del_flag = '0'
 	</select>
 
 	<select id="checkClientNameUnique" parameterType="SysCustomer" resultType ="java.lang.String">
 		select client_code
 		from sys_customer
 		where client_name = #{clientName}
+		and del_flag = '0'
 	</select>
 
 </mapper>

op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml

@@ -20,10 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"	column="update_by"	/>
 		<result property="updateTime"	column="update_time"	/>
 		<result property="factoryCode"	column="factory_code"	/>
+		<result property="delFlag"	column="del_flag"	/>
 	</resultMap>
 
 	<sql id="selectSysFactoryVo">
-		select factory_id, parent_id, ancestors, factory_name, order_num, leader, phone, email, status, del_flag, create_by, create_time, update_by, update_time, factory_code from sys_factory
+		select factory_id, parent_id, ancestors, factory_name, order_num, leader, phone, email, status, del_flag, create_by, create_time, update_by, update_time, factory_code,del_flag from sys_factory
 	</sql>
 
 	<select id="selectSysFactoryList" parameterType="SysFactory" resultMap="SysFactoryResult">
@@ -38,12 +39,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="phone != null  and phone != ''"> and phone = #{phone}</if>
 			<if test="email != null  and email != ''"> and email = #{email}</if>
 			<if test="status != null  and status != ''"> and status = #{status}</if>
+			and del_flag = '0'
 		</where>
 	</select>
 	
 	<select id="selectSysFactoryByFactoryId" parameterType="Long" resultMap="SysFactoryResult">
 		<include refid="selectSysFactoryVo"/>
 		where factory_id = #{factoryId}
+		and del_flag = '0'
 	</select>
 		
 	<insert id="insertSysFactory" parameterType="SysFactory" useGeneratedKeys="true" keyProperty="factoryId">
@@ -103,32 +106,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where factory_id = #{factoryId}
 	</update>
 
-	<delete id="deleteSysFactoryByFactoryId" parameterType="Long">
+	<update id="deleteSysFactoryByFactoryId" parameterType="Long">
-		delete from sys_factory where factory_id = #{factoryId}
+		update sys_factory
-	</delete>
+		set del_flag = '1'
+		where factory_id = #{factoryId}
+	</update>
 
-	<delete id="deleteSysFactoryByFactoryIds" parameterType="String">
+	<update id="deleteSysFactoryByFactoryIds" parameterType="String">
-		delete from sys_factory where factory_id in
+		update sys_factory
+		set del_flag = '1'
+		where factory_id in
 		<foreach item="factoryId" collection="array" open="(" separator="," close=")">
 			#{factoryId}
 		</foreach>
-	</delete>
+	</update>
 
 	<select id="getWorkCenterList" parameterType="SysFactory" resultMap="SysFactoryResult">
 		select  factory_code,factory_name
 		from sys_factory
+		where del_flag = '0'
 	</select>
 
 	<select id="checkFactoryCodeUnique" parameterType="SysFactory" resultType ="java.lang.String">
 		select factory_code
 		from sys_factory
 		where factory_code = #{factoryCode}
+		and del_flag = '0'
 	</select>
 
 	<select id="checkFactoryNameUnique" parameterType="SysFactory" resultType ="java.lang.String">
 		select factory_name
 		from sys_factory
 		where factory_name = #{factoryName}
+		and del_flag = '0'
 	</select>
 
 </mapper>