jinling.yang a8e9fe40ac Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整 ...

# Conflicts:
#	sf_manufacturing/models/mrp_production.py
#	sf_manufacturing/views/mrp_production_addional_change.xml

2024-11-15 18:08:31 +08:00

..

controllers

解决冲突

2024-10-15 15:25:31 +08:00

data

交期状态

2024-11-13 14:46:58 +08:00

models

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整

2024-11-15 18:08:31 +08:00

report

设备类别新增选项

2023-09-22 17:01:03 +08:00

security

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整

2024-11-15 18:08:31 +08:00

static/src

增加对Enter的判断

2024-10-24 15:50:32 +08:00

views

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整

2024-11-15 18:08:31 +08:00

wizard

优化制造订单

2024-11-15 18:06:32 +08:00

__init__.py

1.新增工件配送向导2.修复采购审核按钮不可见3.配置中新增agv路径字段4.优化工单上按钮显示条件

2024-01-30 17:40:05 +08:00

__manifest__.py

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整

2024-11-15 18:08:31 +08:00

.DS_Store

master-sf1.0

2023-05-06 16:03:00 +08:00