diff --git a/sf_dlm/views/product_template_view.xml b/sf_dlm/views/product_template_view.xml index fbc12cee..a1322117 100644 --- a/sf_dlm/views/product_template_view.xml +++ b/sf_dlm/views/product_template_view.xml @@ -398,11 +398,10 @@ - + - + @@ -453,10 +452,10 @@ + attrs='{"invisible": [("fixture_material_type","not in",("虎钳夹具","零点卡盘","零点托盘"))]}'/> + attrs='{"invisible": [("fixture_material_type","not in",("零点卡盘","零点托盘"))]}'/> diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py index b81c3b5e..caadb6c2 100644 --- a/sf_sale/models/quick_easy_order.py +++ b/sf_sale/models/quick_easy_order.py @@ -83,16 +83,17 @@ class QuickEasyOrder(models.Model): obj = super(QuickEasyOrder, self).create(vals) # self.model_coloring(obj) + logging.info('---------开始派单到工厂-------') self.distribute_to_factory(obj) obj.state = '待接单' return obj # 将attach的datas内容转为glb文件 def transition_glb_file(self, report_path, model_code): - # output_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(model_code) + '.stl') + shapes = read_step_file(report_path) output_file = os.path.join('/tmp', str(model_code) + '.stl') + write_stl_file(shapes, output_file, 'binary', 0.03, 0.5) # 转化为glb - # output_glb_file = os.path.join('C:/Users/43484/Desktop/机企猫工作文档', str(model_code) + '.glb') output_glb_file = os.path.join('/tmp', str(model_code) + '.glb') util_path = get_resource_path('sf_dlm', 'static/util') cmd = 'python3 %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file) @@ -130,7 +131,7 @@ class QuickEasyOrder(models.Model): item.model_height = boxshape[2] # 高 item.model_volume = boxshape[0] * boxshape[1] * boxshape[2] item.model_feature = json.dumps(ret['feature_infos'], ensure_ascii=False) - # self._get_price(item) + self._get_price(item) else: item.model_file = False item.model_feature = False @@ -145,6 +146,7 @@ class QuickEasyOrder(models.Model): :return: """ try: + logging.info('---------派单到工厂-------') res = {'bfm_process_order_list': []} for item in obj: attachment = item.upload_model_file[0] @@ -181,10 +183,11 @@ class QuickEasyOrder(models.Model): company_id = self.env.ref('base.main_company').sudo() # user_id = request.env.ref('base.user_admin').sudo() order_id = self.env['sale.order'].sale_order_create(company_id, 'XXXXX', 'XXXXX', 'XXXXX', - str(datetime.now())) + str(datetime.now()), '现结', '支付宝') i = 1 # 给sale_order的default_code字段赋值 aa = self.env['sale.order'].sudo().search([('name', '=', order_id.name)]) + logging.info('---------aa------- %s' % aa.name) aa.default_code = obj.name for item in res['bfm_process_order_list']: product = self.env['product.template'].sudo().product_create(product_id, item, order_id, @@ -237,11 +240,10 @@ class QuickEasyOrder(models.Model): product_bom_purchase.bom_create_line_has(purchase_embryo) order_id.with_user(self.env.ref("base.user_admin")).sale_order_create_line(product, item) except Exception as e: - self.cr.rollback() + # self.cr.rollback() return UserError('工厂创建销售订单和产品失败，请联系管理员') - -# 特征识别 + # 特征识别 def feature_recognition(self, report_path, model_code): feature_path = self.env['sf.auto_quatotion.common'].sudo().get_feature_full_path() process_time_db_path = self.env['sf.auto_quatotion.common'].sudo().get_process_time_db_path() diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index c57aa780..35d877fe 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -1,6 +1,7 @@ from odoo import models, fields import datetime import base64 +import logging class ReSaleOrder(models.Model): @@ -16,6 +17,7 @@ class ReSaleOrder(models.Model): # 业务平台分配工厂后在智能工厂先创建销售订单 def sale_order_create(self, company_id, delivery_name, delivery_telephone, delivery_address, deadline_of_delivery, payments_way, pay_way): + logging.info('---------sale_order_create------') now_time = datetime.datetime.now() partner = self.get_customer() order_id = self.env['sale.order'].sudo().create({ diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml index 1e079896..0e9f7386 100644 --- a/sf_tool_management/views/tool_base_views.xml +++ b/sf_tool_management/views/tool_base_views.xml @@ -1101,6 +1101,8 @@ + + @@ -1125,78 +1127,58 @@ - -
- -
- - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - -
- - - + + + + - - - - - - - - - - + + +
+ +
+ + + + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + + + +
@@ -1205,17 +1187,9 @@ - - - - - - - - - + @@ -1227,43 +1201,14 @@ - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - + +