jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/空料架名称去重校验

Browse Source
This commit is contained in:
jinling.yang
2024-05-29 17:56:55 +08:00
parent c437c185a4 b9ec821293
commit 17678c53c9
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_manufacturing/controllers/controllers.py
View File

@@ -466,7 +466,6 @@ class Manufacturing_Connect(http.Controller):
order='id asc') order='id asc')
if workpiece_delivery: if workpiece_delivery:
for wd in workpiece_delivery: for wd in workpiece_delivery:
logging.info('wd.production_id:%s' % wd.production_id.name)
if wd.workorder_id.state == 'done' and wd.production_id.production_line_state == '待上产线': if wd.workorder_id.state == 'done' and wd.production_id.production_line_state == '待上产线':
logging.info( logging.info(
'wd.production_line_state:%s' % wd.production_id.production_line_state) 'wd.production_line_state:%s' % wd.production_id.production_line_state)
@@ -519,7 +518,6 @@ class Manufacturing_Connect(http.Controller):
order='id asc') order='id asc')
if workpiece_delivery: if workpiece_delivery:
for wd in workpiece_delivery: for wd in workpiece_delivery:
logging.info('wd.production_id:%s' % wd.production_id.name)
if wd.workorder_id.state == 'done' and wd.production_id.production_line_state == '已上产线': if wd.workorder_id.state == 'done' and wd.production_id.production_line_state == '已上产线':
logging.info( logging.info(
'wd.production_line_state:%s' % wd.production_id.production_line_state) 'wd.production_line_state:%s' % wd.production_id.production_line_state)

2
sf_manufacturing/models/mrp_workorder.py
View File

@@ -1332,6 +1332,8 @@ class WorkPieceDelivery(models.Model):
def create(self, vals): def create(self, vals):
if vals.get('name', '/') == '/' or vals.get('name', '/') is False: if vals.get('name', '/') == '/' or vals.get('name', '/') is False:
vals['name'] = self.env['ir.sequence'].next_by_code('sf.workpiece.delivery') or '/' vals['name'] = self.env['ir.sequence'].next_by_code('sf.workpiece.delivery') or '/'
else:
vals['type'] = '运送空料架'
obj = super(WorkPieceDelivery, self).create(vals) obj = super(WorkPieceDelivery, self).create(vals)
return obj return obj

2
sf_manufacturing/views/agv_setting_views.xml
View File

@@ -36,7 +36,7 @@
<tree editable="bottom"> <tree editable="bottom">
<field name="name" required="1"/> <field name="name" required="1"/>
<field name="type" readonly="1" string="任务类型"/> <field name="type" readonly="1" string="任务类型"/>
<field name="route_type" string="类型"/> <field name="route_type" string="类型" required="1"/>
<field name="start_site_id" required="1" options="{'no_create': True}" string="起点接驳站"/> <field name="start_site_id" required="1" options="{'no_create': True}" string="起点接驳站"/>
<field name="end_site_id" required="1" options="{'no_create': True}" string="终点接驳站"/> <field name="end_site_id" required="1" options="{'no_create': True}" string="终点接驳站"/>
<field name="destination_production_line_id" required="1" options="{'no_create': True}"/> <field name="destination_production_line_id" required="1" options="{'no_create': True}"/>

15
sf_manufacturing/views/mrp_workorder_view.xml
View File

@@ -618,7 +618,6 @@
<field name="route_id" options="{'no_create': True}" <field name="route_id" options="{'no_create': True}"
domain="[('route_type','in',['上产线','下产线'])]"/> domain="[('route_type','in',['上产线','下产线'])]"/>
<field name="feeder_station_start_id" readonly="1" force_save="1"/> <field name="feeder_station_start_id" readonly="1" force_save="1"/>
<field name="feeder_station_start_id" readonly="1" force_save="1"/>
<field name="feeder_station_destination_id" readonly="1" force_save="1"/> <field name="feeder_station_destination_id" readonly="1" force_save="1"/>
<field name="is_cnc_program_down" readonly="1"/> <field name="is_cnc_program_down" readonly="1"/>
<!-- <field name="rfid_code"/>--> <!-- <field name="rfid_code"/>-->
@@ -668,14 +667,18 @@
<field name="name">空料架配送</field> <field name="name">空料架配送</field>
<field name="model">sf.workpiece.delivery</field> <field name="model">sf.workpiece.delivery</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="工件配送" class="center" create="0" edit="0" delete="0"> <tree string="工件配送" editable="bottom" class="center" delete="0">
<header> <header>
<button name="button_delivery" type="object" string="配送" class="oe_highlight"/> <button name="button_delivery" type="object" string="配送" class="oe_highlight"/>
</header> </header>
<field name="name" string="路线名称" readonly="1"/> <field name="name" string="路线名称" attrs="{'readonly': [('id', '!=', False)]}"
<field name="route_id" options="{'no_create': True}"/> placeholder="例如:运送空料架路线:G01-A01" required="1" force_save="1"/>
<field name="feeder_station_start_id" readonly="1"/> <field name="route_id" options="{'no_create': True}" required="1"
<field name="feeder_station_destination_id" readonly="1"/> attrs="{'readonly': [('id', '!=', False)]}" domain="[('route_type', '=', '运送空料架')]"
force_save="1"/>
<field name="feeder_station_start_id" readonly="1" force_save="1"/>
<!-- <field name="type" readonly="1"/>-->
<field name="feeder_station_destination_id" readonly="1" force_save="1"/>
<button name="action_delivery_history" type="object" class="btn btn-link text-info" icon="fa-history" <button name="action_delivery_history" type="object" class="btn btn-link text-info" icon="fa-history"
string="历史"/> string="历史"/>
</tree> </tree>