jinling.yang a3357e01aa Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺排序 ...

# Conflicts:
#	sf_manufacturing/models/stock.py
#	sf_mrs_connect/controllers/controllers.py

2024-08-27 11:34:39 +08:00

..

controllers

Merge branch 'feature/销售、刀具模块优化_1' into feature/线边料架接口优化

2024-08-22 10:32:47 +08:00

data

增加以日、月、年为日期期间的序列，工件配送单状态同步，返工时不生成工件配送单

2024-08-20 16:18:47 +08:00

models

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺排序

2024-08-27 11:34:39 +08:00

report

master-sf1.0

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

security

修复agv调度bug

2024-08-19 11:22:30 +08:00

static/src

修复coding问题，增加机床类型返回

2024-08-26 13:23:44 +08:00

views

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废

2024-08-27 11:27:42 +08:00

wizard

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复报废

2024-08-27 11:27:42 +08:00

__init__.py

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

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

__manifest__.py

修复工件配送后没有同步任务下发时间的bug，AGV配置中增加是否下发AGV任务

2024-08-27 10:42:24 +08:00

.DS_Store

master-sf1.0

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