From 4975835cf3c7eda589f49298e22efbfa0c206ccf Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 3 Feb 2023 01:18:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=B8=9A=E5=8A=A1=E5=B9=B3?=
=?UTF-8?q?=E5=8F=B0=EF=BC=8C=E8=BF=94=E5=9B=9E=E5=8A=A0=E5=B7=A5=E4=B8=AD?=
=?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/.gitignore | 8 ++++++++
.../inspectionProfiles/profiles_settings.xml | 6 ++++++
.idea/jikimo-sf.iml | 20 +++++++++++++++++++
.idea/misc.xml | 4 ++++
.idea/modules.xml | 9 +++++++++
.idea/vcs.xml | 6 ++++++
sf_bf_connect/controllers/controllers.py | 5 +++++
sf_bf_connect/models/__init__.py | 2 +-
sf_machine_connect/views/compensation.xml | 1 +
9 files changed, 60 insertions(+), 1 deletion(-)
create mode 100644 .idea/.gitignore
create mode 100644 .idea/inspectionProfiles/profiles_settings.xml
create mode 100644 .idea/jikimo-sf.iml
create mode 100644 .idea/misc.xml
create mode 100644 .idea/modules.xml
create mode 100644 .idea/vcs.xml
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..35410cac
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 00000000..105ce2da
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jikimo-sf.iml b/.idea/jikimo-sf.iml
new file mode 100644
index 00000000..ea0ee661
--- /dev/null
+++ b/.idea/jikimo-sf.iml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..9e0e1599
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..1ccf48a0
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..94a25f7f
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sf_bf_connect/controllers/controllers.py b/sf_bf_connect/controllers/controllers.py
index 07854e2b..41ef3bf3 100644
--- a/sf_bf_connect/controllers/controllers.py
+++ b/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)
diff --git a/sf_bf_connect/models/__init__.py b/sf_bf_connect/models/__init__.py
index 1b8cfb6d..5515b076 100644
--- a/sf_bf_connect/models/__init__.py
+++ b/sf_bf_connect/models/__init__.py
@@ -1,4 +1,4 @@
from . import http
from . import models
-
+from . import process_status
diff --git a/sf_machine_connect/views/compensation.xml b/sf_machine_connect/views/compensation.xml
index 77ee1012..5acb54e3 100644
--- a/sf_machine_connect/views/compensation.xml
+++ b/sf_machine_connect/views/compensation.xml
@@ -11,6 +11,7 @@
+