jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,241 Commits 134 Branches 31 Tags
9adfca6010d9612dc5cf7e98656f05d74a27fbe7
Commit Graph

308 Commits

Author SHA1 Message Date
jinling.yang
d83255cc67 优化同步刀具标准库接口（包含全部合并每日） 2023-10-19 17:23:53 +08:00
jinling.yang
14edbd85f4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） 
# Conflicts:
#	sf_base/models/tool_base.py
#	sf_base/models/tool_base_new.py
#	sf_maintenance/views/maintenance_views.xml
#	sf_mrs_connect/models/res_config_setting.py
 2023-10-19 10:53:03 +08:00
jinling.yang
e7df6c14b1 同步刀具标准库 2023-10-19 10:49:54 +08:00
jinling.yang
9acdcc0429 新增同步cloud的刀具标准库接口 2023-10-13 17:29:34 +08:00
qihao.gong@jikimo.com
53e307cd55 修改设备table的样式 修改关联品牌根据各不同类别展示 2023-10-12 14:10:29 +08:00
jinling.yang
c04e138d6b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） 
# Conflicts:
#	sf_mrs_connect/models/sync_common.py
 2023-10-11 17:41:19 +08:00
jinling.yang
296efcc395 新增调取cloud的刀具标准库接口 2023-10-11 17:39:46 +08:00
qihao.gong@jikimo.com
e505285a91 处理同步报错bug 2023-10-11 15:41:55 +08:00
qihao.gong@jikimo.com
ecb1f4140e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py
#	sf_mrs_connect/models/sync_common.py
 2023-10-11 14:56:18 +08:00
jinling.yang
6b7b536236 1.优化同步cloud的静态资源库的定时器的代码 
2.新增能力特征库的接口
 2023-10-10 17:19:11 +08:00
qihao.gong@jikimo.com
b9d6e0ea35 材料型号同步接口修改 新增国际标准和材料应用 2023-10-09 17:35:39 +08:00
jinling.yang
708889b1ed 去掉不要的代码及刀具型号的定时器 2023-10-09 15:21:41 +08:00
jinling.yang
59514cc433 去掉刀具型号的同步方法 2023-10-09 15:15:52 +08:00
jinling.yang
a96c7a34c1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/bug修复 2023-09-18 17:40:30 +08:00
jinling.yang
ecc9bd446f 材料等同步Bug修复 2023-09-06 16:32:25 +08:00
jinling.yang
5de04449e4 对模型进行上色和特征识别及自动报价 2023-08-25 10:39:31 +08:00
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
龚启豪
3c281230cc Accept Merge Request #334: (feature/修改机床参数bug -> develop) 
Merge Request: 修改设备看板

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/334
 2023-08-21 15:42:12 +08:00
qihao.gong@jikimo.com
a5a9ae150f 修改设备看板 2023-08-21 15:41:40 +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
ff60824291 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-08-21 10:28:12 +08:00
qihao.gong@jikimo.com
82322b5024 修改设备table和跳转到维保 设备改为维保 2023-08-21 10:27:50 +08:00
jinling.yang
cd671bdc88 1.删除按钮放开 
2.刀具类型同步代码还原
 2023-08-21 10:16:30 +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
jinling.yang
e638245b8a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册 
# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py
 2023-08-08 17:18:06 +08:00
qihao.gong@jikimo.com
f0e1939b95 修改设备参数以及机床型号基础参数以及同步cloud方法 2023-08-07 16:00:26 +08:00
jinling.yang
aa7e39c28a 新增采购入库时实时注册夹具产品到cloud 2023-08-04 17:33:21 +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
bace7aa175 去掉自定义barcode，暂时取消同步功能刀具 2023-07-26 15:25:12 +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
mgw
dbb3ea8a35 解决代码冲突问题 2023-06-29 17:43:16 +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