diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 9f6206cb..daf049eb 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -269,8 +269,9 @@ class StockRule(models.Model):
sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
# 根据销售订单号查询快速订单
quick_easy_order = self.env['quick.easy.order'].sudo().search([('sale_order_id', '=', sale_order.id)])
- production.write({'part_number': quick_easy_order.part_drawing_number,
- 'part_drawing': quick_easy_order.machining_drawings})
+ if quick_easy_order:
+ production.write({'part_number': quick_easy_order.part_drawing_number,
+ 'part_drawing': quick_easy_order.machining_drawings})
if sale_order:
# sale_order.write({'schedule_status': 'to schedule'})
self.env['sf.production.plan'].sudo().with_company(company_id).create({
diff --git a/sf_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py
index 1d0487b8..4756a2c5 100644
--- a/sf_sale/models/quick_easy_order_old.py
+++ b/sf_sale/models/quick_easy_order_old.py
@@ -58,6 +58,15 @@ class QuickEasyOrder(models.Model):
part_drawing_number = fields.Char('零件图号')
machining_drawings = fields.Binary('2D加工图纸')
+ machining_drawings_name = fields.Char('2D加工图纸名')
+
+ @api.onchange('machining_drawings_name')
+ def _onchange_machining_drawings_name(self):
+ for item in self:
+ if item.machining_drawings_name:
+ if not item.machining_drawings_name.lower().endswith(
+ '.pdf'):
+ raise ValidationError('文件格式上传有误,请检查文件后缀(不区分大小写)是否为pdf')
@api.onchange('parameter_ids')
def _compute_parameter_ids(self):
@@ -128,6 +137,10 @@ class QuickEasyOrder(models.Model):
if len(item.upload_model_file) > 1:
raise ValidationError('只允许上传一个文件')
if item.upload_model_file:
+ if not item.upload_model_file.name.lower().endswith(
+ '.step') and not item.upload_model_file.name.lower().endswith(
+ '.stp'):
+ raise ValidationError('文件格式上传有误,请检查文件后缀(不区分大小写)是否为step、stp')
file_attachment_id = item.upload_model_file[0]
# 附件路径
report_path = file_attachment_id._full_path(file_attachment_id.store_fname)
diff --git a/sf_sale/views/quick_easy_order_view.xml b/sf_sale/views/quick_easy_order_view.xml
index 7d6f6133..aebb4e97 100644
--- a/sf_sale/views/quick_easy_order_view.xml
+++ b/sf_sale/views/quick_easy_order_view.xml
@@ -80,7 +80,8 @@
-
+
+