逻辑删除

op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml

@@ -100,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		SELECT batch_code
 		FROM pro_order_workorder_batch
 		WHERE status = '1'
+		  and del_flag = '0'
 		GROUP BY batch_code
 	</select>
 
@@ -132,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select CONVERT(varchar(100),max(create_time), 20) createTime
 		from pro_order
 		where order_type != 'white'
+         and del_flag = '0'
 	</select>
 
     <select id="selectProOrderByOrderCode" parameterType="String" resultMap="ProOrderResult">
@@ -181,11 +183,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
     <select id="getMaxPlanDate" resultType="com.op.plan.domain.ProOrder">
 		select max(plan_pro_date) planProDate
-		from pro_order where prod_type != 'white'
+		from pro_order where prod_type != 'white' and del_flag = '0'
 	</select>
 
     <select id="selectOrderIdByParentOrder" resultType="java.lang.String">
-		select id from pro_order where parent_order = ( select order_code from pro_order where id = #{id} )
+		select id from pro_order where parent_order = ( select order_code from pro_order where id = #{id} ) and del_flag = '0'
 	</select>
 
     <insert id="insertProOrder" parameterType="ProOrder">

op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderBatchMapper.xml

@@ -49,19 +49,20 @@
 
     <select id="selectProOrderWorkorderBatchByWorkorderId" parameterType="String" resultMap="ProOrderWorkorderBatchResult">
         <include refid="selectProOrderWorkorderBatchVo"/>
-        where workorder_id = #{workorderId}
+        where workorder_id = #{workorderId} and del_flag = '0'
     </select>
 
     <select id="selectWorkOrderBatchList" resultType="com.op.plan.domain.Batch">
         select batch_code AS 'batchCode',batch_quantity AS 'batchQuantity'
         from pro_order_workorder_batch
         where workorder_id = #{workorderId}
+          and del_flag = '0'
     </select>
 
     <select id="selectCodeByWorkOrderIds" resultType="java.lang.String">
         select batch_code
         from pro_order_workorder_batch
-        where workorder_id not in
+        where del_flag = '0' and workorder_id not in
         <foreach item="workorderId" collection="array" open="(" separator="," close=")">
             #{workorderId}
         </foreach>

op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml

@@ -339,7 +339,7 @@
 
     <select id="selectProOrderWorkorderByOrderId" parameterType="String" resultMap="ProOrderWorkorderResult">
         <include refid="selectProOrderWorkorderVo"/>
-        where order_id = #{orderId}
+        where order_id = #{orderId} and del_flag = '0'
     </select>
 
     <insert id="createPrepareDetails">