Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺排序

# Conflicts:
#	sf_manufacturing/models/stock.py
#	sf_mrs_connect/controllers/controllers.py

sf_base/models/common.py

@@ -97,7 +97,7 @@ class MrsProductionProcess(models.Model):
     # workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_process', required=True)
     processing_day = fields.Float('加工天数/d')
     travel_day = fields.Float('路途天数/d')
-
+    sequence = fields.Integer('排序')
 
 # class MrsProcessingTechnology(models.Model):
 #     _name = 'sf.processing.technology'
@@ -149,6 +149,7 @@ class MrsProductionProcessParameter(models.Model):
     processing_day = fields.Float('加工天数/d')
     travel_day = fields.Float('路途天数/d')
     active = fields.Boolean('有效', default=True)
+    processing_mm = fields.Char('加工厚度/mm')
 
     def name_get(self):
         result = []