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
|
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 |
|
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 |
|
mgw
|
65c8d4a4e9
|
sf刀具重构完成，同步方法测试完成
|
2023-06-25 16:44:10 +08:00 |
|
jinling.yang
|
34cc5bf125
|
新增刀具及刀具型号联动展示相关字段并显示对应信息，不同刀具的页面布局
|
2023-06-14 19:22:52 +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
|
3d04200ca7
|
解决冲突
|
2023-06-12 14:35:14 +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 |
|
jinling.yang
|
830f3bb35e
|
212
|
2022-11-21 20:04:56 +08:00 |
|