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

973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mgw
bace7aa175 去掉自定义barcode，暂时取消同步功能刀具 2023-07-26 15:25:12 +08:00
禹翔辉
fd7875b24e Accept Merge Request #280: (feature/刀具管理 -> develop) 
Merge Request: 刀具管理-功能刀具列表、预警、实时分布、出入库记录优化

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/280?initial=true
 2023-07-26 15:19:50 +08:00
yuxianghui
e5c5aa6cdd 刀具管理-新增功能刀具预警、功能刀具实时分布、功能刀具出入库记录对象（tree视图、form视图已完成）；功能刀具管理对象修改为功能刀具列表对象，并优化了字段信息，优化了tree视图展示字段，新增form视图；解除了功能刀具列表对象与功能刀具对象的继承关系。 2023-07-26 15:17:12 +08:00
yuxianghui
98f9269766 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 2023-07-25 17:43:02 +08:00
yuxianghui
d3c7f8cd56 新增了功能刀具列表的form视图，简化了tree视图字段 2023-07-25 17:42:47 +08:00
qihao.gong@jikimo.com
f246827d3d 修改设备模块布局 2023-07-25 17:27:11 +08:00
禹翔辉
bcec481268 Accept Merge Request #279: (feature/刀具管理 -> develop) 
Merge Request: 新增了刀具管理的机床换刀申请、CAM工单程序用刀计划、功能刀具组装的form视图，简化了tree视图的字段

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/279?initial=true
 2023-07-25 14:40:12 +08:00
yuxianghui
810ec1fd6c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 2023-07-25 14:38:24 +08:00
yuxianghui
fc2d77a0dc 新增了刀具管理的机床换刀申请、CAM工单程序用刀计划、功能刀具组装的form视图，简化了tree视图的字段， 2023-07-25 14:38:06 +08:00
qihao.gong@jikimo.com
65157e93a9 设备新需求（根据维保项目生成维保计划） 2023-07-24 17:44:07 +08:00
龚启豪
a43e423c06 Accept Merge Request #278: (feature/修改设备基础参数 -> develop) 
Merge Request: 质量模块和库存扫码

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/278?initial=true
 2023-07-24 11:44:31 +08:00
qihao.gong@jikimo.com
abc7e1c8c6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数 2023-07-24 11:42:44 +08:00
qihao.gong@jikimo.com
3c89404543 质量模块和库存扫码 2023-07-24 11:42:15 +08:00
jinling.yang
ae2fdad4f1 1.物料page里的库存模型新增物料长宽高三个字段 
2.修复功能夹具同步Bug
3.夹具物料新增不可删除控制
 2023-07-21 17:35:44 +08:00
qihao.gong@jikimo.com
8d024ad625 修改sf设备修改过的需求 2023-07-21 17:15:43 +08:00
禹翔辉
24e9cc0658 Accept Merge Request #277: (feature/刀具管理 -> develop) 
Merge Request: 优化了刀具管理的功能刀具预警，功能刀具列表，功能刀具出入库记录，功能刀具实时分布的字段，优化了功能刀具预警界面显示错误问题   

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/277?initial=true
 2023-07-20 17:31:38 +08:00
yuxianghui
b15d574d8b 优化了刀具管理的功能刀具预警，功能刀具列表，功能刀具出入库记录，功能刀具实时分布的字段，优化了功能刀具预警界面显示错误问题 2023-07-20 17:29:03 +08:00
yuxianghui
507392b23e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 2023-07-20 15:40:34 +08:00
杨金灵
8765a00ead Accept Merge Request #276: (feature/夹具查询页面去掉创建按钮 -> develop) 
Merge Request: 夹具相关查询页面去掉创建按钮

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/276?initial=true
 2023-07-20 15:20:41 +08:00
jinling.yang
9334d5cdc8 夹具相关查询页面去掉创建按钮 2023-07-20 15:19:09 +08:00
mgw
a94bc7073d 测试翻译项目是否生效 2023-07-20 12:12:17 +08:00
马广威
fe8402b856 Accept Merge Request #275: (feature/修改缺陷 -> develop) 
Merge Request: 修改功能刀具模块继承方式

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/275?initial=true
 2023-07-20 09:18:34 +08:00
mgw
b37656d4fe 修改功能刀具模块继承方式 2023-07-20 09:17:21 +08:00
yuxianghui
399aaa9e2d 修改功能刀具出入库记录的字段展示 2023-07-19 17:30:40 +08:00
龚启豪
80616bf9bd Accept Merge Request #274: (feature/修改设备基础参数 -> develop) 
Merge Request: 修改设备模块布局以及报错处理

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/274?initial=true
 2023-07-19 17:12:49 +08:00
