qihao.gong@jikimo.com 8f795096c3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划 ...

# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/views/mrp_workcenter_views.xml

2023-07-14 09:02:48 +08:00

..

model_type_view.xml

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能

2023-06-29 17:14:48 +08:00

mrp_routing_workcenter_view.xml

1.sf的工作中心新增表面工艺字段，工序类型新增表面工艺类型，且当工序类型为表面工艺时，则显示表面工艺，其他则不显示

2023-03-30 17:52:05 +08:00

mrp_workcenter_views.xml

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划

2023-07-14 09:02:48 +08:00

mrp_workorder_view.xml

工单的完成按钮代码还原

2023-07-13 17:17:48 +08:00

production_line_view.xml

将生产线模型从设备模块搬移到了制造模块，新增工作日历设置修改休息日字段则工作日历创建新记录

2023-07-13 16:05:38 +08:00

stock_picking_view.xml

判断外协工序是否连续有多个外协工序为同一个供应商（产品为表面工艺服务的供应商）,

2023-04-14 17:54:20 +08:00

tray_view.xml

序列号去除中文（打印条形码不能带中文否则会报错）

2023-02-22 17:14:42 +08:00