 zhangxin
|
ede9f545e5
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om
|
3 years ago |
 weichenglei
|
b25562c4bb
|
Merge pull request '修改日志模块读取配置文件的位置和文件名' (#210) from feature_infra into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/210
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
6c15792c54
|
修改日志模块读取配置文件的位置和文件名
|
3 years ago |
|
zhangxin
|
4317354467
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om
|
3 years ago |
|
zhangxin
|
4b8abfb751
|
添加从mes数据库回填数据的定时任务
|
3 years ago |
|
zhangxin
|
e94b90cb12
|
完善api dao和models的代码
|
3 years ago |
|
weichenglei
|
0584202eab
|
Merge pull request '添加了MES_WorkOrder的代码' (#209) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/209
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
cc7ecef0d4
|
添加了MES_WorkOrder的代码
|
3 years ago |
|
weichenglei
|
431ad6d34f
|
Merge pull request '生产排程产线负载' (#208) from feature_scheduler into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/208
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
 娄文智
|
121e02b890
|
产线负载
|
3 years ago |
|
weichenglei
|
9a56e43360
|
Merge pull request '添加批次订单和加工单同步到mes的定时任务功能' (#207) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/207
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
c582ea5c47
|
去掉测试代码 打开调度任务
|
3 years ago |
|
zhangxin
|
eb8a2bdcc0
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om
|
3 years ago |
|
zhangxin
|
b9d0641441
|
添加定时任务 同步数据到portal 和同步数据到mes
|
3 years ago |
|
zhangxin
|
dc411ee7b2
|
修改引用的变量名
|
3 years ago |
|
zhangxin
|
accdd7e6bd
|
完善传输数据到mes的功能代码
|
3 years ago |
|
zhangxin
|
d95c43257f
|
修改api models的不存在字段和引用
|
3 years ago |
|
weichenglei
|
a5d63a92e5
|
Merge pull request '修正了自动生成代码的错误' (#206) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/206
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
0188548af9
|
修正了自动生成代码的错误
|
3 years ago |
|
zhangxin
|
2675a4dea3
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om
|
3 years ago |
|
zhangxin
|
889b5b4c90
|
添加workOrder和serialOrder同步到mes的功能
|
3 years ago |
|
weichenglei
|
c1e6fd9120
|
Merge pull request '添加了新的自动生成代码' (#205) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/205
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
d5cfac1231
|
添加了新的自动生成代码
|
3 years ago |
|
zhangxin
|
46cce4c49d
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om
|
3 years ago |
|
weichenglei
|
832c8a024b
|
Merge pull request '修复lastUser赋值的问题' (#204) from fix_api into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/204
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
9118d8066c
|
修复lastUser赋值的问题
|
3 years ago |
|
weichenglei
|
bae7556af5
|
Merge pull request '生产排程功能开发调试' (#203) from feature_sche into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/203
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
11f17dc47f
|
生产排程功能开发调试
|
3 years ago |
|
zhangxin
|
cf8a11fac0
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om
|
3 years ago |
|
weichenglei
|
f85707e862
|
Merge pull request '根据数据表修改model和dao' (#202) from fix_api into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/202
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
97459b1163
|
根据数据表修改model和dao
|
3 years ago |
|
weichenglei
|
8b43753880
|
Merge pull request '为OM_WorkOrderStatusRecLst添加了新字段' (#201) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/201
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
7e8a3ee525
|
为OM_WorkOrderStatusRecLst添加了新字段
|
3 years ago |
|
zhangxin
|
8e4dfae112
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_log
|
3 years ago |
|
zhangxin
|
3e98b1ba5b
|
添加workOrder传输到mes的代码
|
3 years ago |
|
zhangxin
|
441a05328a
|
注释不需要的单元测试的代码
|
3 years ago |
|
zhangxin
|
ea070666fe
|
整合workOrder导入mes的功能
|
3 years ago |
|
weichenglei
|
43d30da176
|
Merge pull request '添加供应商门户返回班组时间功能和解决未赋值的bug' (#200) from fix_log_demand into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/200
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
b4b2c42a28
|
修复 artDemandLst.UnproducedQty 未赋值的bug
|
3 years ago |
|
zhangxin
|
334587d694
|
修复多余字段的bug
|
3 years ago |
|
zhangxin
|
3b2f31dbca
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_log_demand
# Conflicts:
# services/api/implments/A30Mes.service.impl.go
|
3 years ago |
|
zhangxin
|
5f47a296e6
|
添加路由 修复未使用变量的bug
|
3 years ago |
|
weichenglei
|
51f7472ed2
|
Merge pull request '调整了表A30_Mes的代码' (#199) from feature_A30_Mes into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/199
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
d688634fdf
|
调整了表A30_Mes的代码
|
3 years ago |
|
zhangxin
|
074a66462f
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_log_demand
|
3 years ago |
|
weichenglei
|
680526d02f
|
Merge pull request '添加了表A30_Mes的路由代码' (#198) from feature_A30_Mes into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/198
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
aa7ab6999a
|
添加了表A30_Mes的路由代码
|
3 years ago |
|
zhangxin
|
256c2875f4
|
修改artDemand 的source字段赋值逻辑， 修改过滤的source逻辑
|
3 years ago |
|
娄文智
|
f6ac2d0881
|
Merge pull request '添加了表A30_Mes的代码' (#197) from feature_A30_Mes into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/197
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
allanwei
|
fcbd090d5b
|
添加了表A30_Mes的代码
|
3 years ago |
