1

src/main/java/com/chinaitop/depot/business/mapper/BusinessMergeNoticeMapper.xml

@@ -4,12 +4,12 @@
   <!-- 根据合同编号获取通知单数据列表 -->
   <select id="findByHtbhCondition" resultType="com.chinaitop.depot.business.model.BusinessMergeNoticeDetail" parameterType="map">
 	SELECT 
-      a.org_id orgId,a.id tzdid, a.bill_number tzdbh, a.shiping_count jhsl, a.contract htbh, c.khmc khmc, b.grain_kind lspz, b.house_id ch, b.warehouse_id hwh
+      a.org_id orgId,a.id tzdid, a.bill_number tzdbh, a.shiping_count jhsl, b.htbh htbh, c.khmc khmc, b.grain_kind lspz, b.house_id ch, b.warehouse_id hwh
     FROM business_delivery_storage_notice a
     LEFT JOIN business_store_ware_detail b on b.zid=a.id AND b.type='notice'
-	LEFT JOIN business_contract_receive c on c.htbh=a.contract
-	WHERE 1=1 and a.audit_state=2 and a.in_Application in (1,3,4)
-	AND a.contract = #{obj.htbh,jdbcType=VARCHAR}
+	LEFT JOIN business_contract_receive c on c.htbh=b.htbh
+	WHERE 1=1 and a.audit_state=2 and a.in_Application in (1,3,4) AND a.bill_type='3'
+	AND b.htbh = #{obj.htbh,jdbcType=VARCHAR}
 	AND a.org_id = #{obj.orgId,jdbcType=INTEGER}
 	ORDER BY a.create_time DESC
   </select>