From 90d1f96857bc41104181df403924af8af51f9687 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Tue, 23 Apr 2024 17:20:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BB=B6=E9=85=8D?= =?UTF-8?q?=E9=80=81=E6=B7=BB=E5=8A=A0=E7=BC=96=E7=A0=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/controllers/workpiece.py | 4 +++- sf_manufacturing/models/mrp_workorder.py | 14 ++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/sf_manufacturing/controllers/workpiece.py b/sf_manufacturing/controllers/workpiece.py index 775da5a0..b204cbc7 100644 --- a/sf_manufacturing/controllers/workpiece.py +++ b/sf_manufacturing/controllers/workpiece.py @@ -24,8 +24,10 @@ class Workpiece(http.Controller): if 'reqCode' in ret: if 'method' in ret: if ret['method'] == 'end': + logging.info('backfeed-ret:%s' % ret['reqCode'].rsplit('-', 1)[0]) workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search( - [('production_id.name', '=', ret['reqCode']), ('agv_task_code'), '=', ret['taskCode']]) + [('production_id.name', '=', ret['reqCode'].rsplit('-', 1)[0]), ('agv_task_code'), '=', + ret['taskCode']]) if workpiece_delivery: workpiece_delivery.write({'status': '已配送', 'task_completion_time': ret['reqTime']}) if workpiece_delivery.type == '下产线': diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index c0a0d218..bc1c9379 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -465,9 +465,10 @@ class ResMrpWorkOrder(models.Model): def _json_workpiece_delivery_list(self, production): return [ - [0, '', {'production_id': production.id, 'type': '上产线'}], - [0, '', {'production_id': production.id, 'type': '下产线'}], - [0, '', {'production_id': production.id, 'type': '运送空料架'}], + [0, '', {'production_id': production.id, 'type': '上产线', 'delivery_num': '%s-%s' % (production.name, 1)}], + [0, '', {'production_id': production.id, 'type': '下产线', 'delivery_num': '%s-%s' % (production.name, 2)}], + [0, '', + {'production_id': production.id, 'type': '运送空料架', 'delivery_num': '%s-%s' % (production.name, 3)}], ] # 拼接工单对象属性值(表面工艺) @@ -1078,6 +1079,7 @@ class WorkPieceDelivery(models.Model): _name = "sf.workpiece.delivery" _description = '工件配送' + delivery_num = fields.Char('工件配送编码') workorder_id = fields.Many2one('mrp.workorder', string='工单', readonly=True) production_id = fields.Many2one('mrp.production', string='制造订单', readonly=True) production_line_id = fields.Many2one('sf.production.line', compute='_compute_production_line_id', @@ -1133,8 +1135,8 @@ class WorkPieceDelivery(models.Model): # 配送至avg小车 def _delivery_avg(self): agv_site = self.env['sf.agv.site'].search([]) - if agv_site: - agv_site.update_site_state() + # if agv_site: + # agv_site.update_site_state() config = self.env['res.config.settings'].get_values() positionCode_Arr = [] if self.feeder_station_start_id: @@ -1147,7 +1149,7 @@ class WorkPieceDelivery(models.Model): 'positionCode': self.feeder_station_destination_id.name, 'code': '00' }) - res = {'reqCode': self.production_id.name, 'reqTime': '', 'clientCode': '', 'tokenCode': '', + res = {'reqCode': self.delivery_num, 'reqTime': '', 'clientCode': '', 'tokenCode': '', 'taskTyp': 'F01', 'ctnrTyp': '', 'ctnrCode': '', 'wbCode': config['wbcode'], 'positionCodePath': positionCode_Arr, 'podCode': '',