jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
940 Commits 134 Branches 31 Tags
eae06ccdd716c368c74b362437827d8804a6989a
Commit Graph

940 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jinling.yang
eae06ccdd7 Merge branch 'feature/获取cnc工单Bug修复' into develop 2023-08-29 17:43:51 +08:00
jinling.yang
908e8b3ff2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/获取cnc工单Bug修复 2023-08-29 17:41:23 +08:00
jinling.yang
e9afce298d SF点击后获取cnc程序按钮，cloud生成的编程单的编号未显示Bug修复 2023-08-29 17:40:16 +08:00
禹翔辉
f373c69430 Accept Merge Request #354: (feature/自建模块日志警告信息处理 -> develop) 
Merge Request: 库存模块日志警告信息处理

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/354?initial=true
 2023-08-29 17:29:26 +08:00
yuxianghui
8ece696775 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理 2023-08-29 17:28:49 +08:00
yuxianghui
5ea6158e8d 库存模块日志警告信息处理 2023-08-29 17:28:20 +08:00
龚启豪
a799793ca8 Accept Merge Request #353: (feature/修改机床参数bug -> develop) 
Merge Request: 修改设备table，品牌图片改成图片

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/353?initial=true
 2023-08-29 15:50:08 +08:00
qihao.gong@jikimo.com
27571942c9 增肌OCC 2023-08-29 15:49:14 +08:00
qihao.gong@jikimo.com
e6a68eb1eb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-08-29 15:48:48 +08:00
qihao.gong@jikimo.com
b7f2c4a000 sf修改设备table，品牌图片改成图片 2023-08-29 15:47:58 +08:00
许何哲
3e922df2f8 Accept Merge Request #352: (feature/必填字段label添加星号 -> develop) 
Merge Request: sf品牌页面表格样式的修改

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/352?initial=true
 2023-08-29 15:15:20 +08:00
WEB许何哲\xuhez
7713ade077 sf品牌页面表格样式的修改 2023-08-29 15:13:59 +08:00
禹翔辉
12ead3579e Accept Merge Request #351: (feature/自建模块日志警告信息处理 -> develop) 
Merge Request: 智能工厂所有自建模块日志警告信息处理

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/351?initial=true
 2023-08-29 11:22:16 +08:00
yuxianghui
be0f62ffe0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理 
# Conflicts:
#	sf_base/models/fixture.py
#	sf_manufacturing/models/model_type.py
#	sf_manufacturing/models/product_template.py
#	sf_sale/models/quick_easy_order.py
 2023-08-29 11:21:13 +08:00
yuxianghui
5ccd754261 所有自建模块日志警告信息处理 2023-08-29 11:06:59 +08:00
杨金灵
dea565f8c6 Accept Merge Request #350: (feature/去掉警告 -> develop) 
Merge Request: 去掉警告

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/350?initial=true
 2023-08-29 10:31:28 +08:00
jinling.yang
6e6b0b66d3 去掉警告 2023-08-29 10:22:12 +08:00
jinling.yang
ed96f8dc0e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-08-28 17:44:46 +08:00
jinling.yang
8f6bfa2a9b Merge branch 'feature/快速订单Bug修复' into develop 2023-08-28 17:43:45 +08:00
杨金灵
d92dcbd4e6 Accept Merge Request #349: (feature/快速订单Bug修复 -> develop) 
Merge Request: 快速订单Bug修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/349?initial=true
 2023-08-28 17:43:22 +08:00
jinling.yang
c765682311 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/快速订单Bug修复 
# Conflicts:
#	web_widget_model_viewer/__manifest__.py
 2023-08-28 17:41:31 +08:00
jinling.yang
fb717c22ad 1.模型为上色Bug修复（cloud代码注释引起） 
2.创建产品和订单未成功Bug修复
 2023-08-28 17:40:19 +08:00
yuxianghui
39feda07e5 自建模块日志警告信息处理 2023-08-28 17:31:41 +08:00
禹翔辉
5d30dae189 Accept Merge Request #348: (feature/刀具管理加粗字段调整及界面布局优化 -> develop) 
Merge Request: 刀具管理加粗字段调整， zpl_print,web_widget模块添加 'license': 'LGPL-3'   

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/348?initial=true
 2023-08-28 10:02:47 +08:00
