 娄文智
|
ca5b03f7e4
|
提交手动创建包装
|
3 years ago |
 zhangxin
|
b5e5aabef4
|
Merge pull request '激光焊添加校验规则' (#359) from fix_pack into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/359
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
de93a434af
|
激光焊添加校验规则
|
3 years ago |
|
zhangxin
|
84934b6ce5
|
Merge pull request '目检校验' (#358) from feature_pack into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/358
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
6dd9da726c
|
目检校验
|
3 years ago |
 weichenglei
|
067f37aef6
|
Merge pull request '修改mu为统计昨天的数据' (#357) from feature_report into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/357
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
f5ad1dc1cc
|
修改mu为统计昨天的数据
|
3 years ago |
|
娄文智
|
1d238803a9
|
Merge pull request '修改workOrder status24到26 26到40的逻辑' (#356) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/356
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
315bd54e56
|
修改workOrder24变为26的逻辑
|
3 years ago |
|
zhangxin
|
004bea9bbf
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om
|
3 years ago |
|
zhangxin
|
e57bace3f0
|
修改变更workOrderStatus状态的逻辑
|
3 years ago |
|
weichenglei
|
ac06b5fec3
|
Merge pull request '修改弧焊机显示mu的处理逻辑，添加对时间模型的处理' (#355) from feature_report into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/355
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
3222ff34bc
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_report
|
3 years ago |
|
zhangxin
|
5328950b31
|
修改弧焊机显示mu的处理逻辑，添加对时间模型的处理
|
3 years ago |
|
zhangxin
|
dc9d067ae8
|
Merge pull request '产线占比计算' (#354) from fix_rate into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/354
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
b2e288b5a9
|
产线占比计算
|
3 years ago |
|
娄文智
|
e841ef5981
|
Merge pull request '添加了QM_SerialOrderRuting的代码' (#353) from feature_New_QM_SerialOrderRuting into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/353
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
allanwei
|
5661fe51b1
|
添加了QM_SerialOrderRuting的代码
|
3 years ago |
|
娄文智
|
b13ddd2c37
|
Merge pull request '修改serialOrder和serialOrderStatus批量插入为循环单条插入' (#352) from fix_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/352
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
9b38eacd94
|
修改serialOrder和serialOrderStatus批量插入为循环单条插入
|
3 years ago |
|
娄文智
|
f21485e069
|
Merge pull request '移动保存' (#351) from feature_MoveScheduler into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/351
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
e18a18dd91
|
Merge branch 'develop' into feature_MoveScheduler
|
3 years ago |
|
娄文智
|
11589f3ba5
|
移动保存
|
3 years ago |
|
weichenglei
|
577b651a76
|
Merge pull request '修改统计的逻辑' (#350) from feature_report into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/350
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
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 |
