jinling.yang
|
ee565d3796
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复销售权限组
|
2023-12-15 17:39:16 +08:00 |
|
yuxianghui
|
8371875d62
|
放开机床换刀申请模块记录没有功能刀具信息时换刀申请按键的权限
|
2023-12-11 15:41:31 +08:00 |
|
jinling.yang
|
a3f6fdda2a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
# Conflicts:
# sf_tool_management/__init__.py
# sf_tool_management/models/base.py
|
2023-12-11 14:54:23 +08:00 |
|
jinling.yang
|
6bf3df0ef4
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限去掉继承
|
2023-12-11 14:47:34 +08:00 |
|
yuxianghui
|
94df139110
|
1、新增刀具管理模块安装时根据已有机床设备存在的刀位创建机台换刀申请记录
|
2023-12-11 14:41:31 +08:00 |
|
yuxianghui
|
f8426ae4c3
|
1、重构CAM工单程序用刀计划模型；2、机床换刀申请模型的申请换刀、转移按键增加显示条件，关闭换刀申请弹窗和功能刀具组装弹窗的功能刀具类型字段创建记录的功能；
|
2023-12-08 17:29:32 +08:00 |
|
mgw
|
8664c196f0
|
刀具物料查询功能本地测试完成，推至线上测试
|
2023-06-29 14:23:10 +08:00 |
|
龚启豪
|
ec0da8cf76
|
Merge branch refs/heads/develop into refs/heads/feature/设备维保
|
2023-06-28 10:39:23 +08:00 |
|
qihao.gong@jikimo.com
|
8b227d9ac9
|
设备维保
|
2023-06-25 17:37:55 +08:00 |
|
yuxianghui
|
f135f0a5e7
|
完成了弹窗换刀需求信息的视图和默认数据的同步
|
2023-06-21 17:21:58 +08:00 |
|
yuxianghui
|
24fd92fa3b
|
对功能刀具预警、实时分布和出入库记录的代码进行了合并优化
|
2023-06-14 16:27:16 +08:00 |
|
yuxianghui
|
3236d477c0
|
sf的功能刀具实时分布和功能刀具出入库记录视图界面已建立
|
2023-06-13 17:13:15 +08:00 |
|