From b45ffcc0d2c8a95b6db4666bf69469ec6fae3fe4 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Mon, 29 Apr 2024 17:34:00 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BB=B6=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E5=90=91=E5=AF=BC2.=E5=A2=9E=E5=8A=A0rfid=E7=A0=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/mrp_workorder.py      |  6 ++
 sf_manufacturing/views/mrp_workorder_view.xml | 57 +++++++++----------
 .../wizard/workpiece_delivery_wizard.py       |  5 ++
 3 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py
index 2cadeef5..20077f3c 100644
--- a/sf_manufacturing/models/mrp_workorder.py
+++ b/sf_manufacturing/models/mrp_workorder.py
@@ -180,6 +180,11 @@ class ResMrpWorkOrder(models.Model):
     detection_report = fields.Binary('检测报告', readonly=True)
     is_remanufacture = fields.Boolean(string='是否重新生成制造订单', default=True)
 
+    @api.onchange('rfid_code')
+    def _onchange(self):
+        if self.rfid_code and self.state == 'progress':
+            self.workpiece_delivery_ids[0].write({'rfid_code': self.rfid_code})
+
     def get_plan_workorder(self, production_line):
         tomorrow = (date.today() + timedelta(days=+1)).strftime("%Y-%m-%d")
         tomorrow_start = tomorrow + ' 00:00:00'
@@ -1106,6 +1111,7 @@ class WorkPieceDelivery(models.Model):
     status = fields.Selection(
         [('待下发', '待下发'), ('待配送', '待配送'), ('已配送', '已配送')], string='状态', default='待下发')
     is_cnc_program_down = fields.Boolean('程序是否下发', default=False)
+    rfid_code = fields.Char('rfid码')
     active = fields.Boolean(string="有效", default=True)
 
     @api.model
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index 0ebc58bb..9cfb9e40 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -43,7 +43,7 @@
                 <attribute name="attrs">{'invisible':
                     ['|',("user_permissions","=",False),("name","=","获取CNC加工程序")]}
                 </attribute>
-<!--                 <attribute name="string">停工</attribute> -->
+                <!--                 <attribute name="string">停工</attribute> -->
             </xpath>
             <xpath expr="//button[@name='action_open_wizard']" position="attributes">
                 <attribute name="invisible">1</attribute>
@@ -111,36 +111,38 @@
                 <field name='name' invisible="1"/>
                 <field name='is_delivery' invisible="1"/>
                 <!--                 工单form页面的开始停工按钮等 -->
-<!--                 <button name="button_start" type="object" string="开始" class="btn-success" -->
-<!--                         attrs="{'invisible': ['|', '|', ('production_state', 'not in', ('pending_processing', 'pending_cam', 'pending_era_cam')), ('state','!=','ready'), ('routing_type', 'not in', ('装夹预调', 'CNC加工', '解除装夹'))]}" -->
-<!--                         groups="sf_base.group_sf_mrp_user"/> -->
-<!--                 <button name="button_pending" type="object" string="暂停" class="btn-warning" -->
-<!--                         attrs="{'invisible': ['|', '|', ('production_state', 'not in', ('pending_processing', 'pending_cam', 'pending_era_cam')), ('state','!=','progress'), ('routing_type', 'not in', ('装夹预调', 'CNC加工', '解除装夹'))]}" -->
-<!--                         groups="sf_base.group_sf_mrp_user"/> -->
-<!--                 <button name="button_finish" type="object" string="完成" class="btn-success" -->
-<!--                         attrs="{'invisible': ['|', '|', ('production_state', 'not in', ('pending_processing', 'pending_cam', 'pending_era_cam')), ('state','!=','progress'), ('routing_type', 'not in', ('装夹预调', 'CNC加工', '解除装夹'))]}" -->
-<!--                         groups="sf_base.group_sf_mrp_user" confirm="是否确认完工"/> -->
+                <!--                 <button name="button_start" type="object" string="开始" class="btn-success" -->
+                <!--                         attrs="{'invisible': ['|', '|', ('production_state', 'not in', ('pending_processing', 'pending_cam', 'pending_era_cam')), ('state','!=','ready'), ('routing_type', 'not in', ('装夹预调', 'CNC加工', '解除装夹'))]}" -->
+                <!--                         groups="sf_base.group_sf_mrp_user"/> -->
+                <!--                 <button name="button_pending" type="object" string="暂停" class="btn-warning" -->
+                <!--                         attrs="{'invisible': ['|', '|', ('production_state', 'not in', ('pending_processing', 'pending_cam', 'pending_era_cam')), ('state','!=','progress'), ('routing_type', 'not in', ('装夹预调', 'CNC加工', '解除装夹'))]}" -->
+                <!--                         groups="sf_base.group_sf_mrp_user"/> -->
+                <!--                 <button name="button_finish" type="object" string="完成" class="btn-success" -->
+                <!--                         attrs="{'invisible': ['|', '|', ('production_state', 'not in', ('pending_processing', 'pending_cam', 'pending_era_cam')), ('state','!=','progress'), ('routing_type', 'not in', ('装夹预调', 'CNC加工', '解除装夹'))]}" -->
+                <!--                         groups="sf_base.group_sf_mrp_user" confirm="是否确认完工"/> -->
 
                 <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)]}"/>
