Accept Merge Request #129: (feature/对接业务平台返回状态 -> develop)

Merge Request: 对接业务平台返回进度已完成主体部分

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/129

.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/inspectionProfiles/profiles_settings.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>

.idea/jikimo-sf.iml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="odoo-16.0" />
+  </component>
+  <component name="PyDocumentationSettings">
+    <option name="format" value="PLAIN" />
+    <option name="myDocStringFormat" value="Plain" />
+  </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_FOLDERS">
+      <list>
+        <option value="$MODULE_DIR$/yizuo_login_background_and_styles/templates" />
+      </list>
+    </option>
+  </component>
+</module>

.idea/misc.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (odoo-15.0)" project-jdk-type="Python SDK" />
+</project>

.idea/modules.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/jikimo-sf.iml" filepath="$PROJECT_DIR$/.idea/jikimo-sf.iml" />
+      <module fileurl="file://$PROJECT_DIR$/../../../odoo-16.0/.idea/odoo-16.0.iml" filepath="$PROJECT_DIR$/../../../odoo-16.0/.idea/odoo-16.0.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

sf_bf_connect/controllers/controllers.py

@@ -29,6 +29,11 @@ class Sf_Bf_Connect(http.Controller):
                 company_id, kw['delivery_name'], kw['delivery_telephone'], kw['delivery_address'],
                 kw['delivery_end_date'])
             i = 1
+            # 给sale_order的default_code字段赋值
+            aa = request.env['sale.order'].sudo().search([('name', '=', order_id.name)])
+            logging.info('get_bfm_process_or===================================:%s' % order_id.name)
+            aa.default_code = kw['order_number']
+            logging.info('get_bfm_process_order_listaaaaaaaaaaaaaaaaaaaaaaaaaaaa================:%s' % aa.default_code)
             for item in bfm_process_order_list:
                 product = request.env['product.template'].sudo().product_create(product_id, item, order_id,
                                                                                 kw['order_number'], i)

sf_bf_connect/models/__init__.py

@@ -1,4 +1,4 @@
 from . import http
 from . import models
-
+from . import process_status
 

sf_machine_connect/__manifest__.py

@@ -9,7 +9,7 @@
 这是一个模块
 ====================
     """,
-    'category': 'Tools',
+    'category': 'sf',
     'depends': ['sf_base', 'sf_manufacturing', 'barcodes', ],
     'data': [
         # 定义权限组放在最上面