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

867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mgw
642007d29b cnc工单处增加NC文件下载的功能已完成 2023-08-21 17:20:52 +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
c2e2de4ab5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-08-21 15:37:34 +08:00
jinling.yang
e49e3b6981 Merge branch 'feature/页面布局' into develop 2023-08-21 15:37:20 +08:00
杨金灵
1b3c929fa7 Accept Merge Request #333: (feature/页面布局 -> develop) 
Merge Request: 去掉厂家型号字段

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/333?initial=true
 2023-08-21 15:37:03 +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
dfc5c206fd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-08-21 11:51:32 +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
龚启豪
2cb84c5f55 Accept Merge Request #332: (feature/修改机床参数bug -> develop) 
Merge Request: 设备改成维保

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/332?initial=true
 2023-08-21 10:28:46 +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
bfa51d378c Merge branch 'feature/制造基础数据删除按钮放开' into develop 2023-08-21 10:25:13 +08:00
禹翔辉
78ddf4e52f Accept Merge Request #331: (feature/功能刀具优化 -> develop) 
Merge Request: 功能刀具优化

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/331?initial=true
 2023-08-21 10:21:25 +08:00
yuxianghui
8a50a10b23 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具优化 2023-08-21 10:19:09 +08:00
杨金灵
80f7da7979 Accept Merge Request #330: (feature/制造基础数据删除按钮放开 -> develop) 
Merge Request: 制造基础数据删除按钮放开

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/330?initial=true
 2023-08-21 10:18:17 +08:00
jinling.yang
eec6dce4fc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造基础数据删除按钮放开 2023-08-21 10:16:47 +08:00
jinling.yang
cd671bdc88 1.删除按钮放开 
2.刀具类型同步代码还原
 2023-08-21 10:16:30 +08:00
yuxianghui
0fa2656aad 优化功能刀具的刀具物料字段 2023-08-21 10:11:54 +08:00
许何哲
109da940ba Accept Merge Request #329: (feature/必填字段label添加星号 -> develop) 
Merge Request: 修改制造订单页面样式bug

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/329?initial=true
 2023-08-21 10:10:45 +08:00
WEB许何哲\xuhez
64143798e0 Merge branch 'develop' into feature/必填字段label添加星号 2023-08-21 10:09:42 +08:00
WEB许何哲\xuhez
d8489a5f07 制造订单页面样式bug修改 2023-08-21 10:08:55 +08:00
禹翔辉
8ae4d0dce8 Accept Merge Request #328: (feature/生产线优化 -> develop) 
Merge Request: 生产线新增关联工作中心字段，优化看板和form视图布局

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/328?initial=true
 2023-08-18 15:14:41 +08:00
yuxianghui
f88dd790a0 生产线新增关联工作中心字段，优化看板和form视图布局 2023-08-18 15:11:36 +08:00
龚启豪
baea2d2a3e Accept Merge Request #327: (feature/修改机床参数bug -> develop) 
Merge Request: 品牌备注增加

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/327?initial=true
 2023-08-18 14:39:39 +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
杨金灵
607eac90c6 Accept Merge Request #326: (feature/刀具物料与夹具物料的反注册 -> develop) 
Merge Request: 刀具及夹具物料反注册

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/326?initial=true
 2023-08-18 11:41:23 +08:00
jinling.yang
06b1e30670 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册 2023-08-18 11:38:02 +08:00
jinling.yang
5644ee2670 刀具页面优化 2023-08-18 11:37:30 +08:00
许何哲
6fccd63916 Accept Merge Request #325: (feature/必填字段label添加星号 -> develop) 
Merge Request: 修改样式bug

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/325?initial=true
 2023-08-18 11:04:40 +08:00
WEB许何哲\xuhez
bed385d025 Merge branch 'develop' into feature/必填字段label添加星号 2023-08-18 11:02:46 +08:00
WEB许何哲\xuhez
77b1ef2d91 消息发送界面的样式bug修改 2023-08-18 11:01:30 +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
龚启豪
ae07a515b7 Accept Merge Request #324: (feature/修改机床参数bug -> develop) 
Merge Request: 移除托盘对象，并清除关联方法,关联关系等

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/324?initial=true
 2023-08-17 16:35:07 +08:00
qihao.gong@jikimo.com
422698ce34 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-08-17 16:34:09 +08:00
qihao.gong@jikimo.com
08ac2978a1 移除托盘对象 并清除所有关联关系 2023-08-17 16:33:40 +08:00
禹翔辉
92a9894757 Accept Merge Request #323: (feature/品牌增加按类别显示的搜索面板 -> develop) 
Merge Request: 品牌增加按类别显示的搜索面板

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/323?initial=true
 2023-08-17 15:28:25 +08:00
yuxianghui
093b0e63ce Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/品牌增加按类别显示的搜索面板 2023-08-17 15:26:28 +08:00
yuxianghui
07564248d2 品牌增加按类别显示的搜索面板 2023-08-17 15:25:53 +08:00
龚启豪
908d247f98 Accept Merge Request #322: (feature/修改机床参数bug -> develop) 
Merge Request: 设备看板优化以及表单视图修改

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/322?initial=true
 2023-08-17 11:58:38 +08:00
qihao.gong@jikimo.com
6193fa3c09 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-08-17 11:48:54 +08:00
禹翔辉
5c1ba207b6 Accept Merge Request #321: (feature/刀具管理界面布局优化 -> develop) 
Merge Request: 刀具管理下除刀具物料外的界面布局及字段的优化 

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/321?initial=true
 2023-08-17 11:22:24 +08:00
yuxianghui
21bfad2f95 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理界面布局优化 2023-08-17 11:20:31 +08:00
yuxianghui
8b88f31672 刀具管理下除刀具物料外的界面布局及字段的优化 2023-08-17 11:19:59 +08:00
qihao.gong@jikimo.com
28fcf5c4fa 优化机场看板以及机床表单 2023-08-17 11:11:47 +08:00
qihao.gong@jikimo.com
f5653ce1dd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_base/static/src/scss/test.scss
 2023-08-17 10:13:19 +08:00
许何哲
23b11fce15 Accept Merge Request #320: (feature/必填字段label添加星号 -> develop) 
Merge Request: 修復bug

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/320?initial=true
 2023-08-17 10:09:42 +08:00