jinling.yang
|
55504c2725
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能
|
2023-08-24 17:32:25 +08:00 |
|
jinling.yang
|
f9e4b73fb0
|
新增上传模型功能
|
2023-08-23 17:34:06 +08:00 |
|
qihao.gong@jikimo.com
|
90868d4a09
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
|
2023-08-23 14:37:20 +08:00 |
|
qihao.gong@jikimo.com
|
b01a5a4216
|
刀把类型新增bt50 修改同步品牌图片报错问题
|
2023-08-23 14:37:02 +08:00 |
|
jinling.yang
|
cd33fb9fb9
|
夹具型号同步修复
|
2023-08-23 10:09:47 +08:00 |
|
jinling.yang
|
fb8ca5f145
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面布局
|
2023-08-21 15:35:50 +08:00 |
|
jinling.yang
|
3ab0fcb337
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面布局
|
2023-08-21 11:50:36 +08:00 |
|
jinling.yang
|
f6841e5e9f
|
同步材料型号及优化材料型号页面及新增拉伸强度，硬度，粗加工，精加工
|
2023-08-21 11:49:24 +08:00 |
|
qihao.gong@jikimo.com
|
82322b5024
|
修改设备table和跳转到维保 设备改为维保
|
2023-08-21 10:27:50 +08:00 |
|
qihao.gong@jikimo.com
|
43d6794151
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
# Conflicts:
# sf_base/views/base_view.xml
# sf_mrs_connect/models/sync_common.py
|
2023-08-18 14:34:37 +08:00 |
|
qihao.gong@jikimo.com
|
c924426725
|
品牌备注
|
2023-08-18 14:31:28 +08:00 |
|
jinling.yang
|
97fcf6d91f
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
# Conflicts:
# sf_base/views/base_view.xml
|
2023-08-17 18:03:12 +08:00 |
|
jinling.yang
|
8a99bd8589
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
|
2023-08-15 17:31:49 +08:00 |
|
qihao.gong@jikimo.com
|
abddb82f94
|
修改数控系统同步参数
|
2023-08-15 14:21:41 +08:00 |
|
qihao.gong@jikimo.com
|
ce3ffb75ae
|
处理控制系统参数丢失问题
|
2023-08-11 17:06:57 +08:00 |
|
qihao.gong@jikimo.com
|
94efe4e7ca
|
处理同步报错
|
2023-08-11 10:26:15 +08:00 |
|
qihao.gong@jikimo.com
|
f0e1939b95
|
修改设备参数以及机床型号基础参数以及同步cloud方法
|
2023-08-07 16:00:26 +08:00 |
|
jinling.yang
|
21a69a1048
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/Bug修复
|
2023-07-26 18:52:56 +08:00 |
|
jinling.yang
|
7ee652d021
|
1.夹具物料,联装类型，功能夹具类型的Tree视图去掉删除方法和删除操作;同步的方法里新增active字段
2.品牌模型新增厂家型号字段
3.修复3D模型全屏展示及不显示模型Bug
|
2023-07-26 18:52:27 +08:00 |
|
mgw
|
7671830648
|
修复同步bug
|
2023-07-26 16:52:56 +08:00 |
|
mgw
|
e44e44df41
|
sf处功能刀具修改及其同步，目录位置调整
|
2023-07-19 10:03:53 +08:00 |
|
jinling.yang
|
f68dce9ee2
|
修复产品模板中产品类别为刀具和夹具时，根据产品类别为刀具和夹具时，新增的page页面里的字段显示及回显Bug
|
2023-07-17 16:46:01 +08:00 |
|
jinling.yang
|
5beb7b3417
|
优化装夹工单，新增工件装夹page，名字为组件的page名称改为物料，去掉单独的工件装夹功能
|
2023-07-13 16:57:48 +08:00 |
|
qihao.gong@jikimo.com
|
e6060b9bab
|
修改维保标准维保项目参数为One2many对象 并与设备，维保计划关联，修改原生维保计划方法 根据保养和检修生成不同的维保计划单
|
2023-07-04 17:30:50 +08:00 |
|
mgw
|
576d2d7758
|
解决代码冲突
|
2023-06-29 19:59:39 +08:00 |
|
jinling.yang
|
0f7f67aade
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能
|
2023-06-29 17:14:48 +08:00 |
|
mgw
|
7689701ab1
|
刀具同步优化完成，字段已添加
|
2023-06-28 20:49:16 +08:00 |
|
jinling.yang
|
aea68f5239
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能
# Conflicts:
# sf_base/__manifest__.py
# sf_base/models/__init__.py
# sf_mrs_connect/data/ir_cron_data.xml
# sf_mrs_connect/models/sync_common.py
|
2023-06-27 16:40:58 +08:00 |
|
jinling.yang
|
d18b1808d9
|
新增同步夹具相关的定时器
|
2023-06-27 16:35:30 +08:00 |
|
jinling.yang
|
87e3f6d04e
|
新增夹具和功能夹具，及同步mrs的夹具和功能夹具
|
2023-06-26 18:07:44 +08:00 |
|
mgw
|
65c8d4a4e9
|
sf刀具重构完成，同步方法测试完成
|
2023-06-25 16:44:10 +08:00 |
|
jinling.yang
|
8a0d89161b
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板
|
2023-06-15 16:15:28 +08:00 |
|
jinling.yang
|
c7ec8be141
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板
|
2023-06-15 16:14:50 +08:00 |
|
mgw
|
ba93adfb7b
|
修复同步bug（刀片类型字段无值）
|
2023-06-15 15:40:23 +08:00 |
|
jinling.yang
|
34cc5bf125
|
新增刀具及刀具型号联动展示相关字段并显示对应信息，不同刀具的页面布局
|
2023-06-14 19:22:52 +08:00 |
|
mgw
|
93c5bcebe1
|
增加刀具物料同步功能
|
2023-06-14 16:33:53 +08:00 |
|
jinling.yang
|
6068a55b79
|
新增sf的刀具模板的相关刀具物料字段
|
2023-06-13 17:30:35 +08:00 |
|
yuxianghui
|
3a8c65c8d1
|
解决sf代码冲突问题
|
2023-06-13 11:19:06 +08:00 |
|
qihao.gong@jikimo.com
|
3baa438c2b
|
每日同步刀具定时器
|
2023-06-12 16:17:42 +08:00 |
|
mgw
|
06f907ba00
|
更正图片无法同步的bug
|
2023-06-12 15:09:30 +08:00 |
|
mgw
|
56580fa22a
|
同步方法已完成，合并
|
2023-06-12 14:48:06 +08:00 |
|
mgw
|
a1678f76c2
|
同步方法基本完成，优化图片展示
|
2023-06-12 13:17:52 +08:00 |
|
mgw
|
f95e04afc9
|
刀具同步方法（cloud >>> sf）基本完成，待测试
|
2023-06-12 09:24:33 +08:00 |
|
mgw
|
ac66e15d7a
|
部分cloud>sf同步接口已完成并测试
|
2023-06-09 18:15:12 +08:00 |
|
qihao.gong@jikimo.com
|
38b383ec29
|
解决bug
|
2023-04-24 10:57:44 +08:00 |
|
qihao.gong@jikimo.com
|
b999e9f065
|
解决报错
|
2023-04-24 10:42:29 +08:00 |
|
jinling.yang
|
20d9e469f5
|
表面工艺类别拖动排序
|
2023-03-29 17:48:03 +08:00 |
|
jinling.yang
|
bf010e2cca
|
去掉警告及开发表面工艺相关需求
|
2023-03-27 21:04:33 +08:00 |
|
jinling.yang
|
446bd04a9d
|
新增同步mrs的表面工艺类别接口
|
2023-03-23 18:18:57 +08:00 |
|
gqh
|
84ef243b9f
|
sf新增表面工艺参数同步接口和基础对象，新增dockerfile和requirements.txt文件
|
2023-03-14 14:56:18 +08:00 |
|