Accept Merge Request #1790: (feature/制造功能优化 -> develop)

Merge Request: 人工线下加工工单也需要走cloud编程流程的优化需求

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

sf_manufacturing/models/mrp_production.py

@@ -1305,6 +1305,7 @@ class MrpProduction(models.Model):
                     # 对制造订单所以面的cnc工单的程序用刀进行校验
                     try:
                         logging.info(f'已更新制造订单：{productions_not_delivered}')
+                        productions = productions.filtered(lambda p: p.production_type == '自动化产线加工')
                         productions.production_cnc_tool_checkout()
                     except Exception as e:
                         logging.info(f'对cnc工单的程序用刀进行校验报错：{e}')

sf_manufacturing/models/stock.py

@@ -289,7 +289,7 @@ class StockRule(models.Model):
                 if production_item.product_id.id in product_id_to_production_names:
                     # 同一个产品多个制造订单对应一个编程单和模型库
                     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
-                    if not production_item.programming_no and production_item.production_type == '自动化产线加工':
+                    if not production_item.programming_no and production_item.production_type in ['自动化产线加工', '人工线下加工']:
                         if not production_programming.programming_no:
                             production_item.fetchCNC(
                                 ', '.join(product_id_to_production_names[production_item.product_id.id]))

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -117,11 +117,11 @@
                 <xpath expr="//sheet//group//group//div[3]" position="after">
                     <field name="production_type" readonly="1"/>
                     <field name="manual_quotation" readonly="1"
-                           attrs="{'invisible': [('production_type', 'not in', ['自动化产线加工'])]}"/>
+                           attrs="{'invisible': [('production_type', 'not in', ['自动化产线加工', '人工线下加工'])]}"/>
                     <field name="programming_no" readonly="1"
-                           attrs="{'invisible': [('production_type', 'not in', ['自动化产线加工'])]}"/>
+                           attrs="{'invisible': [('production_type', 'not in', ['自动化产线加工', '人工线下加工'])]}"/>
                     <field name="programming_state" readonly="1"
-                           attrs="{'invisible': [('production_type', 'not in', ['自动化产线加工'])]}"
+                           attrs="{'invisible': [('production_type', 'not in', ['自动化产线加工', '人工线下加工'])]}"
                            decoration-success="programming_state == '已编程'"
                            decoration-warning="programming_state =='编程中'"
                            decoration-danger="programming_state =='已编程未下发'"/>
@@ -632,6 +632,8 @@
                         <field name="state" icon="fa-filter" enable_counters="1"/>
                         <field name="delivery_status" icon="fa-filter" enable_counters="1"/>
                         <field name="production_type" icon="fa-filter" enable_counters="1"/>
+                        <field name="programming_state" icon="fa-filter" enable_counters="1"/>
+
                     </searchpanel>
                 </xpath>
                 <filter name='todo' position="replace"/>

sf_manufacturing/views/mrp_workorder_view.xml

@@ -493,7 +493,7 @@
                     </group>
                 </page>
 
-                <page string="2D加工图纸" attrs="{'invisible': [('routing_type','!=','装夹预调')]}">
+                <page string="2D加工图纸" attrs='{"invisible": [("routing_type","not in",["装夹预调", "人工线下加工"])]}'>
                     <field name="machining_drawings" widget="adaptive_viewer"/>
                 </page>
 
@@ -565,7 +565,7 @@
                 </page>
             </xpath>
             <xpath expr="//page[1]" position="before">
-                <page string="CNC程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
+                <page string="CNC程序" attrs='{"invisible": [("routing_type","not in",["CNC加工", "人工线下加工"])]}'>
                     <field name="cnc_ids" widget="one2many" string="工作程序" default_order="sequence_number,id"
                            readonly="0">
                         <tree>
@@ -589,7 +589,7 @@
                     </field>
 
                 </page>
-                <page string="CMM程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
+                <page string="CMM程序" attrs='{"invisible": [("routing_type","not in",["CNC加工", "人工线下加工"])]}'>
                     <field name="cmm_ids" widget="one2many" string="CMM程序" readonly="1">
                         <tree>
                             <field name="sequence_number"/>
@@ -642,7 +642,7 @@
         <field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
         <field name="arch" type="xml">
             <xpath expr="//form//sheet//group//group[2]" position="replace">
-                <group string="装夹图纸" attrs="{'invisible': [('routing_type', '!=', '装夹预调')]}">
+                <group string="装夹图纸" attrs="{'invisible': [('routing_type', 'not in', ['装夹预调', '人工线下加工'])]}">
                     <!--                         隐藏加工图纸字段名 -->
                     <field name="processing_drawing" widget="pdf_viewer" string="" readonly="1"/>
                     <!--                    <field name="production_id" invisible="0"/>-->