qihao.gong@jikimo.com
3832b9216f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数 2023-07-19 17:11:07 +08:00
qihao.gong@jikimo.com
9c556c5f40 修改设备布局 2023-07-19 17:10:49 +08:00
许何哲
532d5cbc6d Accept Merge Request #273: (feature/tree视图表格样式修改 -> develop) 
Merge Request: 修改表格样式css的选择器

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/273?initial=true
 2023-07-19 14:50:04 +08:00
WEB许何哲\xuhez
292af4d1ef 修改表格样式css的选择器 2023-07-19 14:49:42 +08:00
禹翔辉
4b16fc2ec5 Accept Merge Request #272: (feature/刀具管理 -> develop) 
Merge Request: 优化刀具管理的弹窗界面布局

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/272?initial=true
 2023-07-19 11:26:15 +08:00
yuxianghui
de0b37bf43 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理 2023-07-19 11:24:25 +08:00
yuxianghui
89eec3250a 优化刀具管理弹窗界面的展示布局 2023-07-19 11:24:05 +08:00
许何哲
07a06ae598 Accept Merge Request #271: (feature/tree视图表格样式修改 -> develop) 
Merge Request: tree视图表格样式修改

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/271?initial=true
 2023-07-19 10:40:47 +08:00
WEB许何哲\xuhez
3b09297600 tree视图表格样式修改 2023-07-19 10:40:15 +08:00
马广威
1bae5ecb55 Accept Merge Request #270: (feature/修改缺陷 -> develop) 
Merge Request: sf处功能刀具修改及其同步，目录位置调整

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/270?initial=true
 2023-07-19 10:05:04 +08:00
mgw
e44e44df41 sf处功能刀具修改及其同步，目录位置调整 2023-07-19 10:03:53 +08:00
许何哲
e6ecc6068d Accept Merge Request #269: (feature/tree视图表格中字段的样式修改 -> develop) 
Merge Request: tree视图表格中字段样式的修改

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/269?initial=true
 2023-07-18 17:10:00 +08:00
WEB许何哲\xuhez
a7028e00f9 tree视图表格中字段样式的修改 2023-07-18 17:09:17 +08:00
禹翔辉
66f0097b80 Accept Merge Request #268: (feature/创建工作日历代码测试 -> develop) 
Merge Request: 工作日历设置---新增将中文的星期转换成英文的星期的方法，删除了大部分日志。

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/268?initial=true
 2023-07-18 16:27:26 +08:00
yuxianghui
b5484ecda6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/创建工作日历代码测试 2023-07-18 16:27:42 +08:00
yuxianghui
2462c3774d 工作日历设置---新增将中文的星期转换成英文的星期的方法，删除了大部分日志。 2023-07-18 16:27:24 +08:00
杨金灵
baf13117dc Accept Merge Request #267: (feature/夹具型号新增搜索面板 -> develop) 
Merge Request: 优化夹具型号功能

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/267?initial=true
 2023-07-18 16:21:16 +08:00
jinling.yang
988f70bf69 1.夹具型号新增搜索面板 
2.夹具查询列表新增创建人和创建时间字段展示
 2023-07-18 16:20:09 +08:00
禹翔辉
4f60118f37 Accept Merge Request #266: (feature/创建工作日历代码测试 -> develop) 
Merge Request: 新增工作日历设置的日志   

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/266?initial=true
 2023-07-18 14:37:03 +08:00
yuxianghui
b7e1bff0f4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/创建工作日历代码测试 2023-07-18 14:37:00 +08:00
yuxianghui
a0758b4b61 新增工作日历设置的日志 2023-07-18 14:36:44 +08:00
许何哲
b614eed79d Accept Merge Request #265: (feature/修改logo图片 -> develop) 
Merge Request: 修改登录页面logo

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/265?initial=true
 2023-07-18 11:36:41 +08:00
WEB许何哲\xuhez
b22cc7f19f 修改登录页面logo 2023-07-18 11:36:12 +08:00
龚启豪
a11dcc16f0 Accept Merge Request #264: (feature/修改设备基础参数 -> develop) 
Merge Request: 修改设备菜单以及二级菜单结构

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/264?initial=true
 2023-07-18 10:48:29 +08:00
qihao.gong@jikimo.com
8333a834fc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改设备基础参数 2023-07-18 10:47:43 +08:00