jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,456 Commits 134 Branches 31 Tags
61c3b16a6981850eab8a50dedd82b2514ab6fe4e
Commit Graph

1456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
龚启豪
61c3b16a69 Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug 2023-12-06 11:35:01 +08:00
qihao.gong@jikimo.com
70109c0965 修改制造模块权限 2023-12-06 11:31:59 +08:00
马广威
74b4fd1367 Accept Merge Request #705: (feature/制造代码优化 -> develop) 
Merge Request: 完成计划权限，优化警告错误

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/705
 2023-12-06 10:30:55 +08:00
禹翔辉
c206dc3097 Accept Merge Request #706: (feature/功能刀具组装流程优化 -> develop) 
Merge Request: 功能刀具组装流程优化

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/706?initial=true
 2023-12-06 09:14:29 +08:00
yuxianghui
4c1c8e7683 Merge remote-tracking branch 'origin/feature/功能刀具安全库存优化' into feature/功能刀具组装流程优化 2023-12-06 09:03:55 +08:00
yuxianghui
0d8d54c05b 1、机床换刀申请新增确认换刀时，依次检索线边刀库、刀具房是否有满足条件的功能刀具，如果有就返回刀具信息，没有就发起组装申请；2、刀具安全库存模型详情页新增可修改的最低库存量、最高库存量、批次补货量字段； 2023-12-05 17:37:47 +08:00
qihao.gong@jikimo.com
c753df768d 库存模块权限开发 2023-12-05 17:24:19 +08:00
yuxianghui
29a55f3ff8 1、新增设备创建刀位时自动创建对应刀位的机床换刀申请记录；2、机床换刀申请模型的设备、刀位字段修改为只读，搜索视图新增按设备搜索； 2023-12-04 17:30:19 +08:00
qihao.gong@jikimo.com
94c0b00c2d 机床注册按钮根据权限组区分 2023-12-04 17:28:54 +08:00
mgw
2cf4958f46 完成计划权限，优化警告错误 2023-11-29 20:58:12 +08:00
qihao.gong@jikimo.com
893aa2111c 处理coding报错 2023-11-29 17:34:15 +08:00
禹翔辉
e796bbe990 Accept Merge Request #704: (feature/功能刀具安全库存优化 -> develop) 
Merge Request: 功能刀具安全库存修改字段类型

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/704
 2023-11-29 10:23:11 +08:00
yuxianghui
c2d2d16948 Merge remote-tracking branch 'origin/feature/功能刀具组装功能优化' into feature/功能刀具安全库存优化 2023-11-29 10:21:07 +08:00
yuxianghui
c3ba11bed4 1、修改功能刀具安全库存模型的刀尖特征、柄部类型字段的字段类型为many2one 2023-11-29 10:17:43 +08:00
马广威
37815d603a Accept Merge Request #703: (feature/制造代码优化 -> develop) 
Merge Request: 优化货位代码

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/703
 2023-11-29 09:43:09 +08:00
mgw
ca0b59e95b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2023-11-29 09:40:03 +08:00
mgw
7c478ec4fd 优化货位代码 2023-11-29 09:39:11 +08:00
qihao.gong@jikimo.com
5b1d347fd4 增加设备模块权限角色，优化coding代码扫描警告 2023-11-28 17:23:49 +08:00
马广威
e738d40b75 Accept Merge Request #702: (feature/制造代码优化 -> develop) 
Merge Request: 库存货架货位修改基本完成，推送测试

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/702
 2023-11-28 17:23:20 +08:00
mgw
685eced709 货位代码优化 2023-11-28 17:21:29 +08:00
杨金灵
487b452519 Accept Merge Request #701: (feature/修改刀具标准库部分字段类型 -> develop) 
Merge Request: 修改刀具标准库部分字段类型

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/701
 2023-11-28 17:14:34 +08:00
jinling.yang
4a62af7545 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改刀具标准库部分字段类型 2023-11-28 17:09:10 +08:00
jinling.yang
07be7c3074 1.同步刀具标准库接口修改刀片形状，柄部类型，刀尖特征，压紧方式 2023-11-28 17:08:56 +08:00
mgw
ddad1e9114 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2023-11-28 16:42:54 +08:00
mgw
2c1a101c24 库存货架货位修改基本完成，推送测试 2023-11-28 16:42:19 +08:00
禹翔辉
ab1af72727 Accept Merge Request #700: (feature/功能刀具组装功能优化 -> develop) 
Merge Request: 功能刀具组装功能优化

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/700
 2023-11-28 16:37:29 +08:00
