From 869e3e4b4f8c7815508b2c96209f3b5c3295846d Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Thu, 4 Jul 2024 16:12:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E2=80=9D=E5=88=B6=E9=80=A0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AE=8C=E5=B7=A5=E5=90=8E=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93=E5=8D=95=E8=BF=98?= =?UTF-8?q?=E6=98=AF=E7=AD=89=E5=BE=85=E7=8A=B6=E6=80=81-=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E6=98=AF=E5=B0=B1=E7=BB=AA=E7=8A=B6=E6=80=81=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_bf_connect/models/jd_eclp.py | 3 +++ sf_manufacturing/models/mrp_production.py | 2 +- sf_manufacturing/models/mrp_workorder.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sf_bf_connect/models/jd_eclp.py b/sf_bf_connect/models/jd_eclp.py index 7879938e..ec14f7e1 100644 --- a/sf_bf_connect/models/jd_eclp.py +++ b/sf_bf_connect/models/jd_eclp.py @@ -161,6 +161,9 @@ class JdEclp(models.Model): url2 = config['bfm_url'] + '/api/get/jd/no' response = requests.post(url2, json=json2, data=None) # _logger.info('调用成功2', response.json()['result']['wbNo']) + tem_ret = response.json().get('result') + if not tem_ret: + raise ValidationError('京东物流返回异常，请联系管理员') self.carrier_tracking_ref = response.json()['result'].get('wbNo') if not self.carrier_tracking_ref: raise ValidationError('物流下单未成功，请联系管理员') diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py index 73782a9c..b226b034 100644 --- a/sf_manufacturing/models/mrp_production.py +++ b/sf_manufacturing/models/mrp_production.py @@ -633,7 +633,7 @@ class MrpProduction(models.Model): logging.info('qty_produced:%s' % production.qty_produced) production.write({ 'date_finished': fields.Datetime.now(), - 'product_qty': production.product_qty if production.qty_produced < 1.0 else production.qty_produced, + 'product_qty': production.qty_produced, 'priority': '0', 'is_locked': True, 'state': 'done', diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 46bcde47..30903894 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -1016,7 +1016,7 @@ class ResMrpWorkOrder(models.Model): move_raw_id.quantity_done = move_raw_id.product_uom_qty record.process_state = '已完工' record.production_id.process_state = '已完工' - if record.routing_type in ['解除装夹', '表面工艺']: + if record.routing_type in ['表面工艺']: raw_move = self.env['stock.move'].sudo().search( [('origin', '=', record.production_id.name), ('procure_method', 'in', ['make_to_order', 'make_to_stock']),