坯料尺寸显示修改

Merge Request: 添加页脚页码数据测试

Created By: @禹翔辉
Reviewed By: @胡尧 @秦圣
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2238

sf_demand_plan/__manifest__.py

@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_plan'],
+    'depends': ['sf_plan','jikimo_printing'],
     'data': [
         'security/ir.model.access.csv',
         'views/demand_plan.xml',

sf_demand_plan/models/sf_production_demand_plan.py

@@ -196,11 +196,14 @@ class SfProductionDemandPlan(models.Model):
             else:
                 line.model_long = None
 
-    @api.depends('product_id.model_long', 'product_id.model_width', 'product_id.model_height')
+    @api.depends('product_id.model_long', 'product_id.model_width', 'product_id.model_height', 'product_id.blank_type')
     def _compute_embryo_long(self):
         for line in self:
             if line.product_id:
-                line.embryo_long = f"{round(line.product_id.model_long, 3)}*{round(line.product_id.model_width, 3)}*{round(line.product_id.model_height, 3)}"
+                if line.product_id.blank_type == '圆料':
+                    line.embryo_long = f"Ø{round(line.product_id.model_width, 3)}*{round(line.product_id.model_long, 3)}"
+                else:
+                    line.embryo_long = f"{round(line.product_id.model_long, 3)}*{round(line.product_id.model_width, 3)}*{round(line.product_id.model_height, 3)}"
             else:
                 line.embryo_long = None
 
@@ -403,29 +406,30 @@ class SfProductionDemandPlan(models.Model):
                     outsourcing_purchase_request.extend(pr_ids.ids)
                 if record.supply_method == 'outsourcing' and not record.sale_order_line_id.is_incoming_material:
                     bom_line_ids = record.product_id.bom_ids.bom_line_ids
-                    # BOM_数量
+                    if bom_line_ids:
-                    total_product_qty = sum(line.product_qty for line in bom_line_ids)
+                        # BOM_数量
-                    bom_product_ids = bom_line_ids.mapped('product_id')
+                        total_product_qty = sum(line.product_qty for line in bom_line_ids)
-                    product_purchase_orders = self.env['purchase.order'].sudo().search([
+                        bom_product_ids = bom_line_ids.mapped('product_id')
-                        ('state', 'in', ('purchase', 'done')),
+                        product_purchase_orders = self.env['purchase.order'].sudo().search([
-                        ('order_line.product_id', 'in', bom_product_ids.ids)
+                            ('state', 'in', ('purchase', 'done')),
-                    ])
+                            ('order_line.product_id', 'in', bom_product_ids.ids)
-                    # 购订单_数量
+                        ])
-                    total_outsourcing_purchase_quantity = sum(
+                        # 购订单_数量
-                        sum(
+                        total_outsourcing_purchase_quantity = sum(
-                            order.order_line.filtered(
+                            sum(
-                                lambda line: line.product_id in bom_product_ids
+                                order.order_line.filtered(
-                            ).mapped('product_qty')
+                                    lambda line: line.product_id in bom_product_ids
+                                ).mapped('product_qty')
+                            )
+                            for order in product_purchase_orders
                         )
-                        for order in product_purchase_orders
+                        quantity = total_outsourcing_purchase_quantity / total_product_qty
-                    )
+                        if float_compare(quantity, record.product_uom_qty,
-                    quantity = total_outsourcing_purchase_quantity / total_product_qty
+                                         precision_rounding=record.product_id.uom_id.rounding) == -1:
-                    if float_compare(quantity, record.product_uom_qty,
+                            purchase_request = self.env['purchase.request'].sudo().search(
-                                     precision_rounding=record.product_id.uom_id.rounding) == -1:
+                                [('line_ids.product_id', 'in', bom_product_ids.ids),
-                        purchase_request = self.env['purchase.request'].sudo().search(
+                                 ('line_ids.purchase_state', 'not in', ('purchase', 'done')), ('state', '!=', 'done')])
-                            [('line_ids.product_id', 'in', bom_product_ids.ids),
+                            outsourcing_purchase_request.extend(purchase_request.ids)
-                             ('line_ids.purchase_state', 'not in', ('purchase', 'done')), ('state', '!=', 'done')])
-                        outsourcing_purchase_request.extend(purchase_request.ids)
             record.outsourcing_purchase_request = json.dumps(outsourcing_purchase_request)
             if outsourcing_purchase_request:
                 record.hide_action_purchase_orders = True

sf_demand_plan/views/demand_plan.xml

@@ -28,7 +28,7 @@
                 <field name="qty_delivered"/>
                 <field name="qty_to_deliver"/>
                 <field name="model_long"/>
-                <field name="blank_type"/>
+                <field name="blank_type" optional="hide"/>
                 <field name="embryo_long"/>
                 <field name="materials_id"/>
                 <field name="model_machining_precision"/>

sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml

@@ -4,12 +4,12 @@
         <field name="name">sf.demand.plan.print.wizard.tree</field>
         <field name="model">sf.demand.plan.print.wizard</field>
         <field name="arch" type="xml">
-            <tree string="打印" class="print_demand"  js_class="print_demand" >
+            <tree string="打印" class="print_demand" js_class="print_demand">
                 <field name="model_id"/>
                 <field name="filename_url"/>
                 <field name="type"/>
-                <field name="machining_drawings"  attrs="{'column_invisible': True }"/>
+                <field name="machining_drawings" attrs="{'column_invisible': True }"/>
-                <field name="cnc_worksheet" attrs="{'column_invisible': True }" />
+                <field name="cnc_worksheet" attrs="{'column_invisible': True }"/>
                 <field name="status"/>
             </tree>
         </field>

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_produced'))
+                plan_data_total_counts = sum(plan_data_total.mapped('qty_production'))
 
                 # # 工单完成量
                 # plan_data_finish_counts = plan_obj.search_count(
@@ -489,7 +489,7 @@ class Sf_Dashboard_Connect(http.Controller):
 
                 # 工单返工数量
 
-                plan_data_rework = work_order_obj.search(plan_domain + [
+                plan_data_rework = work_order_obj.search(work_order_domain + [
                     ('state', 'in', ['rework'])
                 ])
 
@@ -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_produced'))
+                    plan_count_dict[key] = sum(interval_orders.mapped('qty_production'))
 
                 # order_counts.append()
                 res['data'][line] = {
@@ -857,7 +857,6 @@ class Sf_Dashboard_Connect(http.Controller):
         :param kw:
         :return:
         """
-        request.env['stock.warehouse'].browse(request.env.company.id).pbm_loc_id
         # res = {'status': 1, 'message': '成功', 'not_done_data': [], 'done_data': []}
         res = {'status': 1, 'message': '成功', 'data': {}}
         plan_obj = request.env['sf.production.plan'].sudo()

sf_quality/data/insepection_report_template.xml

@@ -201,10 +201,34 @@
                             </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"/>
+                        <!-- <div style="position: absolute; bottom: 0; left: 0; right: 0;"> -->
-                    <!-- </div> -->
+<!--                            <t t-call="sf_quality.report_quality_footer"/>-->
+                        <!-- </div> -->
                     </div>
                 </t>
             </t>
@@ -329,9 +353,11 @@
                         </div> -->
 
                         <!-- 页脚固定在底部 -->
-                    <!-- <div style="position: absolute; bottom: 0; left: 0; right: 0;"> -->
+<!--                        <t t-if="loop.index == len(docs) - 1">-->
-                        <t t-call="sf_quality.html_report_quality_footer"/>
+                        <!-- <div style="position: absolute; bottom: 0; left: 0; right: 0;"> -->
-                    <!-- </div> -->
+                            <t t-call="sf_quality.html_report_quality_footer"/>
+                        <!-- </div> -->
+<!--                        </t>-->
                     </div>
                 </t>
             </t>