Accept Merge Request #215: (feature/sf刀具功能分支 -> develop)

Merge Request: 优化了功能刀具组装的出库弹窗里的确定、取消按键的显示，新增CAM装刀来源的任务出库后修改CAM用刀计划的状态改变为已完成


Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/215?initial=true

sf_tool_management/models/base.py

@@ -251,7 +251,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
     required_cutting_time = fields.Char(string='需要切割时间')
     whether_standard_tool = fields.Boolean(string='是否标准刀')
     need_knife_time = fields.Datetime(string='需要用刀时间')
-    plan_execute_status = fields.Selection([('0', '待下发'), ('1', '执行中'), ('2', '已完成')], string='计划执行状态')
+    plan_execute_status = fields.Selection([('0', '待下发'), ('1', '执行中'), ('2', '已完成')], string='计划执行状态', default='0')
     applicant = fields.Char(string='申请人')
     reason_for_applying = fields.Char(string='申请原因')
     remark = fields.Char(string='备注说明')
@@ -383,7 +383,7 @@ class FunctionalToolAssembly(models.Model):
         """
         self.env['sf.delivery.of.cargo.from.storage'].search([]).unlink()
 
-        vals = self.env['sf.functional.tool.assembly'].search([('check_box', '=', True),('assemble_status', '=', '1')])
+        vals = self.env['sf.functional.tool.assembly'].search([('check_box_1', '=', True),('assemble_status', '=', '1')])
 
         if vals:
             for val in vals:

sf_tool_management/wizard/wizard.py

@@ -250,3 +250,16 @@ class DeliveryOfCargoFromStorage(models.TransientModel):
                     'receive_person': self.env.user.name,
                     'receive_time': fields.Datetime.now()
                 })
+
+                tool_assembly = self.env['sf.functional.tool.assembly'].search([
+                    ('functional_tool_code', '=', val.functional_tool_code),
+                    ('functional_tool_name', '=', val.functional_tool_name)
+                ])
+                # 判断装刀任务来源，如果来源于CAM装刀，则修改CAM装刀的计划执行状态
+                if tool_assembly.loading_task_source == '0':
+                    self.env['sf.cam.work.order.program.knife.plan'].search([
+                        ('functional_tool_code', '=', val.functional_tool_code),
+                        ('functional_tool_name', '=', val.functional_tool_name)
+                    ]).write({
+                        'plan_execute_status': '2'
+                    })

sf_tool_management/wizard/wizard_view.xml

@@ -281,11 +281,12 @@
                     <field name="machine_tool_code"/>
                     <field name="receive_person"/>
                     <field name="receive_time"/>
+
+                    <button string="确定" name="stock_removal" type="object" class="btn-primary" />
+                    <button string="取消" class="btn-secondary" special="cancel"/>
+
                 </tree>
-                <footer>
+
-                     <button string="确定" name="stock_removal" type="object" class="btn-primary" />
-                     <button string="取消" class="btn-secondary" special="cancel"/>
-                 </footer>
             </field>
     </record>