Merge branch 'feature/合并智能工厂' into develop

sf_mrs_sync/data/sf_cron.xml

@@ -11,6 +11,7 @@
         <field name="doall" eval="False"/>
     </record>
 
+
     <record model="ir.cron" id="sf_cron2">
         <field name="name">同步资源库材料型号</field>
         <field name="model_id" ref="model_mrs_materials_model"/>
@@ -121,5 +122,16 @@
         <field name="interval_type">days</field>
         <field name="numbercall">-1</field>
         <field name="doall" eval="False"/>
+    </record>
+
+            <record model="ir.cron" id="sf_cron12">
+        <field name="name">同步资源库工序</field>
+        <field name="model_id" ref="model_mrs_processing_order"/>
+        <field name="state">code</field>
+        <field name="code">model.sync_processing_order()</field>
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+        <field name="doall" eval="False"/>
     </record>
 </odoo>

sf_mrs_sync/models/res_config_setting.py

@@ -26,6 +26,8 @@ class ResConfigSettings(models.TransientModel):
         self.env['mrs.machine_tool.type'].sync_all_machine_tool_type()
         self.env['mrs.cutting_tool.category'].sync_all_cutting_tool_category()
         self.env['mrs.cutting_tool.type'].sync_all_cutting_tool_type()
+        self.env['mrs.processing.order'].sync_all_processing_order()
+
         return _logger.info("同步资源库成功")
 
     @api.model

sf_mrs_sync/models/sf_sync_common.py

@@ -530,9 +530,11 @@ class MachineTool(models.Model):
                     'active': item.active
                 }
                 machine_tool_list.append(val)
+            # kw = machine_tool_list
             kw = json.dumps(machine_tool_list, ensure_ascii=False)
             print(type(kw))
-            r = requests.post(strurl, json=kw, data=None, headers=headers)
+
+            r = requests.post(strurl, json={}, data={'kw':kw}, headers=headers)
             print(r)
         else:
             raise _logger.info("没有注册机床")
@@ -892,3 +894,58 @@ class CuttingToolType(models.Model):
                 })
         else:
             raise ValidationError("认证未通过")
+
+
+
+class MrsProcessingOrder(models.Model):
+    _inherit = 'mrs.processing.order'
+    _description = '工序'
+    url = '/api/processing_order/list'
+
+    # 定时同步工序
+    def sync_processing_order(self):
+        sf_sync_config = self.env['res.config.settings'].get_values()
+        token = sf_sync_config['token']
+        mrs_secret_key = sf_sync_config['mrs_secret_key']
+        headers = Common.get_headers(self, token, mrs_secret_key)
+
+        strUrl = sf_sync_config['mrs_url'] + self.url
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        if result['status'] == 1:
+            for item in result['processing_order_yesterday_list']:
+                brand = self.env['mrs.processing.order'].search(
+                    [("id", '=', item['id'])])
+                if brand:
+                    brand.id = item['id']
+                    brand.sequence = item['sequence']
+                else:
+                    self.env['mrs.processing.order'].create({
+                        "id": item['id'],
+                        "sequence": item['sequence'],
+
+                    })
+        else:
+            raise ValidationError("认证未通过")
+
+    # 同步所有工序
+    def sync_all_processing_order(self):
+        sf_sync_config = self.env['res.config.settings'].get_values()
+        token = sf_sync_config['token']
+        mrs_secret_key = sf_sync_config['mrs_secret_key']
+        headers = Common.get_headers(self, token, mrs_secret_key)
+
+        strUrl = sf_sync_config['mrs_url'] + self.url
+        r = requests.post(strUrl, json={}, data=None, headers=headers)
+        r = r.json()
+        result = json.loads(r['result'])
+        if result['status'] == 1:
+            for item in result['processing_order_all_list']:
+                self.env['mrs.processing.order'].create({
+                    "id": item['id'],
+                    "sequence": item['sequence'],
+                })
+        else:
+            raise ValidationError("认证未通过")
+