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

Accept Merge Request #1212: (feature/bug优化 -> develop)

Browse Source 
Merge Request: 修改夹具重量单位为kg

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1212
This commit is contained in:
禹翔辉
2024-08-02 11:22:06 +08:00
committed by Coding
parent 0a6cf74bc2 cec426920b
commit 3f27ae0f35
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_base/models/basic_parameters_fixture.py
View File

@@ -13,7 +13,7 @@ class BasicParametersFixture(models.Model):
diameter = fields.Float('直径(mm)', digits=(16, 2)) diameter = fields.Float('直径(mm)', digits=(16, 2))
# '零点卡盘' 字段 # '零点卡盘' 字段
weight = fields.Float('重量(mm)', digits=(16, 2)) weight = fields.Float('重量(kg)', digits=(16, 2))
orientation_dish_diameter = fields.Float('定位盘直径(mm)', digits=(16, 2)) orientation_dish_diameter = fields.Float('定位盘直径(mm)', digits=(16, 2))
clamping_diameter = fields.Float('装夹直径(mm)', digits=(16, 2)) clamping_diameter = fields.Float('装夹直径(mm)', digits=(16, 2))
clamping_num = fields.Selection([('1', '1'), ('2', '2'), ('4', '4'), ('6', '6'), ('8', '8')], string='装夹单元数') clamping_num = fields.Selection([('1', '1'), ('2', '2'), ('4', '4'), ('6', '6'), ('8', '8')], string='装夹单元数')

2
sf_manufacturing/models/product_template.py
View File

@@ -800,7 +800,7 @@ class ResProductFixture(models.Model):
diameter = fields.Float('直径(mm)', digits=(16, 2)) diameter = fields.Float('直径(mm)', digits=(16, 2))
# '零点卡盘' 字段 # '零点卡盘' 字段
weight = fields.Float('重量(mm)', digits=(16, 2)) weight = fields.Float('重量(kg)', digits=(16, 2))
orientation_dish_diameter = fields.Float('定位盘直径(mm)', digits=(16, 2)) orientation_dish_diameter = fields.Float('定位盘直径(mm)', digits=(16, 2))
clamping_diameter = fields.Float('装夹直径(mm)', digits=(16, 2)) clamping_diameter = fields.Float('装夹直径(mm)', digits=(16, 2))
clamping_num = fields.Selection([('1', '1'), ('2', '2'), ('4', '4'), ('6', '6'), ('8', '8')], string='装夹单元数') clamping_num = fields.Selection([('1', '1'), ('2', '2'), ('4', '4'), ('6', '6'), ('8', '8')], string='装夹单元数')

2
sf_tool_management/models/base.py
View File

@@ -1103,7 +1103,7 @@ class StockMove(models.Model):
move_line_ids = picking_id.move_line_ids move_line_ids = picking_id.move_line_ids
for move_line_id in move_line_ids: for move_line_id in move_line_ids:
for res in data: for res in data:
if move_line_id.lot_id.product_id == res['lot_id'].product_id: if move_line_id.product_id == res['lot_id'].product_id:
move_line_id.write({ move_line_id.write({
'destination_location_id': res.get('destination').id, 'destination_location_id': res.get('destination').id,
'lot_id': res.get('lot_id').id 'lot_id': res.get('lot_id').id