yuxianghui
19b4cfd078 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理加粗字段调整及界面布局优化 2023-08-28 10:00:57 +08:00
yuxianghui
1e1ed20231 刀具管理加粗字段调整， zpl_print,web_widget模块添加 'license': 'LGPL-3' 2023-08-28 10:00:14 +08:00
jinling.yang
df650edefd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-08-25 15:54:20 +08:00
jinling.yang
7cb94f79a0 Merge branch 'feature/产品模板优化' into develop 2023-08-25 15:51:43 +08:00
杨金灵
cd3ad6f975 Accept Merge Request #347: (feature/产品模板优化 -> develop) 
Merge Request: 产品模板优化

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/347?initial=true
 2023-08-25 15:51:13 +08:00
jinling.yang
425b926948 品牌Tree列表图片放在备注前面 2023-08-25 15:49:32 +08:00
jinling.yang
71ca6d27ce Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/产品模板优化 2023-08-25 15:47:16 +08:00
jinling.yang
7174de3de6 产品模板的型号手动输入时型号对象的编码，联装类型，夹具物料字段的值显示 2023-08-25 15:46:41 +08:00
龚启豪
194faf5a55 Accept Merge Request #346: (feature/修改机床参数bug -> develop) 
Merge Request: 维保项目可以上传多张图片的功能

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/346?initial=true
 2023-08-25 11:12:46 +08:00
qihao.gong@jikimo.com
caeff1e17a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-08-25 11:10:46 +08:00
qihao.gong@jikimo.com
a9954c1231 维保计划中维保项目可以上传多张图片 2023-08-25 11:10:28 +08:00
jinling.yang
e4af4ca0b6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-08-25 10:42:09 +08:00
jinling.yang
3ef20d64ac Merge branch 'feature/新增上传模型功能' into develop 2023-08-25 10:41:49 +08:00
杨金灵
c6a6eec5b7 Accept Merge Request #345: (feature/新增上传模型功能 -> develop) 
Merge Request: 新增上传模型（快速订单）功能

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/345?initial=true
 2023-08-25 10:41:20 +08:00
jinling.yang
5de04449e4 对模型进行上色和特征识别及自动报价 2023-08-25 10:39:31 +08:00
jinling.yang
e7d32e5041 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能 2023-08-24 17:32:59 +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
龚启豪
9318be0f09 Accept Merge Request #344: (feature/修改机床参数bug -> develop) 
Merge Request: 修改工作中心看板，设备清单看板

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/344?initial=true
 2023-08-24 15:01:56 +08:00
qihao.gong@jikimo.com
f31a6d0d43 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_maintenance/views/maintenance_views.xml
 2023-08-24 15:00:41 +08:00
qihao.gong@jikimo.com
3b3847990d 工作重心看板展示设备状态以及图片，设备看板增加负责人 2023-08-24 14:51:03 +08:00
许何哲
bbfb29f60b Accept Merge Request #343: (feature/必填字段label添加星号 -> develop) 
Merge Request: 修改文字颜色

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/343?initial=true
 2023-08-24 11:35:01 +08:00
WEB许何哲\xuhez
28a50a1d94 Merge branch 'develop' into feature/必填字段label添加星号 2023-08-24 11:33:48 +08:00
WEB许何哲\xuhez
623d89bf31 修改文字颜色 2023-08-24 11:33:24 +08:00
许何哲
bcb05cb2e2 Accept Merge Request #342: (feature/必填字段label添加星号 -> develop) 
Merge Request: 3d模型无法展示的时候用文字替换

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/342?initial=true
 2023-08-24 11:10:06 +08:00
WEB许何哲\xuhez
9c52e23e44 Merge branch 'develop' into feature/必填字段label添加星号 2023-08-24 11:09:07 +08:00
WEB许何哲\xuhez
1c50e11a43 3d模型无法展示的时候用文字替换 2023-08-24 11:07:54 +08:00