 zhangxin
|
ad944e282c
|
修改统计的逻辑
|
3 years ago |
|
zhangxin
|
9d04453290
|
添加display的source arc常量定义
|
3 years ago |
|
zhangxin
|
bf0c5d38ac
|
添加title和source字段
|
3 years ago |
|
zhangxin
|
b74433877b
|
添加where条件1=1
|
3 years ago |
|
zhangxin
|
0d12fd3f59
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_report
|
3 years ago |
|
zhangxin
|
252fde7ee3
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_report
# Conflicts:
# services/report/implments/FilterDataInfo.service.impl.go
|
3 years ago |
|
zhangxin
|
da1c52f17a
|
Merge pull request '重新整成了报表模块代码' (#349) from feature_NewReport into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/349
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
 allanwei
|
3a435fb293
|
重新整成了报表模块代码
|
3 years ago |
|
zhangxin
|
d0260deecd
|
修改新的展示数据统计逻辑
|
3 years ago |
|
zhangxin
|
52bf809bde
|
添加返回给前端的数据字段
|
3 years ago |
|
weichenglei
|
42bfe3c0e8
|
Merge pull request '移动排程' (#348) from feature_MoveScheduler into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/348
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
 娄文智
|
e43a98b265
|
移动排程
|
3 years ago |
|
zhangxin
|
54e3002586
|
Merge pull request '添加了RP模块的自动生成代码' (#347) from feature_NewRP into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/347
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
dd0a99f642
|
添加了RP模块的自动生成代码
|
3 years ago |
|
娄文智
|
d339d8cb50
|
Merge pull request '修正了移除WebSockect连接时发生的错误' (#346) from fix_WebSockectConnection into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/346
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
allanwei
|
ac4ec76d87
|
修正了移除WebSockect连接时发生的错误
|
3 years ago |
|
weichenglei
|
22cdefdce1
|
Merge pull request '添加eods获取工位加工数据的websocket接口功能' (#345) from feature_portal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/345
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
35c51d4da9
|
添加eods获取工位加工数据的websocket接口功能
|
3 years ago |
|
zhangxin
|
8093904378
|
添加websocket的常量
|
3 years ago |
|
zhangxin
|
820d629df8
|
添加websocket的功能接口代码
|
3 years ago |
|
zhangxin
|
2c2559e82a
|
Merge pull request '增加model' (#343) from fix_sche into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/343
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
d9be9b803a
|
增加model
|
3 years ago |
|
娄文智
|
b8d9ba02c7
|
Merge pull request '添加清理portal老数据的功能程序' (#342) from feature_portal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/342
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
142d18f82b
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_portal
|
3 years ago |
|
zhangxin
|
b1f8b75407
|
添加清理portal老数据的功能程序
|
3 years ago |
|
娄文智
|
dfc74d7ee9
|
Merge pull request '返回结构体中添加字段Uom' (#341) from feature_report into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/341
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
338144a9b3
|
返回结构体中添加字段Uom
|
3 years ago |
|
zhangxin
|
44d7eccb72
|
添加字段Uom
|
3 years ago |
|
娄文智
|
378ae2a70f
|
Merge pull request '添加定期清理供应商门户和workOrder模块中A30生成的数据的程序' (#340) from feature_portal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/340
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
6febc17087
|
添加清理老数据的方法
|
3 years ago |
|
zhangxin
|
9affb3fa7e
|
添加定期清理供应商门户和workOrder模块中A30生成的数据的程序
|
3 years ago |
|
zhangxin
|
9662175aa2
|
Merge pull request 'schuduler排程 移动' (#339) from fix_schedulerMove into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/339
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
c11437be9e
|
schuduler排程 移动
|
3 years ago |
|
zhangxin
|
9c6f381476
|
Merge pull request '修正了处理登录时发生的错误' (#338) from fix_Messaging into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/338
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
0338c74e9c
|
修正了处理登录时发生的错误
|
3 years ago |
|
娄文智
|
3824bd50b7
|
Merge pull request '调整额了WebSocket实现' (#337) from feature_Messing into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/337
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
allanwei
|
1fd721f401
|
1.修正了获取WebSocket上下文的功能
2.实现了二次认证的功能
|
3 years ago |
|
zhangxin
|
c7ec04d2d3
|
Merge pull request '集成了WebSocket组件' (#336) from feature_WebSocket into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/336
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
321b6d0186
|
集成了WebSocket组件
|
3 years ago |
|
weichenglei
|
61faae13cc
|
Merge pull request '添加弧焊机统计数据返回结构体useField字段' (#335) from feature_report into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/335
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
1630d0661f
|
添加弧焊机统计数据返回结构体useField字段
|
3 years ago |
|
weichenglei
|
9e7c2653a7
|
Merge pull request '修改创建解析portal db任务的时间和限制状态' (#334) from fix_portal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/334
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
5e4ff94564
|
修改创建解析portal db任务的时间和限制状态
|
3 years ago |
|
weichenglei
|
a3d93652fc
|
Merge pull request '添加弧焊机统计数据展示功能' (#333) from feature_report into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/333
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
1c4ceb4651
|
添加弧焊机统计数据展示接口不需要校验token
|
3 years ago |
|
zhangxin
|
0ad10c939c
|
添加弧焊机统计数据展示功能
|
3 years ago |
|
zhangxin
|
e705add29b
|
Merge pull request '添加了自动生成代码' (#331) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/331
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
79622ea08e
|
添加了自动生成代码
|
3 years ago |
|
zhangxin
|
fd616d49e0
|
Merge pull request '全字段更新' (#329) from fix_portalUP into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/329
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
c457bbddaa
|
全字段更新
|
3 years ago |
