From 366e81626809cc6d3f081ad4fba112db8fca8193 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 15 Aug 2024 16:45:39 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E8=B4=A7=E4=BD=8D?=
=?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=8E=A5=E5=8F=A3=E3=80=81=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=BA=93=E5=AD=98=E4=BF=A1=E6=81=AF=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=EF=BC=9B2=E3=80=81=E9=9A=90=E8=97=8F=E5=B7=B2?=
=?UTF-8?q?=E5=8F=96=E6=B6=88=E7=8A=B6=E6=80=81=E7=9A=84=E9=94=80=E5=94=AE?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E3=80=90=E7=A1=AE=E8=AE=A4=E6=8E=A5?=
=?UTF-8?q?=E5=8D=95=E3=80=91=E5=92=8C=E3=80=90=E5=8F=96=E6=B6=88=E3=80=91?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=9B3=E3=80=81=E5=A4=84=E7=90=86?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=80=E5=85=B7=E4=BB=8E=E7=BA=BF=E8=BE=B9?=
=?UTF-8?q?=E5=88=80=E5=BA=93=E5=88=B0=E5=88=80=E5=85=B7=E6=88=BF=E6=B2=A1?=
=?UTF-8?q?=E6=9C=89=E7=94=9F=E6=88=90=E7=A7=BB=E5=8A=A8=E5=8E=86=E5=8F=B2?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_manufacturing/controllers/controllers.py | 29 +++--
sf_sale/views/sale_order_view.xml | 6 +-
sf_tool_management/models/functional_tool.py | 41 +++----
.../models/maintenance_equipment.py | 2 +-
sf_warehouse/models/sync_common.py | 111 ++++++++++--------
5 files changed, 104 insertions(+), 85 deletions(-)
diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 8075f126..50ad39b1 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -386,7 +386,7 @@ class Manufacturing_Connect(http.Controller):
ret = json.loads(datas)
request.env['center_control.interface.log'].sudo().create(
{'content': ret, 'name': 'AutoDeviceApi/LocationChange'})
- logging.info('LocationChange_ret===========:%s' % ret)
+ logging.info('库位变更LocationChange_ret:%s' % ret)
RfidCode = ret['RfidCode']
ChangeType = ret['ChangeType']
OldDeciveId = ret['OldDeciveId']
@@ -429,25 +429,36 @@ class Manufacturing_Connect(http.Controller):
# 对功能刀具库位变更信息进行更改
def write_tool(DeciveId):
if 'Tool' in DeciveId:
- shelfinfo = self.env['sf.shelf.location'].get_sf_shelf_location_info(DeciveId)
+ shelfinfo = list(filter(lambda x: x.get('DeviceId') == DeciveId,
+ request.env['sf.shelf.location'].sudo().get_sf_shelf_location_info(
+ DeciveId)))
+ total_data = request.env['sf.shelf.location.datasync'].sudo().get_total_data()
for item in shelfinfo:
- shelf_barcode = self.env['sf.shelf.location.datasync'].find_our_code(item['Postion'])
- location_id = self.env['sf.shelf.location'].search([('barcode', '=', shelf_barcode)],
- limit=1)
+ shelf_barcode = request.env['sf.shelf.location.datasync'].sudo().find_our_code(
+ total_data, item['Postion'])
+ location_id = request.env['sf.shelf.location'].sudo().search(
+ [('barcode', '=', shelf_barcode)],
+ limit=1)
if location_id:
# 如果是线边刀库信息,则对功能刀具移动生成记录
if 'Tool' in item['Postion']:
- tool = self.env['sf.functional.cutting.tool.entity'].sudo().search(
+ tool = request.env['sf.functional.cutting.tool.entity'].sudo().search(
[('rfid', '=', item['RfidCode']), ('functional_tool_status', '!=', '已拆除')])
- tool.tool_in_out_stock_location(location_id)
+ tool.sudo().tool_in_out_stock_location(location_id)
if tool:
location_id.product_sn_id = tool.barcode_id.id
+ # 修改功能刀具状态
+ # tool_install_time = {'Nomal': '正常', 'Warning': '报警'}
+ # tool.write({
+ # 'functional_tool_status': tool_install_time.get(item['State'])
+ # })
else:
location_id.product_sn_id = False
+ logging.info('货架已获取信息:%s' % item)
else:
- equipment_id = self.env['maintenance.equipment'].search([('name', '=', DeciveId)])
+ equipment_id = request.env['maintenance.equipment'].sudo().search([('name', '=', DeciveId)])
if equipment_id:
- equipment_id.register_equipment_tool()
+ equipment_id.sudo().register_equipment_tool()
else:
res_1 = {'Succeed': False, 'ErrorCode': 202, 'Error': f'设备【{DeciveId}】不存在'}
return json.JSONEncoder().encode(res_1)
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 75e2d0c1..ce27a4df 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -42,12 +42,12 @@
+ attrs="{'invisible': ['|','&','|',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&','&',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel']),('delivery_status', '!=', False),('state', 'in', ['cancel'])]}"/>
- {'invisible': ['|','&',('check_status', '!=', 'approved'),('state',
+ {'invisible': ['|','&','|', ('check_status', '!=', 'approved'),('state',
'in', ['draft','cancel']),'&','&',('check_status', '=', 'approved'),('state', 'in',
- ['sale','cancel']),('delivery_status', '!=', False)]}
+ ['sale','cancel']),('delivery_status', '!=', False), ('state', 'in', ['cancel'])]}
diff --git a/sf_tool_management/models/functional_tool.py b/sf_tool_management/models/functional_tool.py
index d398b87b..06078528 100644
--- a/sf_tool_management/models/functional_tool.py
+++ b/sf_tool_management/models/functional_tool.py
@@ -118,27 +118,28 @@ class FunctionalCuttingToolEntity(models.Model):
def tool_in_out_stock_location(self, location_id):
tool_room_id = self.env['stock.location'].search([('name', '=', '刀具房')])
pre_manufacturing_id = self.env['stock.location'].search([('name', '=', '制造前')])
- for item in self:
- # 中控反馈该位置有刀
- if item:
- # 系统该位置有刀
- if location_id.product_sn_id:
- # 中控反馈和系统中，该位置是同一把刀
- if item.barcode_id == location_id.product_sn_id:
- return True
- # 中控反馈和系统中，该位置不是同一把刀
- else:
- # 原刀从线边出库
- item.tool_in_out_stock_location_1(location_id, tool_room_id)
- # 新刀入库到线边
- item.create_stock_move(pre_manufacturing_id, location_id)
- item.current_shelf_location_id = location_id.id
+ if self:
+ for item in self:
+ # 中控反馈该位置有刀
+ if item:
+ # 系统该位置有刀
+ if location_id.product_sn_id:
+ # 中控反馈和系统中，该位置是同一把刀
+ if item.barcode_id == location_id.product_sn_id:
+ return True
+ # 中控反馈和系统中，该位置不是同一把刀
+ else:
+ # 原刀从线边出库
+ item.tool_in_out_stock_location_1(location_id, tool_room_id)
+ # 新刀入库到线边
+ item.create_stock_move(pre_manufacturing_id, location_id)
+ item.current_shelf_location_id = location_id.id
- # 中控反馈该位置没有刀
- else:
- # 系统该位置有刀
- if location_id.product_sn_id:
- item.tool_in_out_stock_location_1(location_id, tool_room_id)
+ # 中控反馈该位置没有刀
+ else:
+ # 系统该位置有刀
+ if location_id.product_sn_id:
+ self.tool_in_out_stock_location_1(location_id, tool_room_id)
def tool_in_out_stock_location_1(self, location_id, tool_room_id):
tool = self.env['sf.functional.cutting.tool.entity'].search(
diff --git a/sf_tool_management/models/maintenance_equipment.py b/sf_tool_management/models/maintenance_equipment.py
index 48bc531f..18142e24 100644
--- a/sf_tool_management/models/maintenance_equipment.py
+++ b/sf_tool_management/models/maintenance_equipment.py
@@ -53,7 +53,7 @@ class SfMaintenanceEquipment(models.Model):
params = {"DeviceId": self.name}
r = requests.get(crea_url, params=params, headers=headers)
ret = r.json()
- logging.info('register_equipment_tool:%s' % ret)
+ logging.info('机床刀库register_equipment_tool():%s' % ret)
datas = ret['Datas']
self.write_maintenance_equipment_tool(datas)
if ret['Succeed']:
diff --git a/sf_warehouse/models/sync_common.py b/sf_warehouse/models/sync_common.py
index 32632eac..f0f2fc93 100644
--- a/sf_warehouse/models/sync_common.py
+++ b/sf_warehouse/models/sync_common.py
@@ -13,79 +13,80 @@ class MrsShelfLocationDataSync(models.Model):
_name = 'sf.shelf.location.datasync'
_description = '同步库存信息'
- def find_our_code(self, their_code):
+ def get_total_data(self):
# 建立对应关系的函数
def align_data(my_data, their_data):
paired_data = list(zip(my_data, their_data))
return paired_data
- def get_total_data():
- 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')
+ logging.info('============================get_total_data()======================')
+ 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]
- print(location_codes_1)
- # 对方的数据列表
- their_data_1 = [f"ToolCab1-{i:02}" for i in range(1, 73)]
+ location_codes_1 = [location.barcode for location in tool_location_objs_1]
+ print(location_codes_1)
+ # 对方的数据列表
+ their_data_1 = [f"ToolCab1-{i:02}" for i in range(1, 73)]
- # 执行对齐
- aligned_data_1 = align_data(location_codes_1, their_data_1)
+ # 执行对齐
+ aligned_data_1 = align_data(location_codes_1, their_data_1)
- # 2
- 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')
+ # 2
+ 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]
- print(location_codes_2)
- # 对方的数据列表
- their_data_2 = [f"ToolCab2-{i:02}" for i in range(1, 73)]
+ location_codes_2 = [location.barcode for location in tool_location_objs_2]
+ print(location_codes_2)
+ # 对方的数据列表
+ their_data_2 = [f"ToolCab2-{i:02}" for i in range(1, 73)]
- # 执行对齐
- aligned_data_2 = align_data(location_codes_2, their_data_2)
+ # 执行对齐
+ aligned_data_2 = align_data(location_codes_2, their_data_2)
- # 4
- 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')
+ # 4
+ 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]
- print(location_codes_4)
- # 对方的数据列表
- their_data_4 = [f"PartCab4-{i:02}" for i in range(1, 17)]
+ location_codes_4 = [location.barcode for location in tool_location_objs_4]
+ print(location_codes_4)
+ # 对方的数据列表
+ their_data_4 = [f"PartCab4-{i:02}" for i in range(1, 17)]
- # 执行对齐
- aligned_data_4 = align_data(location_codes_4, their_data_4)
+ # 执行对齐
+ aligned_data_4 = align_data(location_codes_4, their_data_4)
- # 3
- 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')
+ # 3
+ 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]
- print(location_codes_3)
- # 对方的数据列表
- their_data_3 = [f"PartCab3-{i:02}" for i in range(1, 13)]
+ location_codes_3 = [location.barcode for location in tool_location_objs_3]
+ print(location_codes_3)
+ # 对方的数据列表
+ their_data_3 = [f"PartCab3-{i:02}" for i in range(1, 13)]
- # 执行对齐
- aligned_data_3 = align_data(location_codes_3, their_data_3)
+ # 执行对齐
+ aligned_data_3 = align_data(location_codes_3, their_data_3)
- # 5
- 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')
+ # 5
+ 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]
- print(location_codes_5)
- # 对方的数据列表
- their_data_5 = [f"PartCab5-{i:02}" for i in range(1, 13)]
+ location_codes_5 = [location.barcode for location in tool_location_objs_5]
+ print(location_codes_5)
+ # 对方的数据列表
+ their_data_5 = [f"PartCab5-{i:02}" for i in range(1, 13)]
- # 执行对齐
- aligned_data_5 = align_data(location_codes_5, their_data_5)
+ # 执行对齐
+ aligned_data_5 = align_data(location_codes_5, their_data_5)
- total_data = aligned_data_1 + aligned_data_2 + aligned_data_3 + aligned_data_4 + aligned_data_5
- print(total_data)
- logging.info(f"total_data: {total_data}")
- return total_data
+ total_data = aligned_data_1 + aligned_data_2 + aligned_data_3 + aligned_data_4 + aligned_data_5
+ print(total_data)
+ logging.info(f"total_data: {total_data}")
+ return total_data
- for code_pair in get_total_data():
+ def find_our_code(self, total_data, their_code):
+ for code_pair in total_data:
if code_pair[1] == their_code:
return code_pair[0]
return None # 如果没有找到对应的值，返回None或适当的默认值
@@ -106,9 +107,10 @@ class MrsShelfLocationDataSync(models.Model):
equipment_id.register_equipment_tool()
shelfinfo = self.env['sf.shelf.location'].get_sf_shelf_location_info()
+ total_data = self.get_total_data()
print('shelfinfo:', shelfinfo)
for item in shelfinfo:
- shelf_barcode = self.find_our_code(item['Postion'])
+ shelf_barcode = self.find_our_code(total_data, item['Postion'])
location_id = self.env['sf.shelf.location'].search([('barcode', '=', shelf_barcode)], limit=1)
if location_id:
# 如果是线边刀库信息,则对功能刀具移动生成记录
@@ -118,6 +120,11 @@ class MrsShelfLocationDataSync(models.Model):
tool.tool_in_out_stock_location(location_id)
if tool:
location_id.product_sn_id = tool.barcode_id.id
+ # 修改功能刀具状态
+ # tool_install_time = {'Nomal': '正常', 'Warning': '报警'}
+ # tool.write({
+ # 'functional_tool_status': tool_install_time.get(item['State'])
+ # })
else:
location_id.product_sn_id = False
else: