From d05c0951eb872d27dd2d055f893b8b35f4347a0e Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Tue, 26 Mar 2024 14:10:51 +0800 Subject: [PATCH] =?UTF-8?q?1.agv=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=B0=E7=A0=81=202.bpm=E5=88=86=E9=85=8D?= =?UTF-8?q?=E5=B7=A5=E5=8E=82=E6=97=B6=E7=9A=84=E5=AE=A2=E6=88=B7(?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=B9=B3=E5=8F=B0)=E7=9A=84=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E4=BF=A1=E6=81=AF=EF=BC=88=E7=A8=8E=EF=BC=8C=E9=82=AE?= =?UTF-8?q?=E7=AE=B1=EF=BC=8C=E5=8F=B7=E7=A0=81=EF=BC=89=E8=B5=8B=E5=80=BC?= =?UTF-8?q?=203.=E6=8A=A5=E4=BB=B7=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E6=94=B9=E4=B8=BA=E4=B8=8D=E5=8F=AF=E6=96=B0=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workorder.py | 13 ++++++++----- sf_mrs_connect/models/res_config_setting.py | 1 + sf_mrs_connect/views/res_config_settings_views.xml | 8 ++++---- sf_sale/models/sale_order.py | 6 +++++- sf_sale/views/sale_order_view.xml | 2 +- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index dfb064cb..c8b2f7d1 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -1,5 +1,6 @@ import logging import base64 +import urllib.parse from datetime import date from datetime import datetime, timedelta import requests @@ -908,15 +909,17 @@ class WorkPieceDelivery(models.Model): # 配送至avg小车 def _delivery_avg(self): - res = {'reqCode': self.production_id.name, 'reqTime': '', 'clientCode': '', 'tokenCode': '', - 'taskTyp': 'F01', 'ctnrTyp': '', 'ctnrCode': '', 'wbCode': '', 'positionCodePath': [], 'podCode': '', + res = {'reqCode': urllib.parse.quote(self.production_id.name), 'reqTime': '', 'clientCode': '', 'tokenCode': '', + 'taskTyp': 'F01', 'ctnrTyp': '', 'ctnrCode': '', 'wbCode': '006848AB006774', 'positionCodePath': [], 'podCode': '', 'podDir': '', 'materialLot': '', 'priority': '', 'taskCode': '', 'agvCode': '', 'materialLot': '', 'data': ''} config = self.env['res.config.settings'].get_values() try: - logging.info('config-AGV请求路径:%s' % config['agv_rcms_url']) - logging.info('config-json:%s' % res) - ret = requests.post((config['agv_rcms_url']), json=res) + logging.info('AGV请求路径:%s' % config['agv_rcs_url']) + logging.info('AGV-json:%s' % res) + + headers = {'Content-Type': 'application/json'} + ret = requests.post((config['agv_rcs_url']), json=res, headers=headers) ret = ret.json() logging.info('config-ret:%s' % ret) if ret['code'] == 0: diff --git a/sf_mrs_connect/models/res_config_setting.py b/sf_mrs_connect/models/res_config_setting.py index 5919e5c7..95718e33 100644 --- a/sf_mrs_connect/models/res_config_setting.py +++ b/sf_mrs_connect/models/res_config_setting.py @@ -16,6 +16,7 @@ class ResConfigSettings(models.TransientModel): agv_rcms_url = fields.Char(string='avg_rcms访问地址', default='http://IP:PORT/rcms/services/rest/hikRpcService/genAgvSchedulingTask') agv_rcs_url = fields.Char(string='avg_rcs访问地址', default='http://IP:PORT/xxx/agv/agvCallbackService/agvCallback') + wbcode = fields.Char('地码') model_parser_url = fields.Char('特征识别路径') ftp_host = fields.Char(string='FTP的ip') ftp_port = fields.Char(string='FTP端口') diff --git a/sf_mrs_connect/views/res_config_settings_views.xml b/sf_mrs_connect/views/res_config_settings_views.xml index b879b1f8..5f457b4f 100644 --- a/sf_mrs_connect/views/res_config_settings_views.xml +++ b/sf_mrs_connect/views/res_config_settings_views.xml @@ -81,12 +81,12 @@
-
-
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index 4848ce7c..a55f9fb3 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -1,5 +1,6 @@ import datetime import base64 +from odoo import Command from odoo import models, fields, api, _ from odoo.exceptions import UserError, ValidationError @@ -88,7 +89,10 @@ class ReSaleOrder(models.Model): if customer: return customer else: - partner = self.env['res.partner'].create({'name': '业务平台'}) + partner_tag = self.env['res.partner.category'].create({'name': '平台客户'}) + partner = self.env['res.partner'].create( + {'name': '业务平台', 'vat': '91430103MA7BRH9K4M', 'phone': '0731-85115515', + 'email': 'jikimo@jikimo.com', 'category_id': [Command.set([partner_tag.id])]}) return partner # 业务平台分配工厂时在创建完产品后再创建销售明细信息 diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml index b7a1ef96..f998887a 100644 --- a/sf_sale/views/sale_order_view.xml +++ b/sf_sale/views/sale_order_view.xml @@ -103,7 +103,7 @@ + options='{"always_reload": True,"no_create": True}'/> {'readonly': [('state', 'in', ['cancel','sale'])]}