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

699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
马广威
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
qihao.gong@jikimo.com
1502336286 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划 2023-07-10 10:04:18 +08:00
qihao.gong@jikimo.com
78fd5a7ac3 修改工作中心与设备关联关系 2023-07-10 10:03:02 +08:00
jinling.yang
94856b0c55 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 2023-07-07 17:39:44 +08:00
jinling.yang
a0570cb999 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 2023-07-07 17:38:04 +08:00
禹翔辉
1d970712e3 Accept Merge Request #230: (feature/计划管理-基础设置 -> develop) 
Merge Request: 优化了产线设备资源设置模型

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/230?initial=true
 2023-07-07 17:37:19 +08:00
yuxianghui
9a03235cfa Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/计划管理-基础设置 2023-07-07 17:36:59 +08:00
yuxianghui
e711ff0ab3 优化了产线设备资源设置，新增根据选取的工作中心自动带出设备的数据，新增根据选择的工作日历自动带出班次的数据，新增搜索视图 2023-07-07 17:36:42 +08:00
jinling.yang
3fdf9130e8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 2023-07-07 14:39:05 +08:00
禹翔辉
e7075a83ca Accept Merge Request #229: (feature/计划管理-基础设置 -> develop) 
Merge Request: 新增生产线模型，优化了计划管理-基础设置模块

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/229?initial=true
 2023-07-07 14:38:15 +08:00
yuxianghui
e78a60b6ef Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/计划管理-基础设置 2023-07-07 14:37:08 +08:00
yuxianghui
5b5d41559c 优化了工作日历时间输入，新增工作日历设置自动计算时长功能，修改了生产线模型的位置（移至sf_maintenance模块下），优化了部分的产线设备资源设置模型 2023-07-07 14:36:27 +08:00
yuxianghui
123adcfc76 在sf_base下新增生产线模型，优化了计划管理-工作日历设置的手动输入时间和手动输入班次的格式 2023-07-06 17:38:08 +08:00
jinling.yang
1a0fa3fdb0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 2023-07-06 17:33:47 +08:00
马广威
621b75d437 Accept Merge Request #228: (feature/优化库存模块功能 -> develop) 
Merge Request: 优化货位状态，以及产品显隐逻辑

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/228?initial=true
 2023-07-06 15:05:38 +08:00
mgw
b72c3ce08a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化库存模块功能 2023-07-06 15:04:11 +08:00
mgw
20c6a67f34 优化货位状态，以及产品显隐逻辑 2023-07-06 15:03:35 +08:00
WEB许何哲\xuhez
c440afa435 Merge branch 'develop' into feature/修改看板样式 
解决冲突

# Conflicts:
#	sf_warehouse/__manifest__.py
#	sf_warehouse/static/src/change.scss
 2023-07-06 14:41:17 +08:00
许何哲
8dfcd943f0 Accept Merge Request #227: (feature/前端分支 -> develop) 
Merge Request: 修改导航栏

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/227?initial=true
 2023-07-06 14:29:10 +08:00
WEB许何哲\xuhez
26319beaa4 样式修改 2023-07-06 14:22:34 +08:00
马广威
c0b7e3679b Accept Merge Request #226: (feature/为看板设置颜色 -> develop) 
Merge Request: 在看板xml中增加判断逻辑选择不同的class属性值，以匹配对应的css颜色

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/226?initial=true
 2023-07-06 12:28:00 +08:00
mgw
bc7f516d2d 在看板xml中增加判断逻辑选择不同的class属性值，以匹配对应的css颜色 2023-07-06 12:26:35 +08:00
马广威
f31becc215 Accept Merge Request #225: (feature/改造原生库存模块 -> develop) 
Merge Request: 原生库存模块初步升级已完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/225?initial=true
 2023-07-06 09:44:08 +08:00
mgw
3943b0994e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/改造原生库存模块 2023-07-06 09:41:42 +08:00
mgw
3a653a9485 优化货位看板显示字段 2023-07-06 09:38:57 +08:00
mgw
b754534b5b 完善库存模块新增功能及编码规则，已实现据货架分别展示下属货位的看板，待优化 2023-07-05 23:02:22 +08:00