From c726bb614ce2bac46a227d15b147fa84043a89ea Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Fri, 23 Feb 2024 15:31:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E5=BA=93?=
 =?UTF-8?q?=E5=8C=BA=E4=BF=A1=E6=81=AF=E5=AE=9A=E6=97=B6=E5=99=A8=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E5=8F=98=E6=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=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_manufacturing/views/mrp_workorder_view.xml |  2 +-
 sf_warehouse/__manifest__.py                  |  1 +
 sf_warehouse/data/ir_cron_data.xml            | 14 +++++++++
 sf_warehouse/models/__init__.py               |  1 +
 sf_warehouse/models/model.py                  |  7 +++--
 sf_warehouse/models/sync_common.py            | 30 +++++++++++++++++++
 sf_warehouse/views/shelf_location.xml         |  2 --
 8 files changed, 57 insertions(+), 14 deletions(-)
 create mode 100644 sf_warehouse/data/ir_cron_data.xml
 create mode 100644 sf_warehouse/models/sync_common.py

diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index 570116e9..0a5e2d0d 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -320,22 +320,20 @@ class Manufacturing_Connect(http.Controller):
             workorder = request.env['mrp.workorder'].sudo().search(
                 [('rfid_code', '=', RfidCode)], limit=1)
             if not workorder:
-                res = {'Succeed': False, 'ErrorCode': 202, 'Error': '未找到该工单'}
+                res = {'Succeed': False, 'ErrorCode': 202, 'Error': '未根据RfidCode找到该工单'}
                 return json.JSONEncoder().encode(res)
             old_localtion = request.env['sf.shelf.location'].sudo().search(
                 [('barcode', '=', OldPosition)], limit=1)
             new_localtion = request.env['sf.shelf.location'].sudo().search(
                 [('barcode', '=', NewPosition)], limit=1)
             if not new_localtion:
-                res = {'Succeed': False, 'ErrorCode': 202, 'Error': '没有该存储位置'}
+                res = {'Succeed': False, 'ErrorCode': 202, 'Error': '没有该目标位置'}
                 return json.JSONEncoder().encode(res)
-            if workorder and old_localtion and new_localtion:
+            if old_localtion:
                 old_localtion.location_status = '空闲'
-                new_localtion.location_status = '占用'
-                new_localtion.production_id = workorder.production_id.id
-            if old_localtion == 'None':
-                new_localtion.location_status = '占用'
-                new_localtion.production_id = workorder.production_id.id
+                old_localtion.production_id = False
+            new_localtion.location_status = '占用'
+            new_localtion.production_id = workorder.production_id.id
             #     return json.JSONEncoder().encode(res)
             # else:
             #     res = {'Succeed': False, 'ErrorCode': 201, 'Error': '未传RfidCode字段'}
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index cf4fa679..15e7fd3d 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -103,7 +103,6 @@
             <xpath expr="//field[@name='state']" position="before">
                 <field name='user_permissions' invisible="1"/>
                 <field name='name' invisible="1"/>
-                <field name='routing_type' invisible="1"/>
                 <field name='is_delivery' invisible="1"/>
                 <button name="button_start" type="object" string="开始" class="btn-success"
                         attrs="{'invisible': ['|', '|', '|','|',('production_state','in', ('draft', 'done',
@@ -160,6 +159,7 @@
             </xpath>
             <field name="production_id" position="after" invisible="0">
                 <group>
+                    <field name='routing_type'/>
                     <field name="date_planned_start" invisible="1"/>
                     <field name="date_planned_finished" invisible="1"/>
                     <!--                    <field name="production_id" readonly="1"/>-->
