Merge branch 'feature/新增机台日计划,工件预调(前置三元检测),NC程序下载接口' into develop

sf_base/commons/common.py

@@ -19,3 +19,13 @@ class Common(models.Model):
                    'TIMESTAMP': str(timestamp),
                    'checkstr': check_sf_str}
         return headers
+
+    def get_add_time(self, parse_time):
+        """
+        把时间增加8小时
+        :return:
+        """
+        dt = datetime.datetime.strptime(parse_time, "%Y-%m-%d %H:%M:%S")
+        d = dt + datetime.timedelta(hours=8)
+        nTime = d.strftime("%Y-%m-%d %H:%M:%S")
+        return nTime

sf_manufacturing/controllers/controllers.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import logging
 import json
-import base64
 from odoo import http
 from odoo.http import request
 
@@ -21,9 +20,9 @@ class Manufacturing_Connect(http.Controller):
             res = {'Succeed': True, 'Datas': []}
             datas = request.httprequest.data
             ret = json.loads(datas)
-            ret = json.loads(ret['result'])
             logging.info('RfidCode:%s' % ret)
-            workorder = request.env['mrp.workorder'].sudo().search([('name', '=', ret['RfidCode'])])
+            workorder = request.env['mrp.workorder'].sudo().search(
+                [('production_id.name', '=', 'WH/MO/00071'), ('routing_type', '=', '装夹')])
             if workorder:
                 for item in workorder:
                     res['Datas'].append({
@@ -33,14 +32,88 @@ class Manufacturing_Connect(http.Controller):
                         'Quantity': 1,
                         'MaterialId': item.product_id.default_code,
                         'MaterialName': item.product_id.name,
-                        # 'Spec':item.mat,
+                        'Spec': '%s×%s×%s' % (item.move_raw_ids.materiel_length, item.move_raw_ids.materiel_width,
-                        'Material': item.materials_type_id.name
+                                              item.move_raw_ids.materiel_height),
+                        'Material': item.product_id.materials_type_id.name
                     })
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
             logging.info('get_Work_Info error:%s' % e)
         return json.JSONEncoder().encode(res)
 
+    @http.route('/AutoDeviceApi/GetShiftPlan', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
+                cors="*")
+    def get_ShiftPlan(self, **kw):
+        """
+        自动化每天获取机台日计划
+        :param kw:
+        :return:
+        """
+        logging.info('get_ShiftPlan:%s' % kw)
+        try:
+            res = {'Succeed': True, 'Datas': []}
+            datas = request.httprequest.data
+            ret = json.loads(datas)
+            ret = json.loads(ret['result'])
+            logging.info('RfidCode:%s' % ret)
+            workorder = request.env['mrp.workorder'].sudo().search([('name', '=', ret['ProductionLine'])])
+            if workorder:
+                for item in workorder:
+                    date_planned_start = ''
+                    date_planned_finished = ''
+                    if item.date_planned_start is not False:
+                        planned_start = item.date_planned_start.strftime("%Y-%m-%d %H:%M:%S")
+                        date_planned_start = request.env['sf.sync.common'].sudo().get_add_time(planned_start)
+                    if item.date_planned_finished is not False:
+                        planned_finished = item.date_planned_finished.strftime("%Y-%m-%d %H:%M:%S")
+                        date_planned_finished = request.env['sf.sync.common'].sudo().get_add_time(planned_finished)
+                    res['Datas'].append({
+                        'BillId': item.production_id.name,
+                        'RfidCode': item.RfidCode,
+                        'CraftName': item.name,
+                        'Quantity': 1,
+                        'WortkStart': date_planned_start,
+                        'WorkEnd': date_planned_finished,
+                        'MaterialId': item.product_id.default_code,
+                        'MaterialName': item.product_id.name,
+                        # 'Spec':item.mat,
+                        'Material': item.materials_type_id.name
+                    })
+        except Exception as e:
+            res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
+            logging.info('get_ShiftPlan error:%s' % e)
+        return json.JSONEncoder().encode(res)
+
+    @http.route('/AutoDeviceApi/QcCheck', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
+                cors="*")
+    def get_qcCheck(self, **kw):
+        """
+        工件预调(前置三元检测)
+        1、前置三元检测在产线外：三元检测设备把测量信息上传给MES，
+        MES生成检测定位数据。中控系统传递RFID编号给MES获取测量偏置结果。（来源为三元检测工单上的字段）
+        :param kw:
+        :return:
+        """
+        logging.info('get_qcCheck:%s' % kw)
+        try:
+            res = {'Succeed': True, 'Datas': []}
+            datas = request.httprequest.data
+            ret = json.loads(datas)
+            ret = json.loads(ret['result'])
+            logging.info('RfidCode:%s' % ret)
+            workorder = request.env['mrp.workorder'].sudo().search([('routing_type', '=', '前置三元定位检测')])
+            if workorder:
+                for item in workorder:
+                    res['Datas'].append({
+                        'XOffset': item.production_id.name,
+                        'YOffset': item.RfidCode,
+                        'ZOffet': item.name,
+                        'COffset': 1
+                    })
+        except Exception as e:
+            res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
+            logging.info('get_qcCheck error:%s' % e)
+        return json.JSONEncoder().encode(res)
 
     @http.route('/AutoDeviceApi/FeedBackStart', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
@@ -50,7 +123,7 @@ class Manufacturing_Connect(http.Controller):
         :param kw:
         :return:
         """
-        logging.info('get_Work_Info:%s' % kw)
+        logging.info('button_Work_START:%s' % kw)
         try:
             res = {'Succeed': True, 'Datas': []}
             datas = request.httprequest.data
@@ -69,11 +142,9 @@ class Manufacturing_Connect(http.Controller):
             workorder = request.env['mrp.workorder'].sudo().search(
                 [('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1)
             workorder.button_start()
-
-
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
-            logging.info('get_Work_Info error:%s' % e)
+            logging.info('button_Work_START error:%s' % e)
         return json.JSONEncoder().encode(res)
 
     @http.route('/AutoDeviceApi/FeedBackEnd', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
@@ -84,7 +155,7 @@ class Manufacturing_Connect(http.Controller):
         :param kw:
         :return:
         """
-        logging.info('get_Work_Info:%s' % kw)
+        logging.info('button_Work_End:%s' % kw)
         try:
             res = {'Succeed': True, 'Datas': []}
             datas = request.httprequest.data
@@ -103,14 +174,11 @@ class Manufacturing_Connect(http.Controller):
             workorder = request.env['mrp.workorder'].sudo().search(
                 [('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1)
             workorder.button_finish()
-
-
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
-            logging.info('get_Work_Info error:%s' % e)
+            logging.info('button_Work_End error:%s' % e)
         return json.JSONEncoder().encode(res)
 
-
     @http.route('/AutoDeviceApi/QcCheck', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def Workorder_QcCheck(self, **kw):
@@ -119,7 +187,7 @@ class Manufacturing_Connect(http.Controller):
         :param kw:
         :return:
         """
-        logging.info('get_Work_Info:%s' % kw)
+        logging.info('Workorder_QcCheck:%s' % kw)
         try:
             res = {'Succeed': True, 'Datas': []}
             datas = request.httprequest.data
@@ -143,8 +211,7 @@ class Manufacturing_Connect(http.Controller):
             routing_type = ret['CraftId']
             request.env['mrp.workorder'].sudo().search(
                 [('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1)
-
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
-            logging.info('get_Work_Info error:%s' % e)
+            logging.info('Workorder_QcCheck error:%s' % e)
-        return json.JSONEncoder().encode(res)
+        return json.JSONEncoder().encode(res)