Accept Merge Request #1032: (feature/修复表面工艺对应库存 -> develop)

Merge Request: 修复表面工艺对应库存

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1032#mr-1032-review-151369

sf_manufacturing/models/mrp_production.py

@@ -500,7 +500,8 @@ class MrpProduction(models.Model):
 
     # 修改标记已完成方法
     def button_mark_done1(self):
-        self._button_mark_done_sanity_checks()
+        if not self.workorder_ids.filtered(lambda w: w.routing_type not in ['表面工艺']):
+            self._button_mark_done_sanity_checks()
 
         if not self.env.context.get('button_mark_done_production_ids'):
             self = self.with_context(button_mark_done_production_ids=self.ids)

sf_manufacturing/models/mrp_workorder.py

@@ -907,6 +907,12 @@ class ResMrpWorkOrder(models.Model):
                     move_raw_id.quantity_done = move_raw_id.product_uom_qty
                 record.process_state = '已完工'
                 record.production_id.process_state = '已完工'
+                if record.routing_type in ['表面工艺']:
+                    raw_move = self.env['stock.move'].sudo().search(
+                        [('origin', '=', record.production_id.name), ('procure_method', '=', 'make_to_order'),
+                         ('state', '!=', 'done')])
+                    if raw_move:
+                        raw_move.write({'state': 'done'})
                 record.production_id.button_mark_done1()
                 # self.production_id.state = 'done'
 

sf_sale/views/sale_order_view.xml

@@ -81,12 +81,9 @@
                 <!--                    </attribute>-->
                 <!--                </xpath>-->
                 <xpath expr="//form/header/button[@name='action_confirm'][2]" position="replace">
-                    <field name="mrp_production_count" invisible="1"
-                           groups="sf_base.group_sale_salemanager,sf_base.group_sale_director"/>
                     <button name="action_confirm" data-hotkey="v"
-                            groups="sf_base.group_sale_salemanager,sf_base.group_sale_director"
                             string="确认" type="object" context="{'validate_analytic': True}"
-                            attrs="{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&amp;','&amp;',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel']),('mrp_production_count', '!=', 0)]}"/>
+                            attrs="{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&amp;','&amp;',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel']),('delivery_status', '!=', False)]}"/>
                 </xpath>
                 <xpath expr="//form/header/button[@name='action_cancel']" position="attributes">
                     <attribute name="attrs">{'invisible': ['|','&amp;',('state', 'in',