Merge remote-tracking branch 'origin/master'

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml

@@ -71,19 +71,14 @@
             <if test="incomeBatchNo != null  and incomeBatchNo != ''">and qct.income_batch_no = #{incomeBatchNo}</if>
             <if test="orderNo != null  and orderNo != ''">and qct.order_no = #{orderNo}</if>
             <if test="materialCode != null  and materialCode != ''">and qct.material_code = #{materialCode}</if>
-            <if test="materialName != null  and materialName != ''">and qct.material_name like concat('%',
+            <if test="materialName != null  and materialName != ''">and qct.material_name like concat('%',#{materialName}, '%')</if>
-                #{materialName}, '%')
-            </if>
             <if test="supplierCode != null  and supplierCode != ''">and qct.supplier_code = #{supplierCode}</if>
-            <if test="supplierName != null  and supplierName != ''">and qct.supplier_name like concat('%',
+            <if test="supplierName != null  and supplierName != ''">and qct.supplier_name like concat('%',#{supplierName}, '%')</if>
-                #{supplierName}, '%')
-            </if>
             <if test="checkLoc != null  and checkLoc != ''">and qct.check_loc = #{checkLoc}</if>
             <if test="checkStatus != null  and checkStatus != ''">and qct.check_status = #{checkStatus}</if>
             <if test="checkManCode != null  and checkManCode != ''">and qct.check_man_code = #{checkManCode}</if>
-            <if test="checkManName != null  and checkManName != ''">and qct.check_man_name like concat('%',
+            <if test="checkManName != null  and checkManName != ''">and qct.check_man_name like concat('%',#{checkManName}, '%')</if>
-                #{checkManName}, '%')
+            and qct.del_flag = '0' and pow.del_flag = '0'
-            </if>
             <if test="checkResult != null  and checkResult != ''">and qct.check_result = #{checkResult}</if>
             <if test="status != null  and status != ''">and qct.status = #{status}</if>
             <if test="delFlag != null  and delFlag != ''">and qct.del_flag = #{delFlag}</if>
@@ -265,7 +260,7 @@
         from qc_check_task  qct
                  left join pro_order_workorder pow on pow.workorder_code = qct.order_no
                  left join pro_order_workorder_batch powb on powb.workorder_id = pow.workorder_id
-        where qct.record_id = #{recordId}
+        where qct.record_id = #{recordId} and qct.del_flag = '0' and pow.del_flag = '0' and powb.del_flag = '0'
         order by powb.batch_code
     </select>
     <select id="getLastXJ" resultType="com.op.quality.domain.QcCheckTaskProduce">

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml

@@ -382,7 +382,7 @@
             <if test="incomeTimeEnd != null ">and #{incomeTimeEnd} > CONVERT(varchar(30),qct.income_time, 120)</if>
             <if test="checkTimeStart != null ">and CONVERT(varchar(30),qct.create_time, 120) >= #{checkTimeStart}</if>
             <if test="checkTimeEnd != null ">and #{checkTimeEnd} > CONVERT(varchar(30),qct.create_time, 120)</if>
-            and qct.check_type = 'checkTypeSC'
+            and qct.check_type = 'checkTypeSC' and qct.del_flag = '0'
         </where>
         union ALL
         select
@@ -415,14 +415,14 @@
             <if test="incomeTimeEnd != null ">and #{incomeTimeEnd} > CONVERT(varchar(30),qct.income_time, 120)</if>
             <if test="checkTimeStart != null ">and CONVERT(varchar(30),qct.create_time, 120) >= #{checkTimeStart}</if>
             <if test="checkTimeEnd != null ">and #{checkTimeEnd} > CONVERT(varchar(30),qct.create_time, 120)</if>
-            and qct.check_type = 'checkTypeSCXJ'
+            and qct.check_type = 'checkTypeSCXJ' and qct.del_flag = '0'
         </where>
         GROUP BY qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit,
         qct.supplier_code, qct.supplier_name,CONVERT(varchar(10), qct.income_time, 120), qct.check_type,CONVERT(varchar(10),qct.create_time, 120),
         qct.confirm,qct.confirm_man_name
         ) t
         left join pro_order_workorder pow on pow.workorder_code = t.order_no
-        where 1=1
+        where pow.del_flag = '0'
         <if test="checkType != null ">
             and t.check_type = #{checkType}
         </if>

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskWarehousingMapper.xml

@@ -64,10 +64,8 @@
             <if test="incomeBatchNo != null  and incomeBatchNo != ''">and qct.income_batch_no = #{incomeBatchNo}</if>
             <if test="orderNo != null  and orderNo != ''">and qct.order_no = #{orderNo}</if>
             <if test="workorderCodeSap != null  and workorderCodeSap != ''">and pow.workorder_code_sap like concat('%',#{workorderCodeSap}, '%')</if>
-            <if test="materialCode != null  and materialCode != ''">and qct.material_code = #{materialCode}</if>
+            <if test="materialCode != null  and materialCode != ''">and qct.material_code like concat('%',#{materialCode}, '%') </if>
-            <if test="materialName != null  and materialName != ''">and qct.material_name like concat('%',
+            <if test="materialName != null  and materialName != ''">and qct.material_name like concat('%',#{materialName}, '%')</if>
-                #{materialName}, '%')
-            </if>
             <if test="supplierCode != null  and supplierCode != ''">and qct.supplier_code = #{supplierCode}</if>
             <if test="supplierName != null  and supplierName != ''">and qct.supplier_name like concat('%',
                 #{supplierName}, '%')