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

853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
禹翔辉
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
WEB许何哲\xuhez
facd5d23d7 修复了样式调整后a标签文字变蓝的bug 2023-08-17 10:06:59 +08:00
qihao.gong@jikimo.com
a8c817d704 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2023-08-16 17:30:40 +08:00
qihao.gong@jikimo.com
cd0f455db3 修改设备模块看板 2023-08-16 17:30:30 +08:00
qihao.gong@jikimo.com
fac3450257 设备基础参数 2023-08-16 15:00:03 +08:00
qihao.gong@jikimo.com
fcf5963079 修改设备清单看板 2023-08-16 11:56:41 +08:00
WEB许何哲\xuhez
2f732e41ed Merge remote-tracking branch 'origin/develop' into feature/必填字段label添加星号 2023-08-16 11:23:46 +08:00
WEB许何哲\xuhez
1747f38bca 必填字段label添加星号 2023-08-16 11:22:50 +08:00
禹翔辉
d17cfc7793 Accept Merge Request #319: (feature/制造工单界面布局优化 -> develop) 
Merge Request: 将记录的讨论和评论窗口从form视图右侧移动到视图最下方。

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/319?initial=true
 2023-08-16 11:03:05 +08:00
yuxianghui
ddce0ab436 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造工单界面布局优化 2023-08-16 11:01:11 +08:00
yuxianghui
9d025c10b4 将记录的讨论和评论窗口从form视图右侧移动到视图最下方。 2023-08-16 11:00:34 +08:00
马广威
928257f125 Accept Merge Request #318: (feature/坯料排程 -> develop) 
Merge Request: 修改生产线驾驶舱形式为searchpanel，贴近整体布局

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/318?initial=true
 2023-08-16 10:14:48 +08:00
mgw
2169c10417 修改生产线驾驶舱形式为searchpanel，贴近整体布局 2023-08-16 10:11:40 +08:00
mgw
ab61902deb Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/坯料排程 2023-08-16 09:43:29 +08:00
mgw
06ed10bd5e 优化界面展示 2023-08-16 09:42:51 +08:00