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

920 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
杨金灵
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
禹翔辉
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
许何哲
a2f5dbd70d Accept Merge Request #341: (feature/必填字段label添加星号 -> develop) 
Merge Request: 修改看板样式

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/341?initial=true
 2023-08-24 09:04:02 +08:00
WEB许何哲\xuhez
0f283c1eda Merge branch 'develop' into feature/必填字段label添加星号 2023-08-24 09:03:20 +08:00
WEB许何哲\xuhez
f67c8169bf 修改看板样式 2023-08-24 09:02:15 +08:00
jinling.yang
f9e4b73fb0 新增上传模型功能 2023-08-23 17:34:06 +08:00
禹翔辉
e31858c9d7 Accept Merge Request #340: (feature/刀具管理加粗字段调整及界面布局优化 -> develop) 
Merge Request: 刀具管理模块中的所有模型界面的加粗字段都改为name字段；优化了刀具物料查询界面布局。

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/340?initial=true
 2023-08-23 17:33:34 +08:00
yuxianghui
4f70f7ef70 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理加粗字段调整及界面布局优化 2023-08-23 17:32:58 +08:00
yuxianghui
11a06df0a4 刀具管理模块中的所有模型界面的加粗字段都改为name字段；优化了刀具物料查询界面布局。 2023-08-23 17:32:22 +08:00
马广威
da8caf42f5 Accept Merge Request #339: (feature/生产排程 -> develop) 
Merge Request: 更新3D模型展示代码

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/339?initial=true
 2023-08-23 15:48:04 +08:00
mgw
0b30408aae 更新3D模型展示代码 2023-08-23 15:47:17 +08:00
龚启豪
e2f5ce42e6 Accept Merge Request #338: (feature/修改机床参数bug -> develop) 
Merge Request: 刀把类型新增bt50 处理品牌图片同步报错问题

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/338?initial=true
 2023-08-23 14:40:10 +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
c27bfb5990 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-08-23 10:31:21 +08:00
jinling.yang
589f99db1a Merge branch 'feature/同步夹具型号Bug修复' into develop 2023-08-23 10:31:01 +08:00
杨金灵
7d0e35a9f4 Accept Merge Request #337: (feature/同步夹具型号Bug修复 -> develop) 
Merge Request: 夹具型号同步修复和页面名称加大醒目

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/337?initial=true
 2023-08-23 10:30:43 +08:00
jinling.yang
a64d24d8ff Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/同步夹具型号Bug修复 2023-08-23 10:29:09 +08:00
jinling.yang
2ae7b2c8ec 页面名称加大醒目 2023-08-23 10:28:54 +08:00
jinling.yang
cd33fb9fb9 夹具型号同步修复 2023-08-23 10:09:47 +08:00
禹翔辉
1176aee38b Accept Merge Request #336: (feature/产线设备资源设置模块优化 -> develop) 
Merge Request: 计划管理-基础设置内模型的界面布局和字段优化

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/336?initial=true
 2023-08-22 11:43:15 +08:00
yuxianghui
e781bce27e 1、优化了产线设备资源设置和工作日历设置界面布局；删除工作日历、班次、休息日模型的form视图，新增tree视图修改功能；2、修复产线设备资源设置的设备信息显示问题，修改了机台号字段名称；3、新增工作日历设置班次字段必填；4、调整产线设备资源设置和工作日历设置菜单位置 2023-08-22 11:40:35 +08:00