磅单列表修复

SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml

@@ -26,7 +26,7 @@ LEFT JOIN jg_contract d ON a.sales_id=d.id
 LEFT JOIN jg_receiptout_item0 e ON a.id=e.poundlist_id
 LEFT JOIN jg_salesorder g ON g.contract_id=d.id
 
-WHERE a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 and e.delete_mark = 0 and g.delete_mark = 0 and
+WHERE a.delete_mark = 0 and
  a.creator_time BETWEEN #{startTime} and #{endTime}
  OR
  a.department_id =#{departmentIdS}
@@ -50,7 +50,7 @@ WHERE a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete
 	LEFT JOIN jg_supplier b ON a.supplier_id=b.id
 	LEFT JOIN jg_customer c ON a.customer_id=c.id
 	LEFT JOIN jg_material d ON a.material_id=d.id
-WHERE a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0
+WHERE a.delete_mark = 0 and
  a.creator_time BETWEEN #{startTime} and #{endTime}
 
     </select>
@@ -69,7 +69,7 @@ WHERE a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete
 		LEFT JOIN jg_natural i on a.natural_id = i.id
 		LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id
 		LEFT JOIN jg_salesorder_item0 k on a.id = k.poundlist_id
-		where a.is_examine = '1'
+		where a.is_examine = '1' and a.delete_mark = 0
 		<if test="poundlistPagination.keyword != null and poundlistPagination.keyword != ''">
             AND (b.ticketno LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{poundlistPagination.keyword},'%'))
         </if>