kangwei：统购合同新增，根据货号查询统购合同药剂记录，添加生效时间、失效时间条件

@@ -266,7 +266,7 @@ public class DistributContractController {
 			result.setSuccess(true);
 			result.setSuccess(true);
 			result.setResult(purchaseMaterialList.get(0));
 			result.setResult(purchaseMaterialList.get(0));
 		}else{
 		}else{
-			result.error500("根据[厂站]以及[货号]未找到采购合同！");
+			result.error500("根据[厂站]以及[货号]未找到统购合同的药剂记录！");
 		}
 		}
 		return result;
 		return result;
 	}
 	}

@@ -39,7 +39,7 @@
          select st.item_text as 'sparepart_type_name',sm.supp_name  as 'supplier_name',   pm.*
          select st.item_text as 'sparepart_type_name',sm.supp_name  as 'supplier_name',   pm.*
               from (
               from (
                 select m.* from erp_purchase_material m , erp_purchase_contract c
                 select m.* from erp_purchase_material m , erp_purchase_contract c
-                  where m.contract_id = c.id and c.status = 3 and c.use_flag = '0'
+                  where m.contract_id = c.id and c.status = 3 and c.use_flag = '0' and c.start_time <= now() and c.end_time >= now()
                and m.good_code = #{goodCode} and m.depart_id  = #{departId}
                and m.good_code = #{goodCode} and m.depart_id  = #{departId}
               ) pm
               ) pm
                 left join  equipment_sparepart_type   st on  st.id =  pm.sparepart_type
                 left join  equipment_sparepart_type   st on  st.id =  pm.sparepart_type