修改获取CNC程序从工单到制造订单

sf_manufacturing/models/mrp_production.py

@@ -2,6 +2,7 @@
 import base64
 import logging
 import re
+import requests
 from odoo import api, fields, models, _
 from odoo.exceptions import UserError
 from odoo.addons.sf_base.commons.common import Common
@@ -24,6 +25,7 @@ class MrpProduction(models.Model):
     programming_no = fields.Char('编程单号')
     work_state = fields.Char('业务状态')
     programming_state = fields.Char('编程状态')
+    glb_file = fields.Binary("glb模型文件")
 
     def action_check(self):
         """
@@ -55,7 +57,7 @@ class MrpProduction(models.Model):
             production.maintenance_count = len(production.request_ids)
 
     # cnc程序获取
-    def fetchCNC(self, requests=None):
+    def fetchCNC(self):
         cnc = self.env['mrp.production'].search([('id', '=', self.id)])
         try:
             res = {'model_code': '' if not cnc.product_id.model_code else cnc.product_id.model_code,
@@ -81,6 +83,7 @@ class MrpProduction(models.Model):
             config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
             url = '/api/intelligent_programming/create'
             config_url = configsettings['sf_url'] + url
+            res['token'] = configsettings['token']
             # res_str = json.dumps(res)
             ret = requests.post(config_url, json={}, data=res, headers=config_header)
             ret = ret.json()
@@ -182,6 +185,7 @@ class MrpProduction(models.Model):
                         'state': 'pending',
                     }]
             if production.product_id.categ_id.type == '成品':
+                production.fetchCNC()
                 # 根据加工面板的面数及对应的工序模板生成工单
                 i = 0
                 processing_panel_len = len(production.product_id.model_processing_panel.split(','))