diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index c240bed0..3b53efc2 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -135,12 +135,13 @@
-
-
-
-
+
+
+
+
+
diff --git a/sf_warehouse/models/sync_common.py b/sf_warehouse/models/sync_common.py
index 15b632f6..90d62e13 100644
--- a/sf_warehouse/models/sync_common.py
+++ b/sf_warehouse/models/sync_common.py
@@ -20,7 +20,7 @@ class MrsShelfLocationDataSync(models.Model):
paired_data = list(zip(my_data, their_data))
return paired_data
- shelf_1_obj = self.env['sf.shelf'].search([('name', '=', '一号线边刀架')], limit=1)
+ shelf_1_obj = self.env['sf.shelf'].search([('name', '=', '一号产线-一号线边刀架')], limit=1)
tool_location_objs_1 = self.env['sf.shelf.location'].search([('shelf_id', '=', shelf_1_obj.id)], order='id')
location_codes_1 = [location.barcode for location in tool_location_objs_1]
@@ -32,7 +32,7 @@ class MrsShelfLocationDataSync(models.Model):
aligned_data_1 = align_data(location_codes_1, their_data_1)
# 2
- shelf_2_obj = self.env['sf.shelf'].search([('name', '=', '二号线边刀架')], limit=1)
+ shelf_2_obj = self.env['sf.shelf'].search([('name', '=', '一号产线-二号线边刀架')], limit=1)
tool_location_objs_2 = self.env['sf.shelf.location'].search([('shelf_id', '=', shelf_2_obj.id)], order='id')
location_codes_2 = [location.barcode for location in tool_location_objs_2]
@@ -44,7 +44,7 @@ class MrsShelfLocationDataSync(models.Model):
aligned_data_2 = align_data(location_codes_2, their_data_2)
# 4
- shelf_4_obj = self.env['sf.shelf'].search([('name', '=', '一号线边料架')], limit=1)
+ shelf_4_obj = self.env['sf.shelf'].search([('name', '=', '一号产线-一号线边料架')], limit=1)
tool_location_objs_4 = self.env['sf.shelf.location'].search([('shelf_id', '=', shelf_4_obj.id)], order='id')
location_codes_4 = [location.barcode for location in tool_location_objs_4]
@@ -56,7 +56,7 @@ class MrsShelfLocationDataSync(models.Model):
aligned_data_4 = align_data(location_codes_4, their_data_4)
# 3
- shelf_3_obj = self.env['sf.shelf'].search([('name', '=', '一号线边料架')], limit=1)
+ shelf_3_obj = self.env['sf.shelf'].search([('name', '=', '一号产线-二号线边料架')], limit=1)
tool_location_objs_3 = self.env['sf.shelf.location'].search([('shelf_id', '=', shelf_3_obj.id)], order='id')
location_codes_3 = [location.barcode for location in tool_location_objs_3]
@@ -68,7 +68,7 @@ class MrsShelfLocationDataSync(models.Model):
aligned_data_3 = align_data(location_codes_3, their_data_3)
# 5
- shelf_5_obj = self.env['sf.shelf'].search([('name', '=', '一号线边料架')], limit=1)
+ shelf_5_obj = self.env['sf.shelf'].search([('name', '=', '一号产线-三号线边料架')], limit=1)
tool_location_objs_5 = self.env['sf.shelf.location'].search([('shelf_id', '=', shelf_5_obj.id)], order='id')
location_codes_5 = [location.barcode for location in tool_location_objs_5]