jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #1282: (feature/仓库发货下发bfm -> develop)

Browse Source 
Merge Request: 修改打印日志

Created By: @胡嘉莹
Reviewed By: @胡尧 @管欢
Approved By: @胡尧 
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1282
This commit is contained in:
胡嘉莹
2024-09-09 11:02:17 +08:00
committed by Coding
parent 9b9106c5da 00809d88f6
commit 689d149edc
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sf_base/views/common_view.xml
View File

@@ -12,7 +12,6 @@
</tree> </tree>
</field> </field>
</record> </record>
<record model="ir.ui.view" id="mrs_production_process_parameter_form"> <record model="ir.ui.view" id="mrs_production_process_parameter_form">
<field name="model">sf.production.process.parameter</field> <field name="model">sf.production.process.parameter</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
@@ -26,19 +25,19 @@
<group> <group>
<group> <group>
<field name="code" readonly="1"/> <field name="code" readonly="1"/>
<field name="process_id" readonly="1"/> <field name="process_id" attrs="{'readonly': [('code', '!=', False)]}"/>
<field name="process_description" readonly="1"/> <field name="process_description" attrs="{'readonly': [('code', '!=', False)]}"/>
<field name="gain_way"/> <field name="gain_way"/>
</group> </group>
<group> <group>
<field name="processing_day" readonly="1"/> <field name="processing_day" attrs="{'readonly': [('code', '!=', False)]}"/>
<field name="travel_day" readonly="1"/> <field name="travel_day" attrs="{'readonly': [('code', '!=', False)]}"/>
<field name="processing_mm" readonly="1"/> <field name="processing_mm" attrs="{'readonly': [('code', '!=', False)]}"/>
</group> </group>
</group> </group>
<notebook> <notebook>
<page string="适用材料"> <page string="适用材料">
<field name="materials_model_ids" readonly="1"></field> <field name="materials_model_ids" attrs="{'readonly': [('code', '!=', False)]}"></field>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>

2
sf_bf_connect/models/process_status.py
View File

@@ -53,7 +53,7 @@ class StatusChange(models.Model):
if not ret.get('error'): if not ret.get('error'):
logging.info('接口已经执行=============') logging.info('接口已经执行=============')
else: else:
logging.error('工厂加工同步订单状态失败 {}'.format(ret.text)) logging.error('工厂加工同步订单状态失败 {}'.format(ret))
raise UserError('工厂加工同步订单状态失败') raise UserError('工厂加工同步订单状态失败')
except UserError as e: except UserError as e:
logging.error('工厂加工同步订单状态失败 {}'.format(e)) logging.error('工厂加工同步订单状态失败 {}'.format(e))