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 |
|
WEB许何哲\xuhez
|
b47dbe29c0
|
修改tree视图样式bug
|
2023-09-05 16:44:42 +08:00 |
|
qihao.gong@jikimo.com
|
3b3847990d
|
工作重心看板展示设备状态以及图片，设备看板增加负责人
|
2023-08-24 14:51:03 +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
|
501756d4e7
|
测试制造模块更改后的翻译，本地已生效
|
2023-08-01 10:16:47 +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 |
|
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 |
|
jinling.yang
|
a008dbb76a
|
1.sf的工作中心新增表面工艺字段，工序类型新增表面工艺类型，且当工序类型为表面工艺时，则显示表面工艺，其他则不显示
2.sf的工作中心新增工艺外协字段，该字段若被勾选则为表面工艺的外协加工中心
3.sf的销售订单上点击生成制造订单时在已有的成品工序后累加表面工艺工序，表面工艺的工序生成规则需根据表面工艺所对应的类别的排序来依次生成，并且工序里的工作中心的匹配规则需根据表面工艺的可选参数里的获取方式字段的值来匹配
|
2023-03-30 17:52:05 +08:00 |
|
jinling.yang
|
dfeeed7b59
|
制造订单，产品，工单上进行3d模型展示
|
2023-03-09 17:34:44 +08:00 |
|
gqh
|
59cb6e5def
|
优化工单界面，新增物料page，修复工单按钮bug，隐藏权限字段
|
2023-02-02 14:59:39 +08:00 |
|
gqh
|
5495f2436a
|
优化工单，英文改为中文展示，解除托盘展示托盘
|
2023-02-01 14:07:33 +08:00 |
|
gqh
|
e93906a5f0
|
工作中心看板默认展示列表
|
2023-01-29 17:04:50 +08:00 |
|
gqh
|
bdae9d9f95
|
恢复代码
|
2023-01-29 15:42:33 +08:00 |
|
gqh
|
9c473e6f32
|
优化sf
|
2023-01-23 20:21:00 +08:00 |
|
jinling.yang
|
5492d4f2fa
|
修复工作中心绑定机床和胚料外协供应商是否外包未勾选bug修复
|
2023-01-13 16:43:30 +08:00 |
|
gqh
|
eb162cb416
|
合并工单优化
|
2023-01-11 11:13:52 +08:00 |
|
gqh
|
311c7c723a
|
sf1.0
|
2023-01-09 23:04:53 +08:00 |
|
gqh
|
d0497aa043
|
工单优化
|
2023-01-09 20:40:27 +08:00 |
|
gqh
|
b53fddeec5
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
# Conflicts:
# sf_manufacturing/models/mrp_workcenter.py
# sf_manufacturing/models/mrp_workorder.py
# sf_manufacturing/views/mrp_workorder_view.xml
|
2023-01-04 10:35:38 +08:00 |
|
gqh
|
08efe7813d
|
sf工单优化及权限
|
2023-01-04 10:13:29 +08:00 |
|
jinling.yang
|
5fcb17d048
|
胚料bug修复，销售订单明细行路线修复，编程单下发优化
|
2022-12-27 17:28:47 +08:00 |
|
jinling.yang
|
6b9fe9167e
|
代码终版
|
2022-11-22 13:18:18 +08:00 |
|
jinling.yang
|
c3fdaf8d76
|
更改制造模块名
|
2022-11-22 09:41:52 +08:00 |
|