Commit Graph

15 Commits

Author SHA1 Message Date
jinling.yang
5292826c72 新增销售权限 2023-11-22 17:58:41 +08:00
qihao.gong@jikimo.com
08ac2978a1 移除托盘对象 并清除所有关联关系 2023-08-17 16:33:40 +08:00
jinling.yang
31d335af48 设备模块文件解决冲突 2023-07-14 10:16:22 +08:00
jinling.yang
98d3e61d66 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化夹具产品模板
# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/__manifest__.py
2023-07-14 10:05:01 +08:00
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
yuxianghui
81842dc5ec 将生产线模型从设备模块搬移到了制造模块,新增工作日历设置修改休息日字段则工作日历创建新记录 2023-07-13 16:05:38 +08:00
qihao.gong@jikimo.com
3544c6a957 密码策略模块测试 2023-07-10 17:33:06 +08:00
yuxianghui
6dfced8541 新增班次对象,新增工作日对象,修改了工作日历设置的班次、工作日字段类型;新增工作日历表对象 2023-07-10 17:26:43 +08:00
qihao.gong@jikimo.com
1502336286 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划 2023-07-10 10:04:18 +08:00
qihao.gong@jikimo.com
78fd5a7ac3 修改工作中心与设备关联关系 2023-07-10 10:03:02 +08:00
yuxianghui
e711ff0ab3 优化了产线设备资源设置,新增根据选取的工作中心自动带出设备的数据,新增根据选择的工作日历自动带出班次的数据,新增搜索视图 2023-07-07 17:36:42 +08:00
jinling.yang
3743c65da9 优化夹具产品模板 2023-06-30 17:35:20 +08:00
mgw
e0315bafc7 修改依赖关系,解决依赖冲突 2023-06-30 15:17:10 +08:00
qihao.gong@jikimo.com
1eea2bb1c3 处理设备与设备维保标准的关联关系方法,新增设备故障报警日志页面 2023-06-27 17:32:24 +08:00
qihao.gong@jikimo.com
8b227d9ac9 设备维保 2023-06-25 17:37:55 +08:00