+                        attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')), ('is_user_working', '!=', False)]}"/>
                 <button name="button_pending" type="object" string="暂停" class="btn-warning"
-                  attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
+                        attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
                 <button name="button_finish" type="object" string="完成" class="btn-success"
-                  attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
+                        attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('is_user_working', '=', False)]}"/>
 
-                <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="阻塞" context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
-                  attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked')]}"/>
-                <button name="button_unblock" type="object" string="取消阻塞" context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
-                  attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked')]}"/>
+                <button name="%(mrp.act_mrp_block_workcenter_wo)d" type="action" string="阻塞"
+                        context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
+                        attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked')]}"/>
+                <button name="button_unblock" type="object" string="取消阻塞"
+                        context="{'default_workcenter_id': workcenter_id}" class="btn-danger"
+                        attrs="{'invisible': ['|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked')]}"/>
 
-<!--                 <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" -->
-<!--                         attrs="{'invisible': ['|',  ('production_state', '!=', 'pending_processing'), ('state','!=','progress')]}"/> -->
-<!--                 <button name="button_unblock" type="object" string="Unblock" -->
-<!--                         context="{'default_workcenter_id': workcenter_id}" class="btn-danger" -->
-<!--                         groups="sf_base.group_sf_mrp_user" -->
-<!--                         attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked'),('state','=','done')]}"/> -->
+                <!--                 <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" -->
+                <!--                         attrs="{'invisible': ['|',  ('production_state', '!=', 'pending_processing'), ('state','!=','progress')]}"/> -->
+                <!--                 <button name="button_unblock" type="object" string="Unblock" -->
+                <!--                         context="{'default_workcenter_id': workcenter_id}" class="btn-danger" -->
+                <!--                         groups="sf_base.group_sf_mrp_user" -->
+                <!--                         attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked'),('state','=','done')]}"/> -->
                 <button name="button_workpiece_delivery" type="object" string="工件配送" class="btn-primary"
                         attrs="{'invisible': ['|',('routing_type','!=','装夹预调'),('is_delivery','=',True)]}"/>
 
@@ -622,12 +624,9 @@
         <field name="model">sf.workpiece.delivery</field>
         <field name="arch" type="xml">
             <search string="工件配送">
-                <!--                <filter string="上产线且待下发" name="on_up"-->
-                <!--                        domain="[('status', '=', '待下发'),('type','=',['上产线'])]"/>-->
-                <!--                <filter string="下产线且待下发" name="on_down"-->
-                <!--                        domain="[('status', '=', '待下发'),('type','=',['下产线'])]"/>-->
                 <filter string="上产线" name="up" domain="[('type', '=', '上产线')]"/>
                 <filter string="下产线" name="down" domain="[('type', '=', '下产线' )]"/>
+                <field name="rfid_code" invisible="1"/>
                 <field name="production_id"/>
                 <field name="feeder_station_start_id"/>
                 <field name="production_line_id"/>
diff --git a/sf_manufacturing/wizard/workpiece_delivery_wizard.py b/sf_manufacturing/wizard/workpiece_delivery_wizard.py
index e8222a1b..d606b8b2 100644
--- a/sf_manufacturing/wizard/workpiece_delivery_wizard.py
+++ b/sf_manufacturing/wizard/workpiece_delivery_wizard.py
@@ -11,6 +11,11 @@ class WorkpieceDeliveryWizard(models.TransientModel):
 
     delivery_ids = fields.Many2many('sf.workpiece.delivery', string='配送')
     workorder_id = fields.Many2one('mrp.workorder', string='工单')
+    production_ids = fields.Many2many('mrp.production', string='制造订单号')
+    destination_production_line_id = fields.Many2one('sf.production.line', '目的生产线')
+    feeder_station_start_id = fields.Many2one('sf.agv.site', '起点接驳站')
+    feeder_station_destination_id = fields.Many2one('sf.agv.site', '目的接驳站')
+
 
     def confirm(self):
         if self.workorder_id: