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

1.制造模块内配置下的所有模型增加管理员（admin）权限

Browse Source 
2.工单上的工件配送优化验证及对应的页面上新增工件配送按钮
This commit is contained in:
jinling.yang
2024-01-29 19:43:57 +08:00
parent cf2aaa38fe
commit a088ee9ed5
7 changed files with 111 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
sf_manufacturing/models/mrp_workorder.py
View File

@@ -201,18 +201,18 @@ class ResMrpWorkOrder(models.Model):
except:
raise UserError("参数计算有误")
# def button_workpiece_delivery(self):
# if self.routing_type == '装夹预调':
# if not self.workpiece_delivery_ids:
# raise UserError('请添加【工件配送】信息')
# else:
# for item in self.workpiece_delivery_ids:
# if not item.feeder_station_start:
# raise UserError('【工件配送】明细中请输入起点接驳站')
# if not item.workpiece_code:
# raise UserError('请对【同运工件】进行扫描')
# else:
# workpiece_code
def button_workpiece_delivery(self):
if self.routing_type == '装夹预调':
if not self.workpiece_delivery_ids:
raise UserError('请添加【工件配送】信息')
else:
for item in self.workpiece_delivery_ids:
if not item.feeder_station_start:
raise UserError('【工件配送】明细中请输入起点接驳站')
if not item.workpiece_code:
raise UserError('请对【同运工件】进行扫描')
else:
item.write({'task_delivery_time': fields.Datetime.now()})
# 拼接工单对象属性值
def json_workorder_str(self, k, production, route):
@@ -757,9 +757,28 @@ class SfWorkOrderBarcodes(models.Model):
'tray_model_id': stock_move_line.product_id.fixture_model_id.id
})
workorder.button_start()
# elif stock_move_line.product_id.categ_type == '坯料':
# if stock_move_line.production_id.production_line_id.id == workorder.production_id.production_line_id.id
# workorder.
else:
embryo_stock_lot = self.env['stock.lot'].search([('name', '=', barcode)])
if embryo_stock_lot:
embryo_stock_move_line = self.env['stock.move.line'].search(
[('product_id', '=', embryo_stock_lot.product_id.id),
('reference', '=', workorder.production_id.name),
('lot_id', '=', embryo_stock_lot.id),
('product_category_name', '=', '坯料')])
if embryo_stock_move_line:
workpiece_delivery = self.env['sf.workpiece.delivery'].search(
[('workorder_id', '=', workorder.id)], limit=1, order='id asc')
if workpiece_delivery:
embryo_workpiece_code = workpiece_delivery.workpiece_code
if workpiece_delivery.workpiece_code and embryo_stock_lot.name not in \
workpiece_delivery.workpiece_code:
embryo_workpiece_code = workpiece_delivery.workpiece_code + ',' + \
embryo_stock_lot.name
if not workpiece_delivery.workpiece_code:
embryo_workpiece_code = embryo_stock_lot.name
workpiece_delivery.write({'workpiece_code': embryo_workpiece_code})
else:
raise UserError('工件生产线不一致，请重新确认')
class WorkPieceDelivery(models.Model):