Accept Merge Request #1340: (feature/销售和排程添加消息推送 -> develop)
Merge Request: 刀具组装拆解与调拨入库消息推送 Created By: @廖丹龙 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @廖丹龙 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1340
This commit is contained in:
@@ -11,7 +11,7 @@
|
|||||||
""",
|
""",
|
||||||
'category': 'sf',
|
'category': 'sf',
|
||||||
'website': 'https://www.sf.jikimo.com',
|
'website': 'https://www.sf.jikimo.com',
|
||||||
'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify'],
|
'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify','stock'],
|
||||||
'data': [
|
'data': [
|
||||||
'data/bussiness_node.xml'
|
'data/bussiness_node.xml'
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -10,5 +10,21 @@
|
|||||||
<field name="name">确认接单</field>
|
<field name="name">确认接单</field>
|
||||||
<field name="model">sale.order</field>
|
<field name="model">sale.order</field>
|
||||||
</record>
|
</record>
|
||||||
|
<record id="transfer_inventory" model="jikimo.message.bussiness.node">
|
||||||
|
<field name="name">调拨入库</field>
|
||||||
|
<field name="model">stock.picking</field>
|
||||||
|
</record>
|
||||||
|
<record id="tool_assembly" model="jikimo.message.bussiness.node">
|
||||||
|
<field name="name">功能刀具组装</field>
|
||||||
|
<field name="model">sf.functional.tool.assembly</field>
|
||||||
|
</record>
|
||||||
|
<record id="tool_dismantle" model="jikimo.message.bussiness.node">
|
||||||
|
<field name="name">功能刀具寿命到期</field>
|
||||||
|
<field name="model">sf.functional.tool.dismantle</field>
|
||||||
|
</record>
|
||||||
|
<record id="bussiness_material_purchase_remind" model="jikimo.message.bussiness.node">
|
||||||
|
<field name="name">坯料采购提醒</field>
|
||||||
|
<field name="model">purchase.order</field>
|
||||||
|
</record>
|
||||||
</data>
|
</data>
|
||||||
</odoo>
|
</odoo>
|
||||||
@@ -6,3 +6,4 @@ from . import sf_message_cam_program
|
|||||||
from . import sf_message_functional_tool_assembly
|
from . import sf_message_functional_tool_assembly
|
||||||
from . import sf_message_purchase
|
from . import sf_message_purchase
|
||||||
from . import sf_message_workorder
|
from . import sf_message_workorder
|
||||||
|
from . import sf_message_functional_tool_dismantle
|
||||||
@@ -3,4 +3,16 @@ from odoo import models, fields, api, _
|
|||||||
|
|
||||||
class SFMessagefunctionalToolAssembly(models.Model):
|
class SFMessagefunctionalToolAssembly(models.Model):
|
||||||
_name = 'sf.functional.tool.assembly'
|
_name = 'sf.functional.tool.assembly'
|
||||||
|
_description = "刀具组装单"
|
||||||
_inherit = ['sf.functional.tool.assembly', 'jikimo.message.dispatch']
|
_inherit = ['sf.functional.tool.assembly', 'jikimo.message.dispatch']
|
||||||
|
|
||||||
|
@api.model_create_multi
|
||||||
|
def create(self, vals):
|
||||||
|
result = super(SFMessagefunctionalToolAssembly, self).create(vals)
|
||||||
|
is_cam = False
|
||||||
|
for obj in result:
|
||||||
|
if obj.loading_task_source == '0' and obj.assemble_status == '0':
|
||||||
|
is_cam = True
|
||||||
|
if is_cam:
|
||||||
|
self.add_queue('功能刀具组装')
|
||||||
|
return result
|
||||||
|
|||||||
18
sf_message/models/sf_message_functional_tool_dismantle.py
Normal file
18
sf_message/models/sf_message_functional_tool_dismantle.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
from odoo import models, api
|
||||||
|
|
||||||
|
|
||||||
|
class SFMessagefunctionalToolDismantle(models.Model):
|
||||||
|
_name = 'sf.functional.tool.dismantle'
|
||||||
|
_description = "刀具拆解单"
|
||||||
|
_inherit = ['sf.functional.tool.dismantle', 'jikimo.message.dispatch']
|
||||||
|
|
||||||
|
@api.model
|
||||||
|
def create(self, vals):
|
||||||
|
result = super(SFMessagefunctionalToolDismantle, self).create(vals)
|
||||||
|
is_dismantle = False
|
||||||
|
for obj in result:
|
||||||
|
if obj.dismantle_cause in ['寿命到期报废', '崩刀报废']and obj.state=='待拆解':
|
||||||
|
is_dismantle = True
|
||||||
|
if is_dismantle:
|
||||||
|
self.add_queue('功能刀具寿命到期')
|
||||||
|
return result
|
||||||
@@ -1,6 +1,17 @@
|
|||||||
|
import logging
|
||||||
from odoo import models, fields, api, _
|
from odoo import models, fields, api, _
|
||||||
|
|
||||||
|
|
||||||
class SFMessagePurchase(models.Model):
|
class SFMessagePurchase(models.Model):
|
||||||
_name = 'purchase.order'
|
_name = 'purchase.order'
|
||||||
_inherit = ['purchase.order', 'jikimo.message.dispatch']
|
_inherit = ['purchase.order', 'jikimo.message.dispatch']
|
||||||
|
|
||||||
|
@api.model_create_multi
|
||||||
|
def create(self, vals_list):
|
||||||
|
res = super(SFMessagePurchase, self).create(vals_list)
|
||||||
|
if res:
|
||||||
|
try:
|
||||||
|
res.add_queue('坯料采购提醒')
|
||||||
|
except Exception as e:
|
||||||
|
logging.info('add_queue error:%s' % e)
|
||||||
|
return res
|
||||||
|
|||||||
@@ -3,4 +3,11 @@ from odoo import models, fields, api, _
|
|||||||
|
|
||||||
class SFMessageStockPicking(models.Model):
|
class SFMessageStockPicking(models.Model):
|
||||||
_name = 'stock.picking'
|
_name = 'stock.picking'
|
||||||
|
_description = "库存调拨"
|
||||||
_inherit = ['stock.picking', 'jikimo.message.dispatch']
|
_inherit = ['stock.picking', 'jikimo.message.dispatch']
|
||||||
|
|
||||||
|
def button_validate(self):
|
||||||
|
res = super(SFMessageStockPicking, self).button_validate()
|
||||||
|
if self.location_id.name == '进货' and self.location_dest_id.name == '刀具房':
|
||||||
|
self.add_queue('调拨入库')
|
||||||
|
return res
|
||||||
|
|||||||
@@ -9,4 +9,8 @@ class SfMessageTemplate(models.Model):
|
|||||||
def _get_message_model(self):
|
def _get_message_model(self):
|
||||||
res = super(SfMessageTemplate, self)._get_message_model()
|
res = super(SfMessageTemplate, self)._get_message_model()
|
||||||
res.append("sale.order")
|
res.append("sale.order")
|
||||||
|
res.append("stock.picking")
|
||||||
|
res.append('sf.functional.tool.assembly')
|
||||||
|
res.append('sf.functional.tool.dismantle')
|
||||||
|
res.append('purchase.order')
|
||||||
return res
|
return res
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ class jikimo_bom(models.Model):
|
|||||||
('cutting_tool_blade_diameter', '=', self.tool_inventory_id.diameter),
|
('cutting_tool_blade_diameter', '=', self.tool_inventory_id.diameter),
|
||||||
|
|
||||||
# r角
|
# r角
|
||||||
('cutting_tool_blade_tip_working_size', '=', self.tool_inventory_id.angle)]
|
('cutting_tool_blade_tip_r_size', '=', self.tool_inventory_id.angle)]
|
||||||
if option.name == '刀杆':
|
if option.name == '刀杆':
|
||||||
domain = ['&'] + domain + [
|
domain = ['&'] + domain + [
|
||||||
("cutting_tool_cutter_arbor_diameter", "=", self.tool_inventory_id.diameter)]
|
("cutting_tool_cutter_arbor_diameter", "=", self.tool_inventory_id.diameter)]
|
||||||
|
|||||||
Reference in New Issue
Block a user