新增表面工艺外协需求

sf_manufacturing/models/mrp_workorder.py

@@ -29,7 +29,7 @@ class ResMrpWorkOrder(models.Model):
         ('CNC加工', 'CNC加工'),
         ('后置三元质量检测', '后置三元质量检测'),
         ('解除装夹', '解除装夹'),
-        ('切割', '切割')
+        ('切割', '切割'), ('绑定表面工艺', '绑定表面工艺')
     ], string="工序类型")
     results = fields.Char('检测结果')
 
@@ -137,7 +137,7 @@ class ResMrpWorkOrder(models.Model):
         except:
             raise UserError("参数计算有误")
 
-    #拼接工单对象属性值
+    # 拼接工单对象属性值
     def json_workorder_str(self, k, production, route):
         workorders_values_str = [0, '', {
             'product_uom_id': production.product_uom_id.id,
@@ -203,9 +203,9 @@ class ResMrpWorkOrder(models.Model):
         else:
             raise UserError('托盘码不能为空')
 
-    #验证坯料序列号是否正确
-    def pro_code_is_ok(self,barcode):
-        if barcode!=False:
+    # 验证坯料序列号是否正确
+    def pro_code_is_ok(self, barcode):
+        if barcode != False:
             if barcode != self.pro_code:
                 raise UserError('坯料序列号错误')
                 return False
@@ -216,7 +216,7 @@ class ResMrpWorkOrder(models.Model):
 
     pro_code_ok = fields.Boolean(default=False)
 
-    #托盘扫码绑定
+    # 托盘扫码绑定
     def gettray_auto(self, barcode):
         if barcode != False:
             values = self.env['sf.tray'].search([("code", "=", barcode)])
@@ -255,7 +255,6 @@ class ResMrpWorkOrder(models.Model):
         else:
             raise UserError('托盘码不能为空')
 
-
     # 解除托盘绑定
     def unbindtray(self):
         tray = self.env['sf.tray'].search([("production_id", "=", self.production_id.id)])
@@ -393,7 +392,6 @@ class ResMrpWorkOrder(models.Model):
         }]
         return workorders_values_str
 
-
     # 重写工单开始按钮方法
     def button_start(self):
         if self.routing_type == '装夹':
@@ -467,7 +465,6 @@ class CNCprocessing(models.Model):
     workorder_id = fields.Many2one('mrp.workorder', string="工单")
     button_state = fields.Boolean(string='是否已经下发')
 
-
     # mrs下发编程单创建CNC加工
     def cnc_processing_create(self, cnc_workorder, ret):
         logging.info('ret:%s' % ret)
@@ -567,8 +564,6 @@ class SfWorkOrderBarcodes(models.Model):
         else:
             self.pro_code_ok = workorder.pro_code_is_ok(barcode)
 
-
-
         # return {
         #     'type': 'ir.actions.act_window',
         #     'name': '工单',
@@ -577,5 +572,3 @@ class SfWorkOrderBarcodes(models.Model):
         #     'context': {'active_id': self.id},
         #     # 'target': 'current',
         # }
-
-