Accept Merge Request #874: (feature/修复分配工厂创建订单和质检接口 -> develop)

Merge Request: 修复分配工厂创建订单和质检接口

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/874#mr-874-review-129033

sf_dlm/data/product_data.xml

@@ -35,14 +35,14 @@
             <field name="type">功能刀具</field>
         </record>
 
-<!--        <record id="res_partner_bfm" model="res.partner">-->
-<!--            <field name="name">业务平台</field>-->
-<!--            &lt;!&ndash;            <field name="company_id" ref="base.main_company"/>&ndash;&gt;-->
-<!--        </record>-->
+        <record id="res_partner_bfm" model="res.partner">
+            <field name="name">业务平台</field>
+            <!--            <field name="company_id" ref="base.main_company"/>-->
+        </record>
 
 <!--        <record id="res_users_bfm" model="res.users">-->
 <!--            <field name="name">业务平台</field>-->
-<!--            <field name="partner_id" ref="res_partner_bfm"/>-->
+<!--&lt;!&ndash;            <field name="partner_id" ref="res_partner_bfm"/>&ndash;&gt;-->
 <!--        </record>-->
 
         <record id="product_functional_tool_sf" model="product.product">

sf_manufacturing/models/mrp_workorder.py

@@ -655,7 +655,8 @@ class ResMrpWorkOrder(models.Model):
             reportPath = reportPath[1:]
         serverdir = os.path.join('/tmp', reportPath)
         logging.info('get_detection_file-serverdir:%s' % serverdir)
-        for root, dirs, files in os.walk(serverdir):
+        serverdir_prefix = os.path.dirname(serverdir)
+        for root, dirs, files in os.walk(serverdir_prefix):
             for filename in files:
                 if filename == os.path.basename(reportPath):
                     report_file_path = os.path.join(root, filename)

sf_manufacturing/views/mrp_workorder_view.xml

@@ -434,7 +434,7 @@
                 <field name="results" invisible="1"/>
                 <page string="后置三元检测" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
                     <group>
-                        <field name="test_result" widget="selection" attrs='{"invisible":[("results","!=",False)]}'/>
+                        <field name="test_result" readonly="1" attrs='{"invisible":[("results","!=",False)]}'/>
                         <field name="results" readonly="1" attrs='{"invisible":[("results","!=","合格")]}'/>
                         <field name="detection_report" attrs='{"invisible":[("results","!=",False)]}'
                                widget="pdf_viewer"/>

sf_sale/models/sale_order.py

@@ -78,7 +78,6 @@ class ReSaleOrder(models.Model):
             return customer
         else:
             partner = self.env['res.partner'].create({'name': '业务平台'})
-            self.env['res.users'].create({'name': '业务平台', 'partner_id': partner.id})
             return partner
 
     # 业务平台分配工厂时在创建完产品后再创建销售明细信息