From e456b811f203130b00c8b945a166eb50455f4b07 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Fri, 23 Feb 2024 09:56:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E7=BB=93=E6=9D=9F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/controllers/controllers.py | 14 +++++++++++++- sf_warehouse/models/model.py | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index 7b050139..8584f57c 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -145,11 +145,20 @@ class Manufacturing_Connect(http.Controller): ret = json.loads(datas) production_id = ret['BillId'] routing_type = ret['CraftId'] + equipment_id = ret["DeviceId"] workorder = request.env['mrp.workorder'].sudo().search( [('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1) if not workorder: res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单不存在'} - return json.JSONEncoder().encode(res) + return res + if workorder.state != 'ready': + res = {'Succeed': False, 'ErrorCode': 202, 'Error': '工单未就绪'} + return res + work_equipment_id = request.env['maintenance.equipment'].sudo().search(['name', '=', equipment_id], limit=1) + if not work_equipment_id: + res = {'Succeed': False, 'ErrorCode': 202, 'Error': '没有找到该加工设备'} + return res + workorder.equipment_id = work_equipment_id workorder.button_start() except Exception as e: res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} @@ -176,6 +185,9 @@ class Manufacturing_Connect(http.Controller): if not workorder: res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单不存在'} return json.JSONEncoder().encode(res) + if workorder.state != 'progress': + res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单未开始'} + return res workorder.button_finish() except Exception as e: res = {'Succeed': False, 'ErrorCode': 202, 'Error': e} diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py index 9fe46616..646acd4c 100644 --- a/sf_warehouse/models/model.py +++ b/sf_warehouse/models/model.py @@ -398,7 +398,7 @@ class ShelfLocation(models.Model): # objs_all = self.env['maintenance.equipment'].search([('id', '=', self.id)]) # machine_tool_list = [] params = {'DeviceId': 'Cabinet-AL'} - r = requests.get(crea_url, params=params,headers=headers) + r = requests.get(crea_url, params=params, headers=headers) ret = r.json() print(ret) if ret['Succeed'] == True: From f8101c2a16683743a0069a8f4e1214a83ece0b7f Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Fri, 23 Feb 2024 09:57:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A7=E4=BD=8D?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_warehouse/models/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py index a1891c71..0f4ea0af 100644 --- a/sf_warehouse/models/model.py +++ b/sf_warehouse/models/model.py @@ -327,7 +327,7 @@ class ShelfLocation(models.Model): record.storage_time = False name = fields.Char('货位名称', required=True, size=20) - barcode = fields.Char('货位编码', copy=False, size=15) + barcode = fields.Char('货位编码', copy=False, size=50) # 货架 shelf_id = fields.Many2one('sf.shelf', string='货架') From e885d7b372ff99c5ac00a7f9eab6ea13988ea478 Mon Sep 17 00:00:00 2001 From: "qihao.gong@jikimo.com" Date: Fri, 23 Feb 2024 10:13:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/controllers/controllers.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py index e253f4b0..0be53879 100644 --- a/sf_manufacturing/controllers/controllers.py +++ b/sf_manufacturing/controllers/controllers.py @@ -153,14 +153,14 @@ class Manufacturing_Connect(http.Controller): [('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1) if not workorder: res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单不存在'} - return res + return json.JSONEncoder().encode(res) if workorder.state != 'ready': res = {'Succeed': False, 'ErrorCode': 202, 'Error': '工单未就绪'} - return res + return json.JSONEncoder().encode(res) work_equipment_id = request.env['maintenance.equipment'].sudo().search(['name', '=', equipment_id], limit=1) if not work_equipment_id: res = {'Succeed': False, 'ErrorCode': 202, 'Error': '没有找到该加工设备'} - return res + return json.JSONEncoder().encode(res) workorder.equipment_id = work_equipment_id workorder.button_start() except Exception as e: @@ -190,7 +190,7 @@ class Manufacturing_Connect(http.Controller): return json.JSONEncoder().encode(res) if workorder.state != 'progress': res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单未开始'} - return res + return json.JSONEncoder().encode(res) workorder.button_finish() except Exception as e: res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}