Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

sf_tool_management/wizard/wizard.py

@@ -831,10 +831,8 @@ class ProductProduct(models.Model):
         new_time = datetime.strptime(str(fields.Date.today()), "%Y-%m-%d").strftime("%Y%m%d")
         code += str(new_time) + '-'
         stock_lot_id = self.env['stock.lot'].sudo().search(
-            [('name', 'like', new_time), ('product_id.name', '=', '功能刀具')],
-            limit=1,
-            order="id desc"
-        )
+            [('name', 'like', new_time), ('product_id.categ_type', '=', '功能刀具'),
+             ('product_id.tracking', '=', 'serial')], limit=1, order="id desc")
         if not stock_lot_id:
             num = "%03d" % 1
         else: