Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

sf_manufacturing/models/mrp_workorder.py

@@ -1826,6 +1826,11 @@ class WorkPieceDelivery(models.Model):
                 return is_free
             else:
                 raise UserError("接驳站暂未反馈站点实时状态，请稍后再试")
+            
+    def delivery_avg(self):
+        is_agv_task_dispatch = self.env['ir.config_parameter'].sudo().get_param('is_agv_task_dispatch')
+        if is_agv_task_dispatch:
+            self._delivery_avg()
 
     # 配送至avg小车
     def _delivery_avg(self):
@@ -1886,7 +1891,7 @@ class WorkPieceDelivery(models.Model):
                             logging.info('delivery_item-name:%s' % delivery_item.name)
                             delivery_item.write({
                                 'task_delivery_time': fields.Datetime.now(),
-                                'status': '待配送'
+                                'status': '已下发'
                             })
                             if delivery_item.type == "上产线":
                                 delivery_item.workorder_id.write({'is_delivery': True})

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -296,8 +296,11 @@
                     </attribute>
                 </xpath>
 
-                <xpath expr="//sheet//notebook//page[@name='operations']//field[@name='workorder_ids']" position="replace">
-                    <field name="workorder_ids" attrs="{'readonly': ['|', ('state', '!=', 'test_value'), '&amp;', ('state', '=', 'done'), ('is_locked', '=', True)]}" context="{'tree_view_ref': 'mrp.mrp_production_workorder_tree_editable_view', 'default_product_uom_id': product_uom_id, 'from_manufacturing_order': True}"/>
+                <xpath expr="//sheet//notebook//page[@name='operations']//field[@name='workorder_ids']"
+                       position="replace">
+                    <field name="workorder_ids"
+                           attrs="{'readonly': ['|', ('state', '!=', 'test_value'), '&amp;', ('state', '=', 'done'), ('is_locked', '=', True)]}"
+                           context="{'tree_view_ref': 'mrp.mrp_production_workorder_tree_editable_view', 'default_product_uom_id': product_uom_id, 'from_manufacturing_order': True}"/>
                 </xpath>
 
                 <xpath expr="//sheet//notebook//page[@name='operations']" position="after">
@@ -556,7 +559,12 @@
                                             </div>
                                             <field name="priority" widget="priority"/>
                                         </div>
-
+                                        <t t-if="record.brand_id.raw_value">
+                                            <div class="mt-1">
+                                                品牌:
+                                                <field name="brand_id"></field>
+                                            </div>
+                                        </t>
                                         <div name="product_specification_id" class="mt-1">
                                             规格:
                                             <field name="specification_id"/>

sf_manufacturing/views/mrp_workorder_view.xml

@@ -797,7 +797,7 @@
                 <field name="feeder_station_start_id" readonly="1" force_save="1"/>
                 <!--                <field name="type" readonly="1"/>-->
                 <field name="feeder_station_destination_id" readonly="1" force_save="1"/>
-                <button name="button_delivery" type="object" string="配送" class="oe_highlight"/>
+                <button name="delivery_avg" type="object" string="配送" class="oe_highlight"/>
                 <button name="action_delivery_history" type="object" class="btn btn-link text-info" icon="fa-history"
                         string="历史"/>
             </tree>