显示优化,物流下单增补逻辑
This commit is contained in:
@@ -56,7 +56,7 @@ class JdEclp(models.Model):
|
|||||||
"""
|
"""
|
||||||
res = super(JdEclp, self).button_validate()
|
res = super(JdEclp, self).button_validate()
|
||||||
if self.check_out == 'OUT':
|
if self.check_out == 'OUT':
|
||||||
if self.logistics_way != '自提':
|
if self.logistics_way != '自提' and self.logistics_way:
|
||||||
if self.logistics_status != '2':
|
if self.logistics_status != '2':
|
||||||
raise ValidationError('非自提订单,必须先下物流单,并获取物流面单后才可出库!')
|
raise ValidationError('非自提订单,必须先下物流单,并获取物流面单后才可出库!')
|
||||||
return res
|
return res
|
||||||
|
|||||||
@@ -55,7 +55,7 @@
|
|||||||
</page>
|
</page>
|
||||||
<page name="inventory" position="attributes">
|
<page name="inventory" position="attributes">
|
||||||
<attribute name="groups">
|
<attribute name="groups">
|
||||||
stock.group_stock_user,product.group_stock_packaging,sf_base.group_sale_salemanager,sf_base.group_sale_director,sf_base.group_purchase,sf_base.group_purchase_director
|
stock.group_stock_user,product.group_stock_packaging,sf_base.group_sale_salemanager,sf_base.group_sale_director,sf_base.group_purchase,sf_base.group_purchase_director,sf_base.group_plan_dispatch
|
||||||
</attribute>
|
</attribute>
|
||||||
</page>
|
</page>
|
||||||
</field>
|
</field>
|
||||||
|
|||||||
@@ -230,8 +230,8 @@ class sf_production_plan(models.Model):
|
|||||||
record.env['mrp.production'].sudo().browse(i).schedule_state = '已排'
|
record.env['mrp.production'].sudo().browse(i).schedule_state = '已排'
|
||||||
# record.production_id.date_planned_start = record.date_planned_start
|
# record.production_id.date_planned_start = record.date_planned_start
|
||||||
# record.production_id.date_planned_finished = record.date_planned_finished
|
# record.production_id.date_planned_finished = record.date_planned_finished
|
||||||
record.production_id.production_line_id = record.production_line_id.id
|
record.sudo().production_id.production_line_id = record.production_line_id.id
|
||||||
record.production_id.workorder_ids.filtered(
|
record.sudo().production_id.workorder_ids.filtered(
|
||||||
lambda b: b.routing_type == "装夹预调").workpiece_delivery_ids.write(
|
lambda b: b.routing_type == "装夹预调").workpiece_delivery_ids.write(
|
||||||
{'production_line_id': record.production_line_id.id,
|
{'production_line_id': record.production_line_id.id,
|
||||||
'plan_start_processing_time': record.date_planned_start})
|
'plan_start_processing_time': record.date_planned_start})
|
||||||
|
|||||||
Reference in New Issue
Block a user