jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、优化货位信息接口、库位变更接口。

Browse Source
This commit is contained in:
yuxianghui
2024-08-22 10:31:22 +08:00
parent c57daa2c52
commit 39bc206344
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sf_manufacturing/controllers/controllers.py
View File

@@ -436,6 +436,7 @@ class Manufacturing_Connect(http.Controller):
DeciveId))) DeciveId)))
total_data = request.env['sf.shelf.location.datasync'].sudo().get_total_data() total_data = request.env['sf.shelf.location.datasync'].sudo().get_total_data()
for item in shelfinfo: for item in shelfinfo:
logging.info('货架已获取信息:%s' % item)
shelf_barcode = request.env['sf.shelf.location.datasync'].sudo().find_our_code( shelf_barcode = request.env['sf.shelf.location.datasync'].sudo().find_our_code(
total_data, item['Postion']) total_data, item['Postion'])
location_id = request.env['sf.shelf.location'].sudo().search( location_id = request.env['sf.shelf.location'].sudo().search(
@@ -450,15 +451,15 @@ class Manufacturing_Connect(http.Controller):
if tool: if tool:
location_id.product_sn_id = tool.barcode_id.id location_id.product_sn_id = tool.barcode_id.id
# 修改功能刀具状态 # 修改功能刀具状态
tool_state = {'Nomal': '正常', 'Warning': '报警'} if item.get('State') == '报警':
if tool_state.get(item.get('State')): if tool.functional_tool_status != item.get('State'):
if tool_state.get(item.get('State')) != tool.functional_tool_status:
tool.write({ tool.write({
'functional_tool_status': tool_state.get(item['State']) 'functional_tool_status': item['State']
}) })
else: else:
location_id.product_sn_id = False location_id.product_sn_id = False
logging.info('货架已获取信息:%s' % item) if item['RfidCode']:
logging.info('Rfid为【%s】的功能刀具在系统中不存在！' % item['RfidCode'])
else: else:
equipment_id = request.env['maintenance.equipment'].sudo().search([('name', '=', DeciveId)]) equipment_id = request.env['maintenance.equipment'].sudo().search([('name', '=', DeciveId)])
if equipment_id: if equipment_id:

11
sf_warehouse/models/sync_common.py
View File

@@ -110,6 +110,7 @@ class MrsShelfLocationDataSync(models.Model):
total_data = self.get_total_data() total_data = self.get_total_data()
print('shelfinfo:', shelfinfo) print('shelfinfo:', shelfinfo)
for item in shelfinfo: for item in shelfinfo:
logging.info('货架已获取信息:%s' % item)
shelf_barcode = self.find_our_code(total_data, 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) location_id = self.env['sf.shelf.location'].search([('barcode', '=', shelf_barcode)], limit=1)
if location_id: if location_id:
@@ -121,14 +122,15 @@ class MrsShelfLocationDataSync(models.Model):
if tool: if tool:
location_id.product_sn_id = tool.barcode_id.id location_id.product_sn_id = tool.barcode_id.id
# 修改功能刀具状态 # 修改功能刀具状态
tool_state = {'Nomal': '正常', 'Warning': '报警'} if item.get('State') == '报警':
if tool_state.get(item.get('State')): if tool.functional_tool_status != item.get('State'):
if tool_state.get(item.get('State')) != tool.functional_tool_status:
tool.write({ tool.write({
'functional_tool_status': tool_state.get(item['State']) 'functional_tool_status': item['State']
}) })
else: else:
location_id.product_sn_id = False location_id.product_sn_id = False
if item['RfidCode']:
logging.info('Rfid为【%s】的功能刀具在系统中不存在！' % item['RfidCode'])
else: else:
stock_lot_obj = self.env['stock.lot'].search([('rfid', '=', item['RfidCode'])], limit=1) stock_lot_obj = self.env['stock.lot'].search([('rfid', '=', item['RfidCode'])], limit=1)
if stock_lot_obj: if stock_lot_obj:
@@ -136,7 +138,6 @@ class MrsShelfLocationDataSync(models.Model):
else: else:
location_id.product_sn_id = False location_id.product_sn_id = False
logging.info('货架已获取信息:%s' % item)
except Exception as e: except Exception as e:
logging.info("捕获错误信息:%s" % e) logging.info("捕获错误信息:%s" % e)
raise ValidationError("数据错误导致同步失败,请联系管理员") raise ValidationError("数据错误导致同步失败,请联系管理员")