yuxianghui
bc186a9723 Merge remote-tracking branch 'origin/feature/功能刀具组装优化' into feature/功能刀具组装功能优化 2023-11-28 16:34:31 +08:00
yuxianghui
de04d452b3 1优化功能刀具组装单的刀具物料过滤条件，取消功能刀具列表的自动计算库存的方法 2023-11-28 16:28:48 +08:00
禹翔辉
66b808dfc9 Accept Merge Request #699: (feature/功能刀具组装优化 -> develop) 
Merge Request: 功能刀具组装功能优化

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/699
 2023-11-28 15:02:36 +08:00
yuxianghui
ad36b37f27 Merge remote-tracking branch 'origin/feature/功能刀具安全库存重构' into feature/功能刀具组装优化 2023-11-28 14:57:40 +08:00
yuxianghui
e403f2f8e6 1、按面向对象的思想优化功能刀具组装功能的整个流程；2、新增刀具组装完成时的刀具物料出库到刀具组装位置； 2023-11-28 14:52:43 +08:00
马广威
24b850a508 Accept Merge Request #698: (feature/制造代码优化 -> develop) 
Merge Request: 优化警告问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/698
 2023-11-28 09:00:03 +08:00
mgw
4d8b463cb3 优化警告问题 2023-11-28 08:59:01 +08:00
mgw
9fef877d12 优化警告问题 2023-11-27 22:40:56 +08:00
马广威
c323d9995e Accept Merge Request #697: (feature/制造代码优化 -> develop) 
Merge Request: 物流可见性控制，优化警告问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/697?initial=true
 2023-11-27 21:33:35 +08:00
mgw
4f83c5f29a 优化警告问题 2023-11-27 21:30:45 +08:00
jinling.yang
ed5f47cc31 1.修改刀具标准库刀片形状，柄部类型，压紧方式，刀尖特征，字段类型及对应控件显示 
2.修改产品页面：刀片形状，柄部类型，压紧方式，刀尖特征，字段类型及对应控件显示
 2023-11-27 17:34:23 +08:00
龚启豪
66bb55a823 Accept Merge Request #696: (feature/修改机床参数bug -> develop) 
Merge Request: 修改coding代码扫描警告

Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/696?initial=true
 2023-11-27 17:30:01 +08:00
yuxianghui
5926d71d27 1、新增功能刀具列表模型自动计算功能刀具在刀具房数量功能；2、优化功能刀具安全库存模型相同功能刀具的检索条件；3、修改功能刀具组装单组装的初始位置为Production，修改功能刀具序列号的生成规则 2023-11-27 17:27:55 +08:00
qihao.gong@jikimo.com
c78ea6fbe5 修改coding代码扫描警告 2023-11-27 17:08:11 +08:00
mgw
96df8f971c 物流相关可见性控制 2023-11-27 15:40:16 +08:00
马广威
35511effae Accept Merge Request #695: (feature/制造代码优化 -> develop) 
Merge Request: 优化物流下单等代码

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/695
 2023-11-27 12:18:47 +08:00
mgw
54912f15b9 优化物流下单等代码 2023-11-27 12:17:57 +08:00
马广威
e8a13f1721 Accept Merge Request #694: (feature/制造代码优化 -> develop) 
Merge Request: 优化代码，修改库存货架货位为标签

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/694?initial=true
 2023-11-24 21:46:16 +08:00
禹翔辉
1532293918 Accept Merge Request #693: (feature/功能刀具安全库存重构 -> develop) 
Merge Request: 功能刀具安全库存模型重构

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/693?initial=true
 2023-11-24 17:18:59 +08:00
yuxianghui
030ef14633 Merge remote-tracking branch 'origin/feature/功能刀具出入库优化' into feature/功能刀具安全库存重构 2023-11-24 17:15:26 +08:00
yuxianghui
bf8b45609c 1、功能刀具列表模型新增查询功能刀具安全库存功能；2、重构功能刀具安全库存模型；3、功能刀具组装单弹窗界面的刀具物料新增位置为刀具房的过滤筛选； 2023-11-24 17:12:44 +08:00
龚启豪
964618d365 Accept Merge Request #692: (feature/修改机床参数bug -> develop) 
Merge Request: 代码规范

Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/692
 2023-11-24 10:31:39 +08:00
杨金灵
06eeb1ed1f Accept Merge Request #691: (feature/优化代码格式 -> develop) 
Merge Request: 优化代码格式

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/691?initial=true
 2023-11-24 10:30:42 +08:00
qihao.gong@jikimo.com
deb732dc5e 代码规范 2023-11-24 10:30:33 +08:00