|
|
@@ -5,7 +5,7 @@ class BaseDetail < ActiveRecord::Base
|
|
|
belongs_to :product
|
|
|
belongs_to :order, :foreign_key => :order_id
|
|
|
# has_one :order, :foreign_key=>:order_id, :primary_key=>:order_id
|
|
|
- validates :order_no,:product_id,:nums,:dt_id, presence: true
|
|
|
+ validates :product_id,:nums,:dt_id, presence: true
|
|
|
validate :order_validation
|
|
|
def order_validation
|
|
|
if self.product_id > 0
|
|
|
@@ -18,15 +18,18 @@ class BaseDetail < ActiveRecord::Base
|
|
|
end
|
|
|
end
|
|
|
|
|
|
- if self.order_no.length>0
|
|
|
- ord = Order.where("order_id = ?", self.order_no).first
|
|
|
- if ord.blank?
|
|
|
- self.errors.add(:order_id,"订单不存在,请重新填写编号")
|
|
|
+ if self.dt_id > 0
|
|
|
+ orDt = OrderDetail.where("id = ?", self.dt_id).first
|
|
|
+ if orDt.blank?
|
|
|
+ self.errors.add(:dt_id,"订单明细ID不存在,请重新填写明细ID")
|
|
|
else
|
|
|
- self.order_id=ord.id
|
|
|
+ self.order_no=orDt.order_no
|
|
|
+ self.order_id=orDt.order_id
|
|
|
+ #self.price=prd.price
|
|
|
end
|
|
|
end
|
|
|
|
|
|
+
|
|
|
end
|
|
|
|
|
|
def order_state
|
|
|
@@ -140,7 +143,7 @@ class BaseDetail < ActiveRecord::Base
|
|
|
end
|
|
|
|
|
|
edit do
|
|
|
- field :order_no
|
|
|
+ # field :order_no
|
|
|
#field :order_id
|
|
|
field :dt_id
|
|
|
field :product_id
|