diff --git a/sf_warehouse/__manifest__.py b/sf_warehouse/__manifest__.py
index b6a59e8c..04051b06 100644
--- a/sf_warehouse/__manifest__.py
+++ b/sf_warehouse/__manifest__.py
@@ -12,6 +12,7 @@
     'website': 'https://www.sf.jikimo.com',
     'depends': ['stock', 'web', 'sf_base'],
     'data': [
+        'data/ir_cron_data.xml',
         'security/sf_stock_security.xml',
         'security/ir.model.access.csv',
         'views/view.xml',
diff --git a/sf_warehouse/data/ir_cron_data.xml b/sf_warehouse/data/ir_cron_data.xml
new file mode 100644
index 00000000..b015e8d4
--- /dev/null
+++ b/sf_warehouse/data/ir_cron_data.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<odoo>
+
+    <record model="ir.cron" id="ir_cron_sf_shelf_location_datasync">
+        <field name="name">定时同步库区信息</field>
+        <field name="model_id" ref="model_sf_shelf_location_datasync"/>
+        <field name="state">code</field>
+        <field name="code">model._cron_shelf_location_datasync()</field>
+        <field name="interval_number">4</field>
+        <field name="interval_type">hours</field>
+        <field name="numbercall">-1</field>
+        <field name="doall" eval="False"/>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/sf_warehouse/models/__init__.py b/sf_warehouse/models/__init__.py
index 9186ee3a..72b9b610 100644
--- a/sf_warehouse/models/__init__.py
+++ b/sf_warehouse/models/__init__.py
@@ -1 +1,2 @@
 from . import model
+from . import sync_common
diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index 4cff9952..72387ba1 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -398,12 +398,13 @@ class ShelfLocation(models.Model):
         crea_url = 'https://x24467i973.zicp.fun/AutoDeviceApi/GetLocationInfos'
         # 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, headers=headers)
         ret = r.json()
+
         print(ret)
         if ret['Succeed'] == True:
-            return '获取库位信息成功'
+            return ret['Datas']
         else:
             raise UserError("该库位无产品")
 
diff --git a/sf_warehouse/models/sync_common.py b/sf_warehouse/models/sync_common.py
new file mode 100644
index 00000000..3f565655
--- /dev/null
+++ b/sf_warehouse/models/sync_common.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+import logging
+import json
+import base64
+import requests
+from odoo import models
+from odoo.exceptions import ValidationError
+
+
+_logger = logging.getLogger(__name__)
+
+
+class MrsShelfLocationDataSync(models.Model):
+    _name = 'sf.shelf.location.datasync'
+    _description = '同步库存信息'
+
+    def _cron_shelf_location_datasync(self):
+        try:
+            shelfinfo = self.env['sf.shelf.location'].get_sf_shelf_location_info()
+            for item in shelfinfo:
+                location_id = self.env['sf.shelf.location'].search([('barcode', '=', item['Postion'])], limit=1)
+                if location_id:
+                    workorder_id = self.env['mrp.workorder'].search([('rfid_code', '=', item['RfidCode'])], limit=1)
+                    if workorder_id:
+                        location_id.production_id = workorder_id.production_id.id
+                        location_id.location_status = '占用'
+                logging.info('货架已获取信息:%s' % item)
+        except Exception as e:
+            logging.info("捕获错误信息:%s" % e)
+            raise ValidationError("数据错误导致同步失败,请联系管理员")
\ No newline at end of file
diff --git a/sf_warehouse/views/shelf_location.xml b/sf_warehouse/views/shelf_location.xml
index 9c3fd678..49fdf42e 100644
--- a/sf_warehouse/views/shelf_location.xml
+++ b/sf_warehouse/views/shelf_location.xml
@@ -119,8 +119,6 @@
                 <form string="Shelf Location">
                     <header>
 
-                    <button type="object" class="oe_highlight" name='get_sf_shelf_location_info' string="获取货位信息"/>
-
                         <field name="location_status" invisible="1"/>
                         <button string="禁用货位" name="action_location_status_disable" type="object" class="oe_highlight"
                                 attrs="{'invisible': [('location_status', '!=', '空闲')]}"/>