修改胚料部分

sf_bf_connect/__manifest__.py

@@ -10,9 +10,9 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.cs.jikimo.com',
-    'depends': ['sf_base'],
+    'depends': ['sf_base', 'sf_sale', 'sf_dlm'],
     'data': [
-
+        'views/res_partner_view.xml'
     ],
     'demo': [
     ],

sf_bf_connect/controllers/controllers.py

@@ -8,7 +8,7 @@ from odoo.http import request
 
 class Sf_Bf_Connect(http.Controller):
 
-    @http.route('/api/bfm_process_order/list', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
+    @http.route('/api/bfm_process_order/list', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def get_bfm_process_order_list(self, **kw):
         """
@@ -23,17 +23,43 @@ class Sf_Bf_Connect(http.Controller):
             ret = json.loads(datas)
             ret = json.loads(ret['result'])
             product_id = request.env.ref('sf_dlm.product_template_sf').sudo()
+            self_machining_id = request.env.ref('sf_dlm.product_embryo_sf_self_machining').sudo()
+            outsource_id = request.env.ref('sf_dlm.product_embryo_sf_outsource').sudo()
+            purchase_id = request.env.ref('sf_dlm.product_embryo_sf_purchase').sudo()
             company_id = request.env.ref('base.main_company').sudo()
-            order_id = request.env['sale.order'].with_user(request.env.ref("base.user_admin")).sale_order_create(ret['delivery_end_date'], company_id)
+            order_id = request.env['sale.order'].with_user(request.env.ref("base.user_admin")).sale_order_create(
+                company_id, ret['delivery_name'], ret['delivery_telephone'], ret['delivery_address'],
+                ret['delivery_end_date'])
             i = 1
             for item in ret['bfm_process_order_list']:
                 product = request.env['product.template'].sudo().product_create(product_id, item, order_id,
                                                                                 ret['order_number'], i)
                 order_id.with_user(request.env.ref("base.user_admin")).sale_order_create_line(product, item)
-                bom = request.env['mrp.bom'].with_user(request.env.ref("base.user_admin")).bom_create(product)
-                bom.with_user(request.env.ref("base.user_admin")).bom_create_Line(product)
-                i += 1
-            res['factory_order_no'] = order_id.name
+                bom_data = request.env['mrp.bom'].with_user(request.env.ref("base.user_admin")).get_bom(product)
+                if bom_data:
+                    bom = request.env['mrp.bom'].with_user(request.env.ref("base.user_admin")).bom_create(product,
+                                                                                                          'normal')
+                    bom.with_user(request.env.ref("base.user_admin")).bom_create_Line(product)
+                else:
+                    if product.materials_id.gain_way == '自加工':
+                        self_machining = request.env['product.template'].sudo().no_bom_product_create(self_machining_id,
+                                                                                                      item,
+                                                                                                      order_i)
+                        bom = request.env['mrp.bom'].with_user(request.env.ref("base.user_admin")).bom_create(
+                            self_machining, 'normal')
+                        bom.with_user(request.env.ref("base.user_admin")).bom_create_Line(self_machining)
+
+                    elif product.materials_id.gain_way == '外协':
+                        outsource = request.env['product.template'].sudo().no_bom_product_create(outsource_id, item,
+                                                                                                 order_id)
+                        bom = request.env['mrp.bom'].with_user(request.env.ref("base.user_admin")).bom_create(outsource)
+                        bom.with_user(request.env.ref("base.user_admin")).bom_create_Line(outsource, 'subcontract')
+                    elif product.materials_id.gain_way == '采购':
+                        purchase = request.env['product.template'].sudo().no_bom_product_create(purchase_id, item,
+                                                                                                order_id)
+
+                        i += 1
+                        res['factory_order_no'] = order_id.name
             return json.JSONEncoder().encode(res)
         except Exception as e:
             logging.info('get_bfm_process_order_list error:%s' % e)

sf_bf_connect/models/http.py

@@ -4,12 +4,14 @@ import datetime
 import time
 import hashlib
 from odoo import fields, models, api
-from odoo.http import request, AuthenticationError
+from odoo.http import request
 
 __author__ = 'jinling.yang'
 
 _logger = logging.getLogger(__name__)
 
+class AuthenticationError(Exception):
+    pass
 
 class Http(models.AbstractModel):
     _inherit = 'ir.http'
@@ -23,6 +25,7 @@ class Http(models.AbstractModel):
             # 查询密钥
             factory_secret = request.env['res.partner'].sudo().search(
                 [('sf_token', '=', datas['HTTP_TOKEN'])], limit=1)
+            logging.info('factory_secret:%s' % factory_secret)
             if not factory_secret:
                 raise AuthenticationError('无效的token')
             timestamp_str = int(time.time())

sf_bf_connect/models/models.py

@@ -25,4 +25,5 @@ class ResPartner(models.Model):
         return ran_str
 
     sf_token = fields.Char(u'Token', default=get_token)
-    sf_secret_key = fields.Char(u'密钥', default=get_secret)
+    sf_secret_key = fields.Char(u'密钥', default=get_secret)
+

sf_bf_connect/views/res_partner_view.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="view_partner_form_sf" model="ir.ui.view">
+            <field name="name">view_partner_form</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+            <xpath expr="//page[last()]" position="before">
+                <page string="token和密钥">
+                        <group>
+                            <field name="sf_token"/>
+                            <field name="sf_secret_key"/>
+                        </group>
+                </page>
+            </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>