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

913 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
禹翔辉
b83a3cc185 Accept Merge Request #310: (feature/刀具管理缺陷优化 -> develop) 
Merge Request: 新增出入库记录对象，功能刀具出入库记录对象多对一关联出入库记录对象，优化功能刀具出入库布局；新增功能刀具列表、刀具物料查询的分组展示全部信息；对刀具物料查询对象的字段根据所选的刀具物料不同展示不同的刀具物料信息字段

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/310?initial=true
 2023-08-11 17:05:32 +08:00
yuxianghui
d103a1cd29 新增出入库记录对象，功能刀具出入库记录对象多对一关联出入库记录对象，优化功能刀具出入库布局；新增功能刀具列表、刀具物料查询的分组展示全部信息；对刀具物料查询对象的字段根据所选的刀具物料不同展示不同的刀具物料信息字段 2023-08-11 17:04:08 +08:00
qihao.gong@jikimo.com
150c40f9b1 处理数控系统同步数据 name缺失问题 2023-08-11 16:55:50 +08:00
马广威
4d650a9aca Accept Merge Request #309: (feature/坯料排程 -> develop) 
Merge Request: char字段聚焦全选功能已完成，坯料排程基本功能已完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/309?initial=true
 2023-08-11 12:28:28 +08:00
mgw
9b239dbcb2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/坯料排程 2023-08-11 12:24:35 +08:00
mgw
68805fee4a char字段聚焦全选功能已完成 2023-08-11 12:22:59 +08:00
mgw
fc490f1612 坯料排程基本功能完成 2023-08-11 12:18:47 +08:00
龚启豪
e6a496d062 Accept Merge Request #308: (feature/修改设备模块 -> develop) 
Merge Request: 处理同步报错bug

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/308?initial=true
 2023-08-11 10:28:14 +08:00
qihao.gong@jikimo.com
fb2cc0e504 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块 2023-08-11 10:26:35 +08:00
qihao.gong@jikimo.com
94efe4e7ca 处理同步报错 2023-08-11 10:26:15 +08:00
WEB许何哲\xuhez
8a736775d8 Merge branch 'develop' into feature/tree视图表格样式修改 2023-08-11 10:19:47 +08:00
WEB许何哲\xuhez
4b34335963 看板视图样式还原 2023-08-11 10:19:00 +08:00
禹翔辉
6116434399 Accept Merge Request #307: (feature/刀具管理缺陷优化 -> develop) 
Merge Request: 刀具管理测试的缺陷优化

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/307?initial=true
 2023-08-10 17:15:42 +08:00
yuxianghui
eccc4c3ade 新增功能刀具组装对象组装新刀具时创建功能刀具预警、功能刀具实时分布、功能刀具出入库记录的记录；新增新刀具取消组装时删除功能刀具预警、功能刀具实时分布、功能刀具出入库记录的记录；新增同步功能刀具列表数据到功能刀具预警、功能刀具实时分布、功能刀具出入库记录对象；新增同步功能刀具组装数据到功能刀具预警对象；新增功能刀具出入库记录和功能刀具实时分布对象分组展示全部功能刀具类型。 2023-08-10 16:41:41 +08:00
禹翔辉
a764f42d23 Accept Merge Request #306: (feature/刀具管理问题优化 -> develop) 
Merge Request: 优化了刀具管理模块的功能刀具组装、CAM工单程序用刀计划、机床换刀申请模型的问题。

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/306?initial=true
 2023-08-09 15:04:02 +08:00
yuxianghui
650a29b74f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理问题优化 2023-08-09 15:01:39 +08:00
yuxianghui
1e1b0dd359 新增功能刀具组装界面和CAM工单程序用刀计划界面、机床换刀申请界面相互跳转功能按钮；功能刀具预警新增展示分组展示全部CNC机床，功能刀具实时分布修改数量相关字段类型为Integer，并新增自动计算合计数和总数功能 2023-08-09 15:00:59 +08:00
龚启豪
8d126a0024 Accept Merge Request #305: (feature/修改设备模块 -> develop) 
Merge Request: 修改路线多规则条件选取

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/305?initial=true
 2023-08-09 10:00:17 +08:00
qihao.gong@jikimo.com
06d73a815f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备模块 2023-08-09 09:59:11 +08:00
qihao.gong@jikimo.com
386b5eb11c 修改采购入库路线多规则条件选取 2023-08-09 09:58:51 +08:00