From 1fa5ebd80a7f1c6331763696c30c58dbe7147ca2 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Tue, 23 Apr 2024 14:19:55 +0800
Subject: [PATCH] 1

---
 sf_manufacturing/controllers/controllers.py | 2 +-
 sf_mrs_connect/controllers/controllers.py   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sf_manufacturing/controllers/controllers.py b/sf_manufacturing/controllers/controllers.py
index bbd9cac9..28f0702c 100644
--- a/sf_manufacturing/controllers/controllers.py
+++ b/sf_manufacturing/controllers/controllers.py
@@ -467,7 +467,7 @@ class Manufacturing_Connect(http.Controller):
                 logging.info('DeviceId:%s' % ret['DeviceId'])
                 workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
                     [('feeder_station_start_id.name', '=', ret['DeviceId']),
-                     ('status', '=', '已配送'), ('type', '=', '上产线')], order='id asc')
+                     ('status', '=', '已配送'), ('type', '=', '下产线')], order='id asc')
                 if workpiece_delivery:
                     for wd in workpiece_delivery:
                         logging.info('wd.production_id:%s' % wd.production_id.name)
diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py
index 6efc4b82..44a65200 100644
--- a/sf_mrs_connect/controllers/controllers.py
+++ b/sf_mrs_connect/controllers/controllers.py
@@ -29,8 +29,8 @@ class Sf_Mrs_Connect(http.Controller):
                 request.env.ref("base.user_admin")).search([('name', '=', ret['production_order_no'])])
             logging.info('制造订单号:%s' % cnc_production.name)
             if cnc_production:
-                if ret['glb_file']:
-                    cnc_production.glb_file = base64.b64encode(ret['glb_file'])
+                # if ret['glb_file']:
+                #     cnc_production.glb_file = base64.b64encode(ret['glb_file'])
                 # 拉取所有加工面的程序文件
                 # i = 1