jinling.yang 7163e025d2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版报废 ...

# Conflicts:
#	sf_manufacturing/security/ir.model.access.csv

2024-07-17 19:32:21 +08:00

..

controllers

1.优化制造订单的检测结果:新增处理结果字段

2024-07-12 17:32:53 +08:00

data

1.优化工单排序2.新增调取cloud编程单的状态方法3.制造订单添加状态为返工及编程状态为"已编程"，“已编程未下发”的过滤条件4，新增返工且编程中的制造订单定时获取Cloud编程单状态的定时器

2024-07-10 17:36:26 +08:00

models

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版报废

2024-07-17 19:32:21 +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-07-17 19:32:21 +08:00

static/src

修改*样式，增加扫码枪判断

2024-02-27 17:57:00 +08:00

views

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版报废

2024-07-17 19:32:21 +08:00

wizard

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版报废

2024-07-17 19:32:21 +08:00

__init__.py

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

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

__manifest__.py

添加报废向导；添加重新生成制造订单

2024-07-17 15:20:31 +08:00

.DS_Store

更改制造模块名

2022-11-22 09:41:52 +08:00