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

sf_manufacturing/controllers/controllers.py

@@ -667,7 +667,7 @@ class Manufacturing_Connect(http.Controller):
             logging.info('AGVDownProduct error:%s' % e)
         return json.JSONEncoder().encode(res)
 
-    @http.route('/AutoDeviceApi/GetAgvStationState', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/AgvStationState', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def AGVStationState(self, **kw):
         """

sf_manufacturing/models/mrp_workorder.py

@@ -966,10 +966,9 @@ class ResMrpWorkOrder(models.Model):
                                             workorder.state = 'ready'
                                         else:
                                             workorder.state = 'waiting'
-
-                    # else:
-                    #     if workorder.state not in ['cancel', 'rework']:
-                    #         workorder.state = 'rework'
+                elif workorder.production_id.state == 'scrap':
+                    if workorder.routing_type == '解除装夹' and unclamp_workorder.test_results == '报废':
+                        workorder.state = 'waiting'
                 if workorder.routing_type == '装夹预调' and workorder.state in ['waiting', 'ready', 'pending']:
                     workorder_ids = workorder.production_id.workorder_ids
                     work_bo = True

sf_manufacturing/views/mrp_workorder_view.xml

@@ -218,7 +218,7 @@
             <xpath expr="//label[1]" position="before">
                 <field name='routing_type' readonly="1"/>
                 <field name='process_state' attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
-                <field name="rfid_code" force_save="1" readonly="0" cache="True"
+                <field name="rfid_code" force_save="1" readonly="1" cache="True"
                        attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
                 <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
             </xpath>

sf_manufacturing/wizard/production_wizard_views.xml

@@ -12,7 +12,7 @@
                         重新生成制造订单
                         <field name="is_remanufacture" force_save="1"/>
                     </div>
-                    <div>
+                    <div attrs='{"invisible": [("is_remanufacture","=",False)]}'>
                         <span style='font-weight:bold;'>申请重新编程
                             <field name="is_reprogramming" force_save="1"
                                    attrs='{"readonly": [("programming_state","not in",["已下发"])]}'/>

sf_manufacturing/wizard/rework_wizard_views.xml

@@ -16,10 +16,10 @@
                                attrs='{"invisible": [("routing_type","=","装夹预调")]}' widget="many2many_tags"/>
                     </group>
                     <div attrs='{"invisible": [("reprogramming_num","=",0)]}'>
-                        注意: 该制造订单的产品已重复编程过<field
+                        注意: 该制造订单产品已申请重新编程次数为<field
                             name="reprogramming_num" string=""
                             readonly="1"
-                            style='color:red;'/>次,且当前编程状态为
+                            style='color:red;'/>,且当前编程状态为
                         <field name="programming_state" string=""
                                decoration-info="programming_state == '待编程'"
                                decoration-success="programming_state == '已下发'"