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

优化代码，修复检测人功能

Browse Source
This commit is contained in:
mgw
2024-01-02 17:55:02 +08:00
parent 56d8190fc6
commit ccdbfda019
3 changed files with 83 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
sf_machine_connect/views/machine_monitor.xml
View File

@@ -29,44 +29,44 @@
<field name="spindle_speed"/> <field name="spindle_speed"/>
</group> </group>
</group> </group>
<group string='刀位统计'> <!-- <group string='刀位统计'> -->
<group> <!-- <group> -->
<group> <!-- <group> -->
<field name="tool_num_process_time1"/> <!-- <field name="tool_num_process_time1"/> -->
<field name="tool_num_process_time5"/> <!-- <field name="tool_num_process_time5"/> -->
<field name="tool_num_process_time9"/> <!-- <field name="tool_num_process_time9"/> -->
<field name="tool_num_process_time13"/> <!-- <field name="tool_num_process_time13"/> -->
<field name="tool_num_process_time17"/> <!-- <field name="tool_num_process_time17"/> -->
<field name="tool_num_process_time21"/> <!-- <field name="tool_num_process_time21"/> -->
</group> <!-- </group> -->
<group> <!-- <group> -->
<field name="tool_num_process_time2"/> <!-- <field name="tool_num_process_time2"/> -->
<field name="tool_num_process_time6"/> <!-- <field name="tool_num_process_time6"/> -->
<field name="tool_num_process_time10"/> <!-- <field name="tool_num_process_time10"/> -->
<field name="tool_num_process_time14"/> <!-- <field name="tool_num_process_time14"/> -->
<field name="tool_num_process_time18"/> <!-- <field name="tool_num_process_time18"/> -->
<field name="tool_num_process_time22"/> <!-- <field name="tool_num_process_time22"/> -->
</group> <!-- </group> -->
</group> <!-- </group> -->
<group> <!-- <group> -->
<group> <!-- <group> -->
<field name="tool_num_process_time3"/> <!-- <field name="tool_num_process_time3"/> -->
<field name="tool_num_process_time7"/> <!-- <field name="tool_num_process_time7"/> -->
<field name="tool_num_process_time11"/> <!-- <field name="tool_num_process_time11"/> -->
<field name="tool_num_process_time15"/> <!-- <field name="tool_num_process_time15"/> -->
<field name="tool_num_process_time19"/> <!-- <field name="tool_num_process_time19"/> -->
<field name="tool_num_process_time23"/> <!-- <field name="tool_num_process_time23"/> -->
</group> <!-- </group> -->
<group> <!-- <group> -->
<field name="tool_num_process_time4"/> <!-- <field name="tool_num_process_time4"/> -->
<field name="tool_num_process_time8"/> <!-- <field name="tool_num_process_time8"/> -->
<field name="tool_num_process_time12"/> <!-- <field name="tool_num_process_time12"/> -->
<field name="tool_num_process_time16"/> <!-- <field name="tool_num_process_time16"/> -->
<field name="tool_num_process_time20"/> <!-- <field name="tool_num_process_time20"/> -->
<field name="tool_num_process_time24"/> <!-- <field name="tool_num_process_time24"/> -->
</group> <!-- </group> -->
</group> <!-- </group> -->
</group> <!-- </group> -->
<!-- <div class="o_address_format"> --> <!-- <div class="o_address_format"> -->
<!-- <label for="tool_num_process_time1" string="刀位1"/> --> <!-- <label for="tool_num_process_time1" string="刀位1"/> -->
@@ -216,46 +216,46 @@
</group> </group>
<!-- </group> --> <!-- </group> -->
</page> </page>
<page string="刀位配置"> <!-- <page string="刀位配置"> -->
<group string="刀位配置"> <!-- <group string="刀位配置"> -->
<group> <!-- <group> -->
<group> <!-- <group> -->
<field name="tool_num1"/> <!-- <field name="tool_num1"/> -->
<field name="tool_num5"/> <!-- <field name="tool_num5"/> -->
<field name="tool_num9"/> <!-- <field name="tool_num9"/> -->
<field name="tool_num13"/> <!-- <field name="tool_num13"/> -->
<field name="tool_num17"/> <!-- <field name="tool_num17"/> -->
<field name="tool_num21"/> <!-- <field name="tool_num21"/> -->
</group> <!-- </group> -->
<group> <!-- <group> -->
<field name="tool_num2"/> <!-- <field name="tool_num2"/> -->
<field name="tool_num6"/> <!-- <field name="tool_num6"/> -->
<field name="tool_num10"/> <!-- <field name="tool_num10"/> -->
<field name="tool_num14"/> <!-- <field name="tool_num14"/> -->
<field name="tool_num18"/> <!-- <field name="tool_num18"/> -->
<field name="tool_num22"/> <!-- <field name="tool_num22"/> -->
</group> <!-- </group> -->
</group> <!-- </group> -->
<group> <!-- <group> -->
<group> <!-- <group> -->
<field name="tool_num3"/> <!-- <field name="tool_num3"/> -->
<field name="tool_num7"/> <!-- <field name="tool_num7"/> -->
<field name="tool_num11"/> <!-- <field name="tool_num11"/> -->
<field name="tool_num15"/> <!-- <field name="tool_num15"/> -->
<field name="tool_num19"/> <!-- <field name="tool_num19"/> -->
<field name="tool_num23"/> <!-- <field name="tool_num23"/> -->
</group> <!-- </group> -->
<group> <!-- <group> -->
<field name="tool_num4"/> <!-- <field name="tool_num4"/> -->
<field name="tool_num8"/> <!-- <field name="tool_num8"/> -->
<field name="tool_num12"/> <!-- <field name="tool_num12"/> -->
<field name="tool_num16"/> <!-- <field name="tool_num16"/> -->
<field name="tool_num20"/> <!-- <field name="tool_num20"/> -->
<field name="tool_num24"/> <!-- <field name="tool_num24"/> -->
</group> <!-- </group> -->
</group> <!-- </group> -->
</group> <!-- </group> -->
</page> <!-- </page> -->
<!-- </notebook> --> <!-- </notebook> -->
</xpath> </xpath>
</field> </field>

5
sf_manufacturing/models/mrp_workorder.py
View File

@@ -137,7 +137,10 @@ class ResMrpWorkOrder(models.Model):
""" """
检测is_ok(是否合格)被修改的话，就将当前用户赋值给inspection_user_id 检测is_ok(是否合格)被修改的话，就将当前用户赋值给inspection_user_id
""" """
self.inspection_user_id = self.env.user.id if not self.inspection_user_id:
self.inspection_user_id = self.env.user.id
else:
self.inspection_user_id = False
@api.onchange('functional_fixture_id') @api.onchange('functional_fixture_id')
def _onchange_functional_fixture_id(self): def _onchange_functional_fixture_id(self):

3
sf_manufacturing/models/stock.py
View File

@@ -202,8 +202,7 @@ class StockRule(models.Model):
sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)]) sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
if sale_order: if sale_order:
sale_order.write({'schedule_status': 'to schedule'}) sale_order.write({'schedule_status': 'to schedule'})
self.env['sf.production.plan'].sudo().with_company(company_id). \ self.env['sf.production.plan'].sudo().with_company(company_id).create({
create({
'name': production.name, 'name': production.name,
'order_deadline': sale_order.deadline_of_delivery, 'order_deadline': sale_order.deadline_of_delivery,
'production_id': production.id, 'production_id': production.id,