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

1、库位变更接口、库位信息接口优化；2、功能刀具模型from页面按钮样式及显示优化；

Browse Source
This commit is contained in:
yuxianghui
2024-08-19 17:29:09 +08:00
parent 03cfc00be5
commit 062ca66328
4 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sf_manufacturing/controllers/controllers.py
View File

@@ -450,10 +450,12 @@ class Manufacturing_Connect(http.Controller):
if tool: if tool:
location_id.product_sn_id = tool.barcode_id.id location_id.product_sn_id = tool.barcode_id.id
# 修改功能刀具状态 # 修改功能刀具状态
# tool_install_time = {'Nomal': '正常', 'Warning': '报警'} tool_state = {'Nomal': '正常', 'Warning': '报警'}
# tool.write({ if tool_state.get(item.get('State')):
# 'functional_tool_status': tool_install_time.get(item['State']) if tool_state.get(item.get('State')) != tool.functional_tool_status:
# }) tool.write({
'functional_tool_status': tool_state.get(item['State'])
})
else: else:
location_id.product_sn_id = False location_id.product_sn_id = False
logging.info('货架已获取信息:%s' % item) logging.info('货架已获取信息:%s' % item)

11
sf_tool_management/models/functional_tool.py
View File

@@ -41,7 +41,7 @@ class FunctionalCuttingToolEntity(models.Model):
max_lifetime_value = fields.Integer(string='最大寿命值(min)', readonly=True) max_lifetime_value = fields.Integer(string='最大寿命值(min)', readonly=True)
alarm_value = fields.Integer(string='报警值(min)', readonly=True) alarm_value = fields.Integer(string='报警值(min)', readonly=True)
used_value = fields.Integer(string='已使用值(min)', readonly=True) used_value = fields.Integer(string='已使用值(min)', readonly=True)
functional_tool_status = fields.Selection([('报警', '报警'), ('正常', '正常'), ('已拆除', '已拆除')], functional_tool_status = fields.Selection([('正常', '正常'), ('报警', '报警'), ('已拆除', '已拆除')],
string='状态', store=True, default='正常') string='状态', store=True, default='正常')
current_location_id = fields.Many2one('stock.location', string='当前位置', compute='_compute_current_location_id', current_location_id = fields.Many2one('stock.location', string='当前位置', compute='_compute_current_location_id',
store=True) store=True)
@@ -256,6 +256,15 @@ class FunctionalCuttingToolEntity(models.Model):
functional_tool_model_ids.append(functional_tool_model.id) functional_tool_model_ids.append(functional_tool_model.id)
return [(6, 0, functional_tool_model_ids)] return [(6, 0, functional_tool_model_ids)]
dismantle_num = fields.Integer('拆解单数量', compute='_compute_dismantle_num', store=True)
dismantle_ids = fields.One2many('sf.functional.tool.dismantle', 'functional_tool_id', '拆解单')
@api.depends('dismantle_ids')
def _compute_dismantle_num(self):
for item in self:
if item:
item.dismantle_num = len(item.dismantle_ids)
def open_functional_tool_dismantle_form(self): def open_functional_tool_dismantle_form(self):
self.ensure_one() self.ensure_one()
dismantle_ids = self.env['sf.functional.tool.dismantle'].sudo().search([('functional_tool_id', '=', self.id)]) dismantle_ids = self.env['sf.functional.tool.dismantle'].sudo().search([('functional_tool_id', '=', self.id)])

12
sf_tool_management/views/functional_tool_views.xml
View File

@@ -53,12 +53,14 @@
<!-- type="object" class="btn-primary"/>--> <!-- type="object" class="btn-primary"/>-->
<button class="oe_stat_button" groups="sf_base.group_sf_mrp_user" <button class="oe_stat_button" groups="sf_base.group_sf_mrp_user"
name="open_functional_tool_dismantle_form" name="open_functional_tool_dismantle_form"
icon="fa-list-ul" icon="fa-credit-card"
type="object"> type="object"
<div class="o_field_widget o_stat_info"> attrs="{'invisible': [('dismantle_num', '=', 0)]}">
<span> <div name="dismantle_num" class="o_field_widget o_readonly_modifier o_field_statinfo">
拆解单 <span class="o_stat_info o_stat_value">
<field name="dismantle_num"/>
</span> </span>
<span class="o_stat_text">拆解单</span>
</div> </div>
</button> </button>
<button class="oe_stat_button" groups="sf_base.group_sf_mrp_user" <button class="oe_stat_button" groups="sf_base.group_sf_mrp_user"

10
sf_warehouse/models/sync_common.py
View File

@@ -121,10 +121,12 @@ class MrsShelfLocationDataSync(models.Model):
if tool: if tool:
location_id.product_sn_id = tool.barcode_id.id location_id.product_sn_id = tool.barcode_id.id
# 修改功能刀具状态 # 修改功能刀具状态
# tool_install_time = {'Nomal': '正常', 'Warning': '报警'} tool_state = {'Nomal': '正常', 'Warning': '报警'}
# tool.write({ if tool_state.get(item.get('State')):
# 'functional_tool_status': tool_install_time.get(item['State']) if tool_state.get(item.get('State')) != tool.functional_tool_status:
# }) tool.write({
'functional_tool_status': tool_state.get(item['State'])
})
else: else:
location_id.product_sn_id = False location_id.product_sn_id = False
else: else: