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

574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
马广威
a71497d3a8 Accept Merge Request #245: (feature/解决工作日历无法创建的bug -> develop) 
Merge Request: 解决冲突与优化结构

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/245?initial=true
 2023-07-14 14:45:03 +08:00
mgw
5b6a563a87 更改库存模块库区相关字段 2023-07-14 14:43:06 +08:00
mgw
3de5a95a98 解决工作日历无法创建的bug 2023-07-14 14:35:22 +08:00
马广威
14283ab5e4 Accept Merge Request #244: (feature/测试皮肤模块 -> develop) 
Merge Request: 修改.gitignore文件，注释忽略lib文件夹部分;修改制造模块依赖

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/244?initial=true
 2023-07-14 12:29:44 +08:00
mgw
3b789d040a 修改制造模块依赖 2023-07-14 12:28:23 +08:00
mgw
f0e7d41ad6 修改.gitignore文件，注释忽略lib文件夹部分 2023-07-14 12:26:21 +08:00
马广威
debcca8b07 Accept Merge Request #242: (feature/修改字段 -> develop) 
Merge Request: 修改关联关系的字段

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/242?initial=true
 2023-07-14 12:00:13 +08:00
mgw
741c2b34bf 修改关联关系的字段 2023-07-14 11:58:56 +08:00
龚启豪
3b8ea6874b Accept Merge Request #241: (feature/订单计划 -> develop) 
Merge Request: 更换数据库

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/241?initial=true
 2023-07-14 10:45:39 +08:00
qihao.gong@jikimo.com
381505bd9d 更换数据库 2023-07-14 10:45:02 +08:00
许何哲
28b6f854cb Accept Merge Request #240: (feature/主题logo添加中文 -> develop) 
Merge Request: 添加中文logo

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/240?initial=true
 2023-07-14 10:38:18 +08:00
WEB许何哲\xuhez
cb4dc2a057 Merge branch 'develop' into feature/主题logo添加中文 2023-07-14 10:35:07 +08:00
WEB许何哲\xuhez
412083e2aa 主题logo添加中文 2023-07-14 10:33:11 +08:00
杨金灵
ad565d0096 Accept Merge Request #239: (feature/设备模块文件解决冲突 -> develop) 
Merge Request: 设备模块文件解决冲突

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/239?initial=true
 2023-07-14 10:16:51 +08:00
jinling.yang
31d335af48 设备模块文件解决冲突 2023-07-14 10:16:22 +08:00
jinling.yang
48cb394b3f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-07-14 10:07:46 +08:00
jinling.yang
c709c046c7 Merge branch 'feature/优化夹具产品模板' into develop 2023-07-14 10:06:37 +08:00
杨金灵
a0744e6713 Accept Merge Request #238: (feature/优化夹具产品模板 -> develop) 
Merge Request: 优化夹具产品模板

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/238?initial=true
 2023-07-14 10:06:20 +08:00
jinling.yang
98d3e61d66 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化夹具产品模板 
# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/__manifest__.py
 2023-07-14 10:05:01 +08:00
许何哲
7b4d4a0d9a Accept Merge Request #237: (feature/修改看板样式 -> develop) 
Merge Request: 主题

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/237?initial=true
 2023-07-14 09:23:51 +08:00
WEB许何哲\xuhez
a48c8b2baa 上传修改后的主题 2023-07-14 09:21:21 +08:00
WEB许何哲\xuhez
1c022711a1 注释测试字段 2023-07-14 09:11:57 +08:00
WEB许何哲\xuhez
0291ed9a56 Merge branch 'develop' into feature/修改看板样式 
# Conflicts:
#	sf_warehouse/views/view.xml
 2023-07-14 09:10:37 +08:00
龚启豪
08e0eeee3d Accept Merge Request #236: (feature/订单计划 -> develop) 
Merge Request: 密码约束模块

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/236?initial=true
 2023-07-14 09:05:59 +08:00
qihao.gong@jikimo.com
8f795096c3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划 
# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/views/mrp_workcenter_views.xml
 2023-07-14 09:02:48 +08:00
马广威
2161f4c140 Accept Merge Request #235: (feature/工作日历及其设置 -> develop) 
Merge Request: 工作日历及其设置的bug已解决，优化已完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/235?initial=true
 2023-07-13 19:21:13 +08:00
mgw
b544e10b0d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历及其设置 2023-07-13 19:20:05 +08:00
mgw
9073880aac 工作日历及其设置bug已解决，优化已完成 2023-07-13 19:19:40 +08:00
WEB许何哲\xuhez
b48a835808 修改看板樣式 2023-07-13 17:31:54 +08:00
qihao.gong@jikimo.com
5e8e380a8e 密码模块修改 2023-07-13 17:31:16 +08:00
杨金灵
d7732fe2ff Accept Merge Request #234: (feature/新增工件装夹 -> develop) 
Merge Request: 装夹工单优化

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/234?initial=true
 2023-07-13 17:21:26 +08:00
jinling.yang
36bb77ccb0 工单的完成按钮代码还原 2023-07-13 17:17:48 +08:00
jinling.yang
7a690abe1a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 
# Conflicts:
#	sf_maintenance/__manifest__.py
 2023-07-13 16:58:49 +08:00
jinling.yang
5beb7b3417 优化装夹工单，新增工件装夹page，名字为组件的page名称改为物料，去掉单独的工件装夹功能 2023-07-13 16:57:48 +08:00
马广威
d9adfc30d5 Accept Merge Request #233: (feature/修改库存模块的部分逻辑 -> develop) 
Merge Request: 库存模块部分逻辑已修改完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/233?initial=true
 2023-07-13 16:11:36 +08:00
mgw
3643c5ecb7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改库存模块的部分逻辑 2023-07-13 16:10:11 +08:00
mgw
f9c63b69a1 库存模块逻辑修改已完成 2023-07-13 16:09:28 +08:00
禹翔辉
701ae26eb4 Accept Merge Request #232: (feature/工作日历设置-工作日历表 -> develop) 
Merge Request: 生产线模型搬移至制造模块，新增工作日历模块，新增工作日历设置相关功能

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/232?initial=true
 2023-07-13 16:07:20 +08:00
yuxianghui
81842dc5ec 将生产线模型从设备模块搬移到了制造模块，新增工作日历设置修改休息日字段则工作日历创建新记录 2023-07-13 16:05:38 +08:00
yuxianghui
571e32925e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历设置-工作日历表 2023-07-11 17:40:46 +08:00
yuxianghui
ef7d9c22d4 新增根据工作日历设置的工作日字段创建工作日历的记录 2023-07-11 17:40:14 +08:00
WEB许何哲\xuhez
b6de9d5e64 Merge branch 'develop' into feature/修改看板样式 
# Conflicts:
#	sf_warehouse/__manifest__.py
#	sf_warehouse/static/src/kanban_color_change.scss
#	sf_warehouse/views/view.xml
 2023-07-11 16:05:53 +08:00
WEB许何哲\xuhez
a3760a7d9d 0711提交 2023-07-11 16:00:21 +08:00
马广威
58b9ea404b Accept Merge Request #231: (feature/增加js_class类对看板视图布局进行修改 -> develop) 
Merge Request: 增加js_class类对看板视图进行布局修改

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/231?initial=true
 2023-07-11 15:49:53 +08:00
mgw
feb15e4db2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/增加js_class类对看板视图布局进行修改 2023-07-11 15:48:44 +08:00
mgw
acd37b6c8c 修改sf_warehouse模块目录结构 2023-07-11 15:48:11 +08:00
mgw
94ffec20db 增加js_class类对看板视图进行布局修改 2023-07-11 15:43:03 +08:00
jinling.yang
7743c9658c 工单菜单优化 2023-07-10 17:33:17 +08:00
qihao.gong@jikimo.com
3544c6a957 密码策略模块测试 2023-07-10 17:33:06 +08:00
yuxianghui
6dfced8541 新增班次对象，新增工作日对象，修改了工作日历设置的班次、工作日字段类型；新增工作日历表对象 2023-07-10 17:26:43 +08:00