Accept Merge Request #1133: (release/release_2.0 -> master)

Merge Request: 修复多面工单产线状态

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1133?initial=true

sf_manufacturing/controllers/controllers.py

@@ -229,12 +229,12 @@ class Manufacturing_Connect(http.Controller):
             #     request.env['sf.production.plan'].sudo().search([('production_id', '=', production_id)]).write(
             #         {'actual_end_time': workorder.date_finished,
             #          'state': 'finished'})
-                # production_obj = request.env['mrp.production'].sudo().search([('name', '=', production_id)])
-                # if production_obj:
-                #     production_obj.sudo().work_order_state = '已完成'
-                #     production_obj.write({'state': 'done'})
-                    # request.env['sale.order'].sudo().search(
-                    #     [('name', '=', production_obj.origin)]).write({'schedule_status': 'to deliver'})
+            # production_obj = request.env['mrp.production'].sudo().search([('name', '=', production_id)])
+            # if production_obj:
+            #     production_obj.sudo().work_order_state = '已完成'
+            #     production_obj.write({'state': 'done'})
+            # request.env['sale.order'].sudo().search(
+            #     [('name', '=', production_obj.origin)]).write({'schedule_status': 'to deliver'})
 
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
@@ -471,10 +471,14 @@ class Manufacturing_Connect(http.Controller):
                                     workorder = request.env['mrp.workorder'].sudo().search(domain, order='id asc')
                                     if workorder:
                                         for order in workorder:
-                                            if order.production_id.production_line_state == '待上产线':
+                                            if order.production_line_state == '待上产线':
                                                 logging.info(
-                                                    '制造订单产线状态:%s' % order.production_id.production_line_state)
-                                                order.production_id.write({'production_line_state': '已上产线'})
+                                                    '工单产线状态:%s' % order.production_line_state)
+                                                panel_workorder = request.env['mrp.workorder'].sudo().search(
+                                                    [('rfid_code', '=', rfid_code),
+                                                     ('processing_panel', '=', order.processing_panel)])
+                                                if panel_workorder:
+                                                    panel_workorder.write({'production_line_state': '已上产线'})
                                                 workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
                                                     [
                                                         ('rfid_code', '=', rfid_code), ('type', '=', '上产线'),
@@ -528,10 +532,14 @@ class Manufacturing_Connect(http.Controller):
                                     workorder = request.env['mrp.workorder'].sudo().search(domain, order='id asc')
                                     if workorder:
                                         for order in workorder:
-                                            if order.production_id.production_line_state == '已上产线':
+                                            if order.production_line_state == '已上产线':
                                                 logging.info(
-                                                    '制造订单产线状态:%s' % order.production_id.production_line_state)
-                                                order.production_id.write({'production_line_state': '已下产线'})
+                                                    '工单产线状态:%s' % order.production_line_state)
+                                                panel_workorder = request.env['mrp.workorder'].sudo().search(
+                                                    [('rfid_code', '=', rfid_code),
+                                                     ('processing_panel', '=', order.processing_panel)])
+                                                if panel_workorder:
+                                                    panel_workorder.write({'production_line_state': '已下产线'})
                                                 workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
                                                     [
                                                         ('rfid_code', '=', rfid_code), ('type', '=', '下产线'),

sf_manufacturing/models/mrp_production.py

@@ -55,9 +55,9 @@ class MrpProduction(models.Model):
     glb_file = fields.Binary("glb模型文件")
     production_line_id = fields.Many2one('sf.production.line', string='生产线', tracking=True)
     plan_start_processing_time = fields.Datetime('计划开始加工时间')
-    production_line_state = fields.Selection(
-        [('待上产线', '待上产线'), ('已上产线', '已上产线'), ('已下产线', '已下产线')],
-        string='上/下产线', default='待上产线', tracking=True)
+    # production_line_state = fields.Selection(
+    #     [('待上产线', '待上产线'), ('已上产线', '已上产线'), ('已下产线', '已下产线')],
+    #     string='上/下产线', default='待上产线', tracking=True)
     # 工序状态
     # Todo 研究下用法
     process_state = fields.Selection([

sf_manufacturing/models/mrp_workorder.py

@@ -193,8 +193,9 @@ class ResMrpWorkOrder(models.Model):
 
     production_line_id = fields.Many2one('sf.production.line', related='production_id.production_line_id',
                                          string='生产线', store=True, tracking=True)
-    production_line_state = fields.Selection(related='production_id.production_line_state',
-                                             string='上/下产线', store=True, tracking=True)
+    production_line_state = fields.Selection(
+        [('待上产线', '待上产线'), ('已上产线', '已上产线'), ('已下产线', '已下产线')],
+        string='上/下产线', default='待上产线', tracking=True)
     detection_report = fields.Binary('检测报告', readonly=True)
     is_remanufacture = fields.Boolean(string='重新生成制造订单', default=False)
     is_fetchcnc = fields.Boolean(string='重新获取NC程序', default=False)

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -87,7 +87,7 @@
                 </xpath>
                 <xpath expr="//field[@name='user_id']" position="after">
                     <field name="production_line_id" readonly="1"/>
-                    <field name="production_line_state" readonly="1"/>
+<!--                    <field name="production_line_state" readonly="1"/>-->
                     <field name="part_number" string="成品的零件图号"/>
                     <field name="part_drawing"/>
                 </xpath>