jinling.yang
|
3a1acb0f5a
|
整合所有模块依赖
|
2023-11-08 17:13:18 +08:00 |
|
jinling.yang
|
65dd8372dd
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11）
|
2023-10-25 15:07:52 +08:00 |
|
qihao.gong@jikimo.com
|
4098dda5b8
|
修改设备日志列表展示
|
2023-10-24 17:31:42 +08:00 |
|
jinling.yang
|
d83255cc67
|
优化同步刀具标准库接口（包含全部合并每日）
|
2023-10-19 17:23:53 +08:00 |
|
jinling.yang
|
e7df6c14b1
|
同步刀具标准库
|
2023-10-19 10:49:54 +08:00 |
|
qihao.gong@jikimo.com
|
b1d2cd1ceb
|
设备类别参数根据不同类别必填 设备增加刀具库位table 并自动生成
|
2023-10-11 14:45:35 +08:00 |
|
qihao.gong@jikimo.com
|
6b375ee64d
|
修改故障日志bug
|
2023-09-27 14:30:38 +08:00 |
|
qihao.gong@jikimo.com
|
22a4ccad6b
|
修改维保生成编码和名称的规则
|
2023-09-26 17:29:14 +08:00 |
|
qihao.gong@jikimo.com
|
c919f0724a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug
|
2023-09-22 17:01:28 +08:00 |
|
qihao.gong@jikimo.com
|
681b769356
|
设备类别新增选项
|
2023-09-22 17:01:03 +08:00 |
|
mgw
|
e9e25c582e
|
增加排程结果反馈给制造订单的功能
|
2023-09-21 14:32:05 +08:00 |
|
mgw
|
5148ad3952
|
工作中心看板样式修改
|
2023-09-15 10:58:53 +08:00 |
|
mgw
|
db5d9863b1
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
# Conflicts:
# jikimo_frontend/static/src/scss/custom_style.scss
# sf_manufacturing/views/mrp_workcenter_views.xml
|
2023-09-15 10:40:30 +08:00 |
|
mgw
|
2cc03c21ed
|
优化图文展示样式
|
2023-09-15 10:37:20 +08:00 |
|
WEB许何哲\xuhez
|
69506af2ab
|
sf看板样式统一
|
2023-09-14 17:23:50 +08:00 |
|
yuxianghui
|
400f4b6201
|
解决图文展示中图片不显示问题；新增刀具物料能力对象的form视图。
|
2023-09-13 17:13:21 +08:00 |
|
mgw
|
4bcb12d3f1
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化
|
2023-09-12 11:12:19 +08:00 |
|
mgw
|
7cbaf7373a
|
冗余菜单处理完成
|
2023-09-12 11:12:00 +08:00 |
|
yuxianghui
|
cf7e6ea33d
|
隐藏功能刀具组装的创建按钮；刀具物料功能每齿走刀量模型新增加工方式字段，解决新增记录报错问题；解决计划管理-工作日历设置不自动生成工作日历的问题。
|
2023-09-11 17:21:32 +08:00 |
|
yuxianghui
|
35afdd3b2a
|
刀具物料功能模型从sf_base模块迁移到sf_manufacturing模块；新增每齿走刀量模型；整体式刀具物料新增关联每齿走刀量对象字段；
|
2023-09-08 10:20:52 +08:00 |
|
WEB许何哲\xuhez
|
26f07a00c3
|
Merge branch 'develop' into feature/sf品牌页面表格样式的修改
|
2023-09-05 16:45:32 +08:00 |
|
WEB许何哲\xuhez
|
b47dbe29c0
|
修改tree视图样式bug
|
2023-09-05 16:44:42 +08:00 |
|
mgw
|
7e071151a8
|
删除制造订单处排程相关的部分，排程模块架构改造完成
|
2023-08-25 10:43:22 +08:00 |
|
mgw
|
eda57036bd
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/生产排程
|
2023-08-25 09:14:34 +08:00 |
|
mgw
|
e33a25e47a
|
更改排程结构前备份
|
2023-08-25 09:14:15 +08:00 |
|
qihao.gong@jikimo.com
|
3b3847990d
|
工作重心看板展示设备状态以及图片，设备看板增加负责人
|
2023-08-24 14:51:03 +08:00 |
|
mgw
|
bf7ef78b20
|
搭建排程基础架构
|
2023-08-24 11:24:27 +08:00 |
|
yuxianghui
|
f88dd790a0
|
生产线新增关联工作中心字段，优化看板和form视图布局
|
2023-08-18 15:11:36 +08:00 |
|
qihao.gong@jikimo.com
|
08ac2978a1
|
移除托盘对象 并清除所有关联关系
|
2023-08-17 16:33:40 +08:00 |
|
mgw
|
2169c10417
|
修改生产线驾驶舱形式为searchpanel，贴近整体布局
|
2023-08-16 10:11:40 +08:00 |
|
WEB许何哲\xuhez
|
0e292ea597
|
调试线上sf的bug
|
2023-08-08 14:42:10 +08:00 |
|
WEB许何哲\xuhez
|
46f40ec480
|
修改标签页筛选完后看板视图的样式
|
2023-08-07 16:49:36 +08:00 |
|
WEB许何哲\xuhez
|
f85a0e4c85
|
删除searchPannel
|
2023-08-07 15:06:35 +08:00 |
|
WEB许何哲\xuhez
|
578d9c46d9
|
Merge branch 'develop' into feature/tree视图表格样式修改
# Conflicts:
# sf_manufacturing/static/src/js/kanban_change.js
# sf_manufacturing/static/src/scss/kanban_change.scss
# sf_manufacturing/views/mrp_workcenter_views.xml
|
2023-08-07 14:51:55 +08:00 |
|
WEB许何哲\xuhez
|
5a28ec7579
|
工作中心看板视图标签页的动态添加并实现点击筛选
|
2023-08-07 14:48:55 +08:00 |
|
mgw
|
5f04cbb896
|
看板视图css调整（老许做的）
|
2023-08-07 14:37:58 +08:00 |
|
mgw
|
4f893929ca
|
工作中心看板视图动态添加标签页并可初步进行点击晒选
|
2023-08-07 10:50:44 +08:00 |
|
mgw
|
de32f5db78
|
看板视图筛选实现功能的条件已具备（看板已抠，字段存在），待优化
|
2023-08-07 08:58:50 +08:00 |
|
mgw
|
95c57a3ffb
|
新增翻译问题解决
|
2023-08-03 11:55:46 +08:00 |
|
mgw
|
3c934e3a4b
|
制造订单处字段调整完成，翻译优化完成
|
2023-08-02 18:01:28 +08:00 |
|
mgw
|
501756d4e7
|
测试制造模块更改后的翻译，本地已生效
|
2023-08-01 10:16:47 +08:00 |
|
jinling.yang
|
47b2e8c709
|
1.同步的模型的页面不可增删改
2.工单的物料里新增长宽高字段
|
2023-07-27 15:45:45 +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 |
|
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 |
|
yuxianghui
|
81842dc5ec
|
将生产线模型从设备模块搬移到了制造模块，新增工作日历设置修改休息日字段则工作日历创建新记录
|
2023-07-13 16:05:38 +08:00 |
|
jinling.yang
|
7743c9658c
|
工单菜单优化
|
2023-07-10 17:33:17 +08:00 |
|
qihao.gong@jikimo.com
|
78fd5a7ac3
|
修改工作中心与设备关联关系
|
2023-07-10 10:03:02 +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 |
|