From c57daa2c52cc1707670716b351b1865636e53d66 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 20 Aug 2024 16:13:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E5=A4=84=E7=90=86=E9=94=80?=
=?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=8E=A5=E5=8D=95?=
=?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=A1=AE=E8=AE=A4=E6=8E=A5=E5=8D=95=E3=80=81?=
=?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE=E6=B2=A1=E6=9C=89=E9=9A=90?=
=?UTF-8?q?=E8=97=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_sale/views/sale_order_view.xml | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index ce27a4df..d5af8ebd 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -10,7 +10,8 @@
sf_base.group_sale_salemanager,sf_base.group_sale_director
- mrp.group_mrp_user,sf_base.group_sale_salemanager,sf_base.group_sale_director
+
+ mrp.group_mrp_user,sf_base.group_sale_salemanager,sf_base.group_sale_director
@@ -42,12 +43,12 @@
+ attrs="{'invisible': ['|', ('state', 'in', ['cancel']), '|','&',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&','&',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel']),('delivery_status', '!=', False)]}"/>
- {'invisible': ['|','&','|', ('check_status', '!=', 'approved'),('state',
- 'in', ['draft','cancel']),'&','&',('check_status', '=', 'approved'),('state', 'in',
- ['sale','cancel']),('delivery_status', '!=', False), ('state', 'in', ['cancel'])]}
+ {'invisible': ['|', ('state', 'in', ['cancel']), '|','&',
+ ('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&','&',('check_status',
+ '=', 'approved'),('state', 'in', ['sale','cancel']),('delivery_status', '!=', False)]}
From 39bc206344abfad09a6a37140956ac39bba33e1c Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 22 Aug 2024 10:31:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E8=B4=A7?=
=?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E3=80=81=E5=BA=93?=
=?UTF-8?q?=E4=BD=8D=E5=8F=98=E6=9B=B4=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_manufacturing/controllers/controllers.py | 11 ++++++-----
sf_warehouse/models/sync_common.py | 11 ++++++-----
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 6319c050..f35e47ed 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -436,6 +436,7 @@ class Manufacturing_Connect(http.Controller):
DeciveId)))
total_data = request.env['sf.shelf.location.datasync'].sudo().get_total_data()
for item in shelfinfo:
+ logging.info('货架已获取信息:%s' % item)
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(
@@ -450,15 +451,15 @@ class Manufacturing_Connect(http.Controller):
if tool:
location_id.product_sn_id = tool.barcode_id.id
# 修改功能刀具状态
- tool_state = {'Nomal': '正常', 'Warning': '报警'}
- if tool_state.get(item.get('State')):
- if tool_state.get(item.get('State')) != tool.functional_tool_status:
+ if item.get('State') == '报警':
+ if tool.functional_tool_status != item.get('State'):
tool.write({
- 'functional_tool_status': tool_state.get(item['State'])
+ 'functional_tool_status': item['State']
})
else:
location_id.product_sn_id = False
- logging.info('货架已获取信息:%s' % item)
+ if item['RfidCode']:
+ logging.info('Rfid为【%s】的功能刀具在系统中不存在！' % item['RfidCode'])
else:
equipment_id = request.env['maintenance.equipment'].sudo().search([('name', '=', DeciveId)])
if equipment_id:
diff --git a/sf_warehouse/models/sync_common.py b/sf_warehouse/models/sync_common.py
index 3d28583c..aaa186f9 100644
--- a/sf_warehouse/models/sync_common.py
+++ b/sf_warehouse/models/sync_common.py
@@ -110,6 +110,7 @@ class MrsShelfLocationDataSync(models.Model):
total_data = self.get_total_data()
print('shelfinfo:', shelfinfo)
for item in shelfinfo:
+ logging.info('货架已获取信息:%s' % item)
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:
@@ -121,14 +122,15 @@ class MrsShelfLocationDataSync(models.Model):
if tool:
location_id.product_sn_id = tool.barcode_id.id
# 修改功能刀具状态
- tool_state = {'Nomal': '正常', 'Warning': '报警'}
- if tool_state.get(item.get('State')):
- if tool_state.get(item.get('State')) != tool.functional_tool_status:
+ if item.get('State') == '报警':
+ if tool.functional_tool_status != item.get('State'):
tool.write({
- 'functional_tool_status': tool_state.get(item['State'])
+ 'functional_tool_status': item['State']
})
else:
location_id.product_sn_id = False
+ if item['RfidCode']:
+ logging.info('Rfid为【%s】的功能刀具在系统中不存在！' % item['RfidCode'])
else:
stock_lot_obj = self.env['stock.lot'].search([('rfid', '=', item['RfidCode'])], limit=1)
if stock_lot_obj:
@@ -136,7 +138,6 @@ class MrsShelfLocationDataSync(models.Model):
else:
location_id.product_sn_id = False
- logging.info('货架已获取信息:%s' % item)
except Exception as e:
logging.info("捕获错误信息:%s" % e)
raise ValidationError("数据错误导致同步失败,请联系管理员")