kangwei：安环处置点表结构与相关代码

@@ -238,7 +238,6 @@ public class PurchaseContractController {
 				result.setResult(purchaseContract);
 				result.setResult(purchaseContract);
 				result.setSuccess(true);
 				result.setSuccess(true);
 			}
 			}
-
 		}
 		}
 		return result;
 		return result;
 	}
 	}

@@ -60,7 +60,7 @@
           from (
           from (
                 select  dc.contract_code 'distribut_contract_code', dc.id 'distribut_contract_id', dm.distribut_price ,dm.distribut_total_price,dm.material_num ,pm.*
                 select  dc.contract_code 'distribut_contract_code', dc.id 'distribut_contract_id', dm.distribut_price ,dm.distribut_total_price,dm.material_num ,pm.*
                 from erp_distribut_contract dc , erp_distribut_material dm , erp_purchase_material pm
                 from erp_distribut_contract dc , erp_distribut_material dm , erp_purchase_material pm
-                where dc.id  = dm.contract_id  and dc.id = #{param.distributContractId } and dm.good_code = pm.good_code   and pm.del_flag = '0' and dc.use_flag = '0' and dm.del_flag = '0' and  dc.start_time  > now() and  dc.end_time < now()
+                where dc.id  = dm.contract_id  and dc.id = #{param.distributContractId } and dm.good_code = pm.good_code   and pm.del_flag = '0' and dc.use_flag = '0' and dm.del_flag = '0'
                 <if test="param.sparepartCode != null and param.sparepartCode !=''">and pm.sparepart_code =#{param.sparepartCode}</if>
                 <if test="param.sparepartCode != null and param.sparepartCode !=''">and pm.sparepart_code =#{param.sparepartCode}</if>
                 <if test="param.sparepartType != null and param.sparepartType !=''">and pm.sparepart_type in (${param.sparepartType}) </if>
                 <if test="param.sparepartType != null and param.sparepartType !=''">and pm.sparepart_type in (${param.sparepartType}) </if>
                 <if test="param.sparepartName != null and param.sparepartName !=''">and pm.sparepart_name like '%${param.sparepartName}%'</if>
                 <if test="param.sparepartName != null and param.sparepartName !=''">and pm.sparepart_name like '%${param.sparepartName}%'</if>