合并sf代码

sf_manufacturing/models/mrp_workorder.py

@@ -47,6 +47,9 @@ class ResMrpWorkOrder(models.Model):
                 workorder.user_permissions = False
 
     user_permissions = fields.Boolean('用户权限', compute='get_user_permissions')
+    programming_no = fields.Char('编程单号')
+    work_state = fields.Char('业务状态')
+    programming_state = fields.Char('编程状态')
     cnc_worksheet = fields.Binary(
         '工作指令', readonly=True)
     material_center_point = fields.Char(string='胚料中心点')
@@ -85,8 +88,7 @@ class ResMrpWorkOrder(models.Model):
                                     string="检测结果")
     cnc_ids = fields.One2many("sf.cnc.processing", 'workorder_id', string="CNC加工")
     tray_code = fields.Char(string="托盘")
-    programming_no = fields.Char('编程单号')
-    is_programming = fields.Boolean('是否编程', default=False)
+
 
     # 计算配料中心点和与x轴倾斜度方法
     def getcenter(self):
@@ -125,7 +127,11 @@ class ResMrpWorkOrder(models.Model):
             print("(%.2f,%.2f)" % (x, y))
             self.material_center_point = ("(%.2f,%.2f,%.2f)" % (x, y, z))
             self.X_deviation_angle = jdz
-            return self.material_center_point
+            # 将补偿值写入CNC加工工单
+            workorder = self.env['mrp.workorder'].browse(self.ids)
+            work = workorder.production_id.workorder_ids
+            work.compensation_value_x = eval(self.material_center_point)[0]
+            work.compensation_value_y = eval(self.material_center_point)[1]
         except:
             raise UserError("参数计算有误")
 
@@ -138,6 +144,7 @@ class ResMrpWorkOrder(models.Model):
             'name': route.route_workcenter_id.name,
             'processing_panel': k,
             'routing_type': route.routing_type,
+            'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
             'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids),
             'date_planned_start': False,
             'date_planned_finished': False,
@@ -362,6 +369,7 @@ class ResMrpWorkOrder(models.Model):
             'name': route.route_workcenter_id.name,
             'processing_panel': k,
             'routing_type': route.routing_type,
+            'work_state': '' if not route.routing_type == '获取CNC加工程序' else '待发起',
             'workcenter_id': self.env['mrp.routing.workcenter'].get_workcenter(route.workcenter_ids.ids),
             'date_planned_start': False,
             'date_planned_finished': False,
@@ -440,27 +448,53 @@ class CNCprocessing(models.Model):
     workorder_id = fields.Many2one('mrp.workorder', string="工单")
 
     # mrs下发编程单创建CNC加工
-    def cnc_processing_create(self, obj):
-        workorder = self.env['mrp.workorder'].search([('production_id.name', '=', obj['production_order_no']),
-                                                      ('processing_panel', '=', obj['processing_panel']),
-                                                      ('routing_type', '=', 'CNC加工')])
-        vals = {
-            'workorder_id': workorder.id,
-            'sequence_number': obj['sequence_number'],
-            'program_name': obj['program_name'],
-            'cutting_tool_name': obj['cutting_tool_name'],
-            'cutting_tool_no': obj['cutting_tool_no'],
-            'processing_type': obj['processing_type'],
-            'margin_x_y': obj['margin_x_y'],
-            'margin_z': obj['margin_z'],
-            'depth_of_processing_z': obj['depth_of_processing_z'],
-            'cutting_tool_extension_length': obj['cutting_tool_extension_length'],
-            'cutting_tool_handle_type': obj['cutting_tool_handle_type'],
-            'estimated_processing_time': obj['estimated_processing_time'],
-            'remark': obj['remark']
-        }
-        return self.env['sf.cnc.processing'].create(vals)
+    def cnc_processing_create(self, cnc_workorder, ret):
+        logging.info('ret:%s' % ret)
+        for obj in ret['programming_list']:
+            workorder = self.env['mrp.workorder'].search([('production_id.name', '=', ret['production_order_no']),
+                                                          ('processing_panel', '=', obj['processing_panel']),
+                                                          ('routing_type', '=', 'CNC加工')])
+            cnc_processing = self.env['sf.cnc.processing'].create({
+                'workorder_id': workorder.id,
+                'sequence_number': obj['sequence_number'],
+                'program_name': obj['program_name'],
+                'cutting_tool_name': obj['cutting_tool_name'],
+                'cutting_tool_no': obj['cutting_tool_no'],
+                'processing_type': obj['processing_type'],
+                'margin_x_y': obj['margin_x_y'],
+                'margin_z': obj['margin_z'],
+                'depth_of_processing_z': obj['depth_of_processing_z'],
+                'cutting_tool_extension_length': obj['cutting_tool_extension_length'],
+                'cutting_tool_handle_type': obj['cutting_tool_handle_type'],
+                'estimated_processing_time': obj['estimated_processing_time'],
+                'remark': obj['remark']
+            })
+            self.get_cnc_processing_file(ret['folder_name'], cnc_processing, workorder.processing_panel)
+        cnc_workorder.state = 'done'
+        cnc_workorder.work_state = '已编程'
+        cnc_workorder.programming_state = '已编程'
+        cnc_workorder.time_ids.date_end = datetime.now()
+        cnc_workorder.button_finish()
 
+    def get_cnc_processing_file(self, folder_name, cnc_processing, processing_panel):
+        logging.info('folder_name:%s' % folder_name)
+        serverdir = os.path.join('/tmp', folder_name, 'return', processing_panel)
+        logging.info('serverdir:%s' % serverdir)
+        for root, dirs, files in os.walk(serverdir):
+            for f in files:
+                logging.info('f:%s' % f)
+                if os.path.splitext(f)[1] == ".pdf":
+                    full_path = os.path.join(serverdir, root, f)
+                    logging.info('pdf:%s' % full_path)
+                    if full_path != False:
+                        if not cnc_processing.workorder_id.cnc_worksheet:
+                            cnc_processing.workorder_id.cnc_worksheet = base64.b64encode(
+                                open(full_path, 'rb').read())
+                else:
+                    if cnc_processing.program_name == f.split('.')[0]:
+                        cnc_file_path = os.path.join(serverdir, root, f)
+                        logging.info('cnc_file_path:%s' % cnc_file_path)
+                        self.write_file(cnc_file_path, cnc_processing)
     # 创建附件(nc文件)
     def attachment_create(self, name, data):
         attachment = self.env['ir.attachment'].create({
@@ -472,12 +506,15 @@ class CNCprocessing(models.Model):
         return attachment
 
     # 将FTP的nc文件下载到临时目录
-    def download_file_tmp(self, model_code, processing_panel):
-        remotepath = os.path.join('/', model_code, 'return', processing_panel)
-        serverdir = os.path.join('/tmp', model_code, 'return', processing_panel)
-        ftp = FtpController()
-        ftp.download_file_tree(remotepath, serverdir)
-        return serverdir
+    def download_file_tmp(self, production_no, processing_panel):
+        remotepath = os.path.join('/', production_no, 'return', processing_panel)
+        serverdir = os.path.join('/tmp', production_no, 'return', processing_panel)
+        ftp_resconfig = self.env['res.config.settings'].get_values()
+        ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']), ftp_resconfig['ftp_user'],
+                            ftp_resconfig['ftp_password'])
+        download_state = ftp.download_file_tree(remotepath, serverdir)
+        return download_state
+
 
     # 将nc文件存到attach的datas里
     def write_file(self, nc_file_path, cnc):