坯料尺寸显示修改

jikimo_demand_plan_queue/__init__.py

@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-from . import models

jikimo_demand_plan_queue/__manifest__.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-{
-    'name': '机企猫 需求计划排程队列',
-    'version': '1.0',
-    'summary': """ 使用队列进行排程 """,
-    'author': 'fox',
-    'website': '',
-    'category': '',
-    'depends': ['queue_job_batch', 'sf_demand_plan'],
-    'data': [
-        
-    ],
-    
-    'application': True,
-    'installable': True,
-    'auto_install': False,
-    'license': 'LGPL-3',
-}

jikimo_demand_plan_queue/models/__init__.py

@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-from . import production_demand_plan

jikimo_demand_plan_queue/models/production_demand_plan.py

@@ -1,20 +0,0 @@
-from odoo import models, fields
-
-
-class ProductionDemandPlan(models.Model):
-    _inherit = 'sf.production.demand.plan'
-
-
-    def _do_production_schedule(self, pro_plan_list):
-        """使用队列进行排程"""
-        batch_size = 10
-        current_time = fields.Datetime.now().strftime('%Y%m%d%H%M%S')
-        index = 1
-        for i in range(0, len(pro_plan_list), batch_size):
-            batch = self.env['queue.job.batch'].get_new_batch('plan-%s-%s' % (current_time, index))
-            pro_plans = pro_plan_list[i:i+batch_size]
-            pro_plans.with_context(
-                job_batch=batch
-            ).with_delay().do_production_schedule()
-            index += 1
-        batch.enqueue()

sf_demand_plan/models/sf_production_demand_plan.py

@@ -326,13 +326,9 @@ class SfProductionDemandPlan(models.Model):
             date_planned_start = datetime.combine(date_part, time_part)
             pro_plan_list.production_line_id = sf_production_line.id
             pro_plan_list.date_planned_start = date_planned_start
-            self._do_production_schedule(pro_plan_list)
-
-    def _do_production_schedule(self, pro_plan_list):
             for pro_plan in pro_plan_list:
                 pro_plan.do_production_schedule()
 
-
     def button_action_print(self):
         return {
             'res_model': 'sf.demand.plan.print.wizard',

sf_machine_connect/controllers/controllers.py

@@ -437,7 +437,7 @@ class Sf_Dashboard_Connect(http.Controller):
                     ('state', 'in', ['ready', 'progress', 'done'])
                 ])
 
-                plan_data_total_counts = sum(plan_data_total.mapped('qty_production'))
+                plan_data_total_counts = sum(plan_data_total.mapped('qty_produced'))
 
                 # # 工单完成量
                 # plan_data_finish_counts = plan_obj.search_count(
@@ -717,7 +717,7 @@ class Sf_Dashboard_Connect(http.Controller):
                     # 使用小时和分钟作为键，确保每个小时的数据有独立的键
                     key = start_time.strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
                     # time_count_dict[key] = len(orders)
-                    plan_count_dict[key] = sum(interval_orders.mapped('qty_production'))
+                    plan_count_dict[key] = sum(interval_orders.mapped('qty_produced'))
 
                 # order_counts.append()
                 res['data'][line] = {

sf_quality/data/insepection_report_template.xml

@@ -201,33 +201,9 @@
                             </div>
                         </div> -->
 
-                        <div class="footer">
-                             <div style="border-top: 2px solid black;"></div>
-                            <div>
-                                <p>o_index: <t t-esc="o_index"/></p>
-                                <p>len(docs): <t t-esc="len(docs)"/></p>
-                            </div>
-                            <t t-if="o_index + 1 == len(docs)">
-                                <div class="row">
-                                    <div class="col-6">
-                                        <p>售后服务: <span t-field="o.company_id.phone"/></p>
-                                        <p>公司名称: <span t-field="o.company_id.name"/></p>
-                                        <p>加工工厂: <span t-field="o.company_id.factory_name"/></p>
-                                    </div>
-                                    <div class="col-6">
-                                        <p>公司网址: <span t-field="o.company_id.website"/></p>
-                                        <p>公司邮箱: <span t-field="o.company_id.email"/></p>
-                                    </div>
-                                </div>
-                            </t>
-                            <div class="text-center">
-                                <span>第<span class="page"/> 页/共 <span class="topage"/>页 </span>
-                            </div>
-                        </div>
                         <!-- 页脚固定在底部 -->
-
                     <!-- <div style="position: absolute; bottom: 0; left: 0; right: 0;"> -->
-<!--                            <t t-call="sf_quality.report_quality_footer"/>-->
+                        <t t-call="sf_quality.report_quality_footer"/>
                     <!-- </div> -->
                     </div>
                 </t>
@@ -353,11 +329,9 @@
                         </div> -->
 
                         <!-- 页脚固定在底部 -->
-<!--                        <t t-if="loop.index == len(docs) - 1">-->
                     <!-- <div style="position: absolute; bottom: 0; left: 0; right: 0;"> -->
                         <t t-call="sf_quality.html_report_quality_footer"/>
                     <!-- </div> -->
-<!--                        </t>-->
                     </div>
                 </t>
             </t>