Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造订单列表页及详情页优化需求

sf_manufacturing/controllers/controllers.py

@@ -203,6 +203,7 @@ class Manufacturing_Connect(http.Controller):
             res = {'Succeed': True, 'Datas': ['工单已结束']}
             datas = request.httprequest.data
             ret = json.loads(datas)
+            logging.info('button_Work_End:%s' % ret)
             request.env['center_control.interface.log'].sudo().create(
                 {'content': ret, 'name': 'AutoDeviceApi/FeedBackEnd'})
             production_id = ret['BillId']

sf_manufacturing/models/mrp_workorder.py

@@ -1215,11 +1215,13 @@ class CNCprocessing(models.Model):
 
     # 将FTP的多面的程序单文件下载到临时目录
     def download_file_tmp(self, production_no, processing_panel):
-        remotepath = os.path.join('/NC', production_no, 'return', processing_panel)
+        remotepath = os.path.join('/home/ftp/ftp_root/NC', production_no, 'return', processing_panel)
         serverdir = os.path.join('/tmp', production_no, 'return', processing_panel)
         ftp_resconfig = self.env['res.config.settings'].get_values()
         ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']), ftp_resconfig['ftp_user'],
                             ftp_resconfig['ftp_password'])
+        if not ftp.file_exists_1(remotepath):
+            logging.info('目录不存在:%s' % remotepath)
         download_state = ftp.download_program_file(remotepath, serverdir)
         logging.info('download_state:%s' % download_state)
         return download_state

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -68,7 +68,6 @@
                         draft,confirmed,progress,completed,done
                     </attribute>
                 </xpath>
-
                 <xpath expr="//sheet//group//group[2]//label" position="before">
                     <!--                     <field name="process_state"/> -->
                     <field name="state"/>
@@ -79,8 +78,8 @@
                     <field name="programming_no" readonly="1"/>
                     <field name="work_state" invisible="1"/>
                     <field name="schedule_state" invisible='1'/>
-                    <field name="manual_quotation" readonly="1"/>
                     <field name="programming_state" readonly="1"/>
+                    <field name="manual_quotation" readonly="1"/>
                 </xpath>
                 <xpath expr="//field[@name='user_id']" position="before">
                     <field name="plan_start_processing_time" readonly="1"/>
@@ -255,7 +254,9 @@
                 </xpath>
 
                 <xpath expr="//sheet//notebook//page[@name='operations']" position="attributes">
-                    <attribute name="attrs">{'invisible': [('schedule_state', '=', '未排')]}</attribute>
+                    <attribute name="attrs">{'invisible': ['|',('schedule_state', '=', '未排'),('workorder_ids', '=',
+                        [])]}
+                    </attribute>
                 </xpath>
             </field>
         </record>