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

39 Commits

Author SHA1 Message Date
胡尧
d53f3837c3 增加坯料冗余量 2024-11-19 08:59:52 +08:00
guanhuan
7157ea1587 加工精度同步 2024-10-22 15:35:34 +08:00
guanhuan
00a04af94f 加工精度 2024-10-18 09:30:20 +08:00
guanhuan
cc40d479a9 加工精度同步 2024-10-17 17:20:51 +08:00
hujiaying
441cfaffce 优化代码 2024-10-09 16:01:27 +08:00
qihao.gong@jikimo.com
1a50a8220e 处理设备字段类型相关缺陷 2024-03-05 16:50:08 +08:00
qihao.gong@jikimo.com
e70a91d1ec 修改定时同步接口，机床参数 2024-02-26 17:07:16 +08:00
qihao.gong@jikimo.com
2391c08485 修改i机床接口同步以及参数 2023-12-14 17:33:28 +08:00
jinling.yang
e64cf88809 1.加工工艺去掉form表单展示 
2.机床型号页面优化
 2023-08-30 16:26:19 +08:00
jinling.yang
425b926948 品牌Tree列表图片放在备注前面 2023-08-25 15:49:32 +08:00
qihao.gong@jikimo.com
a9954c1231 维保计划中维保项目可以上传多张图片 2023-08-25 11:10:28 +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
2ae7b2c8ec 页面名称加大醒目 2023-08-23 10:28:54 +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
3cef87ea46 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册 
# Conflicts:
#	sf_base/views/base_view.xml
#	sf_base/views/common_view.xml
#	sf_tool_management/models/base.py
 2023-08-17 18:09:19 +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
yuxianghui
07564248d2 品牌增加按类别显示的搜索面板 2023-08-17 15:25:53 +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
e0f43fa9fe 修改机床型号参数缺陷 2023-08-15 17:31:27 +08:00
qihao.gong@jikimo.com
ce3ffb75ae 处理控制系统参数丢失问题 2023-08-11 17:06:57 +08:00
qihao.gong@jikimo.com
f0e1939b95 修改设备参数以及机床型号基础参数以及同步cloud方法 2023-08-07 16:00:26 +08:00
qihao.gong@jikimo.com
2321304e2a 修改设备 2023-08-04 17:31:47 +08:00
jinling.yang
5df00e14da 制造模块里的配置内的页面优化 2023-08-03 16:57:18 +08:00
jinling.yang
5c2e7c80da 1.产品模板优化：增加产品类别的搜索面板 
2.夹具型号注册到cloud：夹具型号的Tree和form视图去掉不可增删改操作，页面新增时编码根据夹具物料回显不同的编码；新增注册按钮及对应的注册接口
3.功能夹具注册到cloud：.功能夹具的Tree和form视图去掉不可增删改操作，页面新增时编码和名称根据功能夹具类型和对应的托盘型号所进行回显
 2023-08-01 17:39:40 +08:00
jinling.yang
47b2e8c709 1.同步的模型的页面不可增删改 
2.工单的物料里新增长宽高字段
 2023-07-27 15:45:45 +08:00
qihao.gong@jikimo.com
8b227d9ac9 设备维保 2023-06-25 17:37:55 +08:00
qihao.gong@jikimo.com
23aba08c87 处理bug 2023-06-16 10:56:25 +08:00
qihao.gong@jikimo.com
018fecfc59 处理冲突 2023-06-16 10:02:33 +08:00
mgw
3d04200ca7 解决冲突 2023-06-12 14:35:14 +08:00
gqh
f5c8623c72 sf优化 2023-01-30 17:33:38 +08:00
gqh
eb162cb416 合并工单优化 2023-01-11 11:13:52 +08:00
gqh
311c7c723a sf1.0 2023-01-09 23:04:53 +08:00
gqh
d0497aa043 工单优化 2023-01-09 20:40:27 +08:00
jinling.yang
830f3bb35e 212 2022-11-21 20:04:56 +08:00