jinling.yang ed0d57c364 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/models/mrp_workorder.py

2024-08-02 14:41:42 +08:00

..

controllers

注释及还原代码

2024-08-01 15:18:57 +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-08-02 14:41:42 +08:00

report

设备类别新增选项

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

security

修复cnc工单按钮显示问题

2024-07-24 11:40:16 +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-08-02 14:41:42 +08:00

wizard

修复返工-cmm

2024-07-29 16:36:46 +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

master-sf1.0

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