jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
833 Commits 134 Branches 0 Tags
3cef87ea46d3cbc46da73ea256068355d160959a
Commit Graph

833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
许何哲
4e2bf6534a Accept Merge Request #317: (feature/tree视图表格样式修改 -> develop) 
Merge Request: 完成tree视图样式修改

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/317?initial=true
 2023-08-16 09:28:58 +08:00
WEB许何哲\xuhez
b780b50a42 Merge branch 'develop' into feature/tree视图表格样式修改 2023-08-16 09:26:19 +08:00
WEB许何哲\xuhez
f4428fde9f gantt图样式修改 2023-08-16 09:25:13 +08:00
龚启豪
42066865be Accept Merge Request #316: (feature/修改机床参数bug -> develop) 
Merge Request: 修改机床型号参数缺陷

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/316?initial=true
 2023-08-15 17:32:13 +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
0ecd4e4c3b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-08-15 14:27:03 +08:00
qihao.gong@jikimo.com
a79a3ef64f Merge branch 'feature/修改设备模块' into develop 2023-08-15 14:26:47 +08:00
龚启豪
5b64664bbb Accept Merge Request #315: (feature/修改设备模块 -> develop) 
Merge Request: 修改控制系统同步接口

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/315?initial=true
 2023-08-15 14:26:34 +08:00
qihao.gong@jikimo.com
0f5e5d6ebe Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块 2023-08-15 14:23:23 +08:00
qihao.gong@jikimo.com
abddb82f94 修改数控系统同步参数 2023-08-15 14:21:41 +08:00
龚启豪
9856bb65fb Accept Merge Request #314: (feature/修改设备模块 -> develop) 
Merge Request: 新增主生产计划模块

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/314?initial=true
 2023-08-15 10:36:38 +08:00
qihao.gong@jikimo.com
1533ef7be9 新增主生产计划模块 2023-08-15 10:36:04 +08:00
马广威
4a5fb0c6e4 Accept Merge Request #313: (feature/坯料排程 -> develop) 
Merge Request: 解决翻译问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/313?initial=true
 2023-08-14 10:25:05 +08:00
mgw
ea958ed489 解决翻译问题 2023-08-14 10:24:39 +08:00
马广威
5556274d8b Accept Merge Request #312: (feature/坯料排程优化 -> develop) 
Merge Request: 临时解决看板报错的问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/312?initial=true
 2023-08-14 08:53:53 +08:00
mgw
d3e6315269 临时解决看板报错的问题 2023-08-14 08:52:51 +08:00
龚启豪
9c7d27f860 Accept Merge Request #311: (feature/修改设备模块 -> develop) 
Merge Request: 处理控制系统参数缺失 以及name同步不全问题

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/311?initial=true
 2023-08-11 17:08:33 +08:00
qihao.gong@jikimo.com
9e90c98454 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块 2023-08-11 17:07:13 +08:00
qihao.gong@jikimo.com
ce3ffb75ae 处理控制系统参数丢失问题 2023-08-11 17:06:57 +08:00