Accept Merge Request #1177: (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/1177?initial=true

sf_manufacturing/views/mrp_workorder_view.xml

@@ -475,7 +475,8 @@
                             <field name="status" readonly="1" widget="badge"
                                    decoration-success="status == '已配送'"
                                    decoration-warning="status == '待下发'"
-                                   decoration-danger="status == '待配送'"/>
+                                   decoration-danger="status == '待配送'"
+                                   decoration-info="status== '已取消'"/>
                         </tree>
                     </field>
                 </page>
@@ -635,7 +636,9 @@
                 <field name="status" widget="badge"
                        decoration-success="status == '已配送'"
                        decoration-warning="status == '待下发'"
-                       decoration-danger="status == '待配送'"/>
+                       decoration-danger="status == '待配送'"
+                       decoration-info="status == '已取消'"
+                />
                 <field name="name"/>
                 <field name="production_id"/>
                 <field name="type" readonly="1"/>
@@ -731,7 +734,7 @@
         </field>
         <field name="view_mode">tree,form</field>
         <field name="domain">
-            [('type','in',['上产线','下产线']),('workorder_state','=','done'),('is_manual_work','=',false)]
+            [('type','in',['上产线','下产线']),('workorder_state','in',['done','rework']),('is_manual_work','=',false)]
         </field>
     </record>