1.优化agv配置及接口：新增站点集合对象，agv车辆编号及任务单类型编号字段

2.优化rfid和工单部分需求：点完工按钮，若为工件装夹工单，完工需校验工件坯料、RFID码、前置三元定位是否填写；若未填写，页面弹出对应提示，反之则需要二次确认弹窗
3.新增最初版的快速订单：为了工厂测试下单走流程
4.工单优化：新增检测结果和是否重新生成制造订单字段

sf_manufacturing/controllers/controllers.py

@@ -238,7 +238,7 @@ class Manufacturing_Connect(http.Controller):
             workorder = request.env['mrp.workorder'].sudo().search(
                 [('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1)
             if workorder:
-                workorder.test_result = ret['Quality']
+                # workorder.test_results = ret['Quality']
                 logging.info('制造订单:%s' % workorder.production_id.name)
                 if 'ReportPaht' in ret:
                     download_state = request.env['mrp.workorder'].with_user(
@@ -261,8 +261,7 @@ class Manufacturing_Connect(http.Controller):
                                          ('picking_id', '=', stock_picking.id)])
                                     if quality_check:
                                         logging.info('质检单:%s' % quality_check.name)
-                                        quality_check.write({'report_pdf': workorder.detection_report,
-                                                             'report_result': workorder.test_result})
+                                        quality_check.write({'report_pdf': workorder.detection_report})
                     elif download_state == 2:
                         res = {'Succeed': False, 'ErrorCode': 205,
                                'Error': 'ReportPaht中的工件号与制造订单%s不匹配，请检查ReportPaht是否正确' % workorder.production_id.name}

sf_manufacturing/models/mrp_workorder.py

@@ -96,7 +96,8 @@ class ResMrpWorkOrder(models.Model):
     Y10_axis = fields.Float(default=0)
     Z10_axis = fields.Float(default=0)
     X_deviation_angle = fields.Integer(string="X轴偏差度", default=0)
-    test_result = fields.Char("检测结果")
+    test_results = fields.Selection([("合格", "合格"), ("返工", "返工"), ("报废", "报废")], default='合格',
+                                    string="检测结果")
     cnc_ids = fields.One2many("sf.cnc.processing", 'workorder_id', string="CNC加工程序")
     cmm_ids = fields.One2many("sf.cmm.program", 'workorder_id', string="CMM程序")
     tray_code = fields.Char(string="托盘编码")
@@ -141,6 +142,7 @@ class ResMrpWorkOrder(models.Model):
     production_line_state = fields.Selection(related='production_id.production_line_state',
                                              string='上/下产线', store=True)
     detection_report = fields.Binary('检测报告', readonly=True)
+    is_remanufacture = fields.Boolean(string='是否重新生成制造订单', default=True)
 
     def get_plan_workorder(self, production_line):
         tomorrow = (date.today() + timedelta(days=+1)).strftime("%Y-%m-%d")
@@ -444,7 +446,7 @@ class ResMrpWorkOrder(models.Model):
         """
         重新生成制造订单或者重新生成工单
         """
-        if self.test_result == '报废':
+        if self.test_results == '报废':
             values = self.env['mrp.production'].create_production1_values(self.production_id)
             productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(
                 self.production_id.company_id).create(
@@ -476,7 +478,7 @@ class ResMrpWorkOrder(models.Model):
                         'mail.message_origin_link',
                         values={'self': production, 'origin': origin_production},
                         subtype_id=self.env.ref('mail.mt_note').id)
-        if self.test_result == '返工':
+        if self.test_results == '返工':
             productions = self.production_id
             # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
             # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())

sf_manufacturing/views/mrp_workorder_view.xml

@@ -106,16 +106,12 @@
                 <field name='is_delivery' invisible="1"/>
                 <!--                 工单form页面的开始停工按钮等 -->
                 <button name="button_start" type="object" string="开始" class="btn-success"
-                        attrs="{'invisible': ['|', '|', '|', '|','|', ('production_state','in', ('draft', 'done',
-                    'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')),
-                    ('is_user_working', '!=', False),('user_permissions','=',False), ('routing_type', '=', 'CNC加工')]}"
+
                         groups="sf_base.group_sf_mrp_user"/>
                 <button name="button_pending" type="object" string="暂停" class="btn-warning"
-                        groups="sf_base.group_sf_mrp_user"
-                        attrs="{'invisible': ['|', '|','|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False), ('routing_type', '=', 'CNC加工')]}"/>
+                        groups="sf_base.group_sf_mrp_user"/>
                 <button name="button_finish" type="object" string="完成" class="btn-success"
-                        groups="sf_base.group_sf_mrp_user" confirm="是否确认完工"
-                        attrs="{'invisible': ['|', '|','|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False), ('routing_type', '=', 'CNC加工')]}"/>
+                        groups="sf_base.group_sf_mrp_user" confirm="是否确认完工"/>
                 <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="停工"
                         context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
                         groups="sf_base.group_sf_mrp_user"
@@ -184,7 +180,7 @@
                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
                     <field name="functional_fixture_type_id"
                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
-                    <field name="rfid_code"  readonly="1" class="customRFID"
+                    <field name="rfid_code" readonly="1" class="customRFID"
                            attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
                     <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
                     <script src="/sf_manufacturing/static/src/js/customRFID.js"></script>
@@ -437,16 +433,17 @@
                 <field name="results" invisible="1"/>
                 <page string="后置三元检测" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
                     <group>
-                        <field name="test_result" readonly="1" attrs='{"invisible":[("results","!=",False)]}'/>
+                        <field name="test_results" attrs='{"invisible":[("results","!=",False)]}'/>
+                        <field name="is_remanufacture" attrs='{"invisible":[("test_results","=","合格")]}'/>
                         <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>
                         <field name="detection_report" attrs='{"invisible":[("results","!=",False)]}'
                                widget="pdf_viewer"/>
                     </group>
-                    <div class="col-12 col-lg-6 o_setting_box">
-                        <button type="object" class="oe_highlight" name="recreateManufacturingOrWorkerOrder"
-                                string="检测确认"
-                                attrs='{"invisible": ["|","|",("state","!=","progress"),("user_permissions","=",False),("results","=","合格")]}'/>
-                    </div>
+                    <!--                    <div class="col-12 col-lg-6 o_setting_box">-->
+                    <!--                        <button type="object" class="oe_highlight" name="recreateManufacturingOrWorkerOrder"-->
+                    <!--                                string="检测确认"-->
+                    <!--                                attrs='{"invisible": ["|","|",("state","!=","progress"),("user_permissions","=",False),("results","=","合格")]}'/>-->
+                    <!--                    </div>-->
                 </page>
             </xpath>
             <xpath expr="//page[1]" position="before">