jinling.yang
|
e0193b81c9
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2023-01-31 11:09:13 +08:00 |
|
龚启豪
|
8312b5fc6b
|
Accept Merge Request #108: (feature/sf优化界面 -> develop)
Merge Request: 修改登录背景，工作中心显示bug
Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/108
|
2023-01-31 11:08:04 +08:00 |
|
gqh
|
169bf4a59a
|
修改登录背景
|
2023-01-31 11:02:53 +08:00 |
|
jinling.yang
|
f763da5947
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
|
2023-01-31 10:53:30 +08:00 |
|
马广威
|
af91aca75f
|
Accept Merge Request #106: (feature/优化代码：工单显示机床信息等 -> develop)
Merge Request: 数采节点字段配置完毕
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/106
|
2023-01-31 10:42:56 +08:00 |
|
马广威
|
8c424f5aa6
|
Merge branch develop into feature/优化代码：工单显示机床信息等
|
2023-01-31 10:42:32 +08:00 |
|
jinling.yang
|
07709af26a
|
Merge branch 'feature/修复sf的bug' into develop
|
2023-01-31 10:38:37 +08:00 |
|
杨金灵
|
210ee9d38d
|
Accept Merge Request #107: (feature/修复sf的bug -> develop)
Merge Request: 页面优化及部分bug修复
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/107
|
2023-01-31 10:37:58 +08:00 |
|
jinling.yang
|
e2ae08c33f
|
制造和销售里的产品的筛选器，胚料的生成新增是否为业务平台新建字段，匹配bom修改为只能匹配手动建的bom
|
2023-01-31 10:32:14 +08:00 |
|
mgw
|
51c89f5c6b
|
修改字段名称，为一键下发增加异常捕获
|
2023-01-31 10:27:57 +08:00 |
|
jinling.yang
|
733e33adfd
|
新增胚料的模型类型
|
2023-01-30 18:11:29 +08:00 |
|
gqh
|
fec18188fa
|
工作中心看板查看工单取消全屏
|
2023-01-30 17:56:41 +08:00 |
|
mgw
|
4e57c76c63
|
机床对象上增加数据采集节点配置
|
2023-01-30 17:38:53 +08:00 |
|
gqh
|
f5c8623c72
|
sf优化
|
2023-01-30 17:33:38 +08:00 |
|
mgw
|
60e044ec9b
|
新增机床ftp路径配置
|
2023-01-30 15:14:36 +08:00 |
|
jinling.yang
|
271a5d4224
|
1.模型类型增加跟修改各字段
2.智能工厂成品名称优化
3.智能工厂产品根据产品类型增加默认筛选条件的优化（在筛选器内根据产品类型增加筛选条件）
4.智能工厂胚料名称的优化
5.自加工产品的制造订单优化
|
2023-01-29 17:48:45 +08:00 |
|
mgw
|
f6f782fe33
|
配置工单显示机床信息
|
2023-01-29 17:47:36 +08:00 |
|
gqh
|
e93906a5f0
|
工作中心看板默认展示列表
|
2023-01-29 17:04:50 +08:00 |
|
gqh
|
16cffc3ba5
|
单个制造显示问题
|
2023-01-29 16:33:56 +08:00 |
|
gqh
|
a7edb142c8
|
恢复代码
|
2023-01-29 16:05:00 +08:00 |
|
gqh
|
a26d1ca2ba
|
三元输入坐标变色
|
2023-01-29 15:55:46 +08:00 |
|
gqh
|
e0ce0fcfa3
|
回滚
|
2023-01-29 15:48:50 +08:00 |
|
gqh
|
9125eedf5a
|
回滚
|
2023-01-29 15:48:12 +08:00 |
|
gqh
|
e6883a1f92
|
回滚
|
2023-01-29 15:47:46 +08:00 |
|
gqh
|
16623b3292
|
回滚
|
2023-01-29 15:47:18 +08:00 |
|
gqh
|
878e28791c
|
回滚
|
2023-01-29 15:46:58 +08:00 |
|
gqh
|
e319b282fc
|
回滚
|
2023-01-29 15:46:14 +08:00 |
|
gqh
|
bdae9d9f95
|
恢复代码
|
2023-01-29 15:42:33 +08:00 |
|
gqh
|
cfde389826
|
工单操作page默认在前面
|
2023-01-29 09:43:03 +08:00 |
|
mgw
|
0a248d577a
|
优化代码-设置按钮权限等
|
2023-01-29 09:26:19 +08:00 |
|
gqh
|
9c473e6f32
|
优化sf
|
2023-01-23 20:21:00 +08:00 |
|
jinling.yang
|
270b8d3cc1
|
修复工作中心绑定机床和胚料外协供应商外包未勾选问题
|
2023-01-13 16:47:12 +08:00 |
|
jinling.yang
|
5492d4f2fa
|
修复工作中心绑定机床和胚料外协供应商是否外包未勾选bug修复
|
2023-01-13 16:43:30 +08:00 |
|
gqh
|
c212810d60
|
合并
|
2023-01-12 14:16:05 +08:00 |
|
jinling.yang
|
f5cfd50d33
|
cnc按钮展示问题，加工进度字段去掉注释
|
2023-01-11 16:32:48 +08:00 |
|
jinling.yang
|
6d48618253
|
优化接口
|
2023-01-11 16:23:19 +08:00 |
|
jinling.yang
|
39136bb137
|
新增依赖
|
2023-01-11 15:25:49 +08:00 |
|
jinling.yang
|
6374388d7b
|
附件新增字段
|
2023-01-11 15:11:44 +08:00 |
|
gqh
|
381d6ca9a5
|
更新mrs_connect
|
2023-01-11 15:04:37 +08:00 |
|
gqh
|
8e51654f17
|
合并sf代码
|
2023-01-11 14:51:59 +08:00 |
|
gqh
|
aba5a076b1
|
合并
|
2023-01-11 14:08:12 +08:00 |
|
gqh
|
eb162cb416
|
合并工单优化
|
2023-01-11 11:13:52 +08:00 |
|
jinling.yang
|
01cf30b03f
|
优化涉及到的接口
|
2023-01-11 11:05:06 +08:00 |
|
jinling.yang
|
d66687297d
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单文件优化
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2023-01-10 09:27:14 +08:00 |
|
gqh
|
311c7c723a
|
sf1.0
|
2023-01-09 23:04:53 +08:00 |
|
jinling.yang
|
0de2222009
|
cnc程序获取优化
|
2023-01-09 21:20:51 +08:00 |
|
gqh
|
d0497aa043
|
工单优化
|
2023-01-09 20:40:27 +08:00 |
|
jinling.yang
|
1dcc15802a
|
Merge branch 'feature/优化sf' into develop
|
2023-01-09 20:35:21 +08:00 |
|
jinling.yang
|
c3e5610b17
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化sf
# Conflicts:
# sf_manufacturing/models/__init__.py
# sf_manufacturing/models/mrp_workcenter.py
# sf_manufacturing/models/mrp_workorder.py
# sf_manufacturing/views/mrp_workorder_view.xml
|
2023-01-09 20:33:53 +08:00 |
|
jinling.yang
|
b7723f82d0
|
优化sf获取cnc程序和ftp
|
2023-01-09 19:54:02 +08:00 |
|