 zhangxin
|
4eec89f488
|
修改文件名
|
3 years ago |
|
zhangxin
|
4f4ce81cc4
|
Merge pull request '生产排程，状态保存' (#227) from feature_savescheduler into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/227
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
 娄文智
|
c6528d5e45
|
生产排程，状态保存
|
3 years ago |
|
娄文智
|
3875c3eedb
|
Merge pull request '修改了接口类型和方法类型的注释' (#226) from feature_NewContainer into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/226
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
 allanwei
|
90794dde77
|
修改了接口类型和方法类型的注释
|
3 years ago |
|
weichenglei
|
73ac1804e0
|
Merge pull request '一键排程，人工排程，保存结果' (#225) from feature_savesche into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/225
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
娄文智
|
97ceac0e31
|
一键排程，人工排程，保存结果
|
3 years ago |
|
zhangxin
|
4fbbc00e91
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_scheduler
|
3 years ago |
|
zhangxin
|
5a1f059390
|
修改读取Slave数据库的判断依据
|
3 years ago |
|
zhangxin
|
f70f37f419
|
添加生产派工的定时任务
|
3 years ago |
|
zhangxin
|
4cfc42ece8
|
优化portal数据解析的功能和修改字段类型赋值
|
3 years ago |
|
zhangxin
|
4352406593
|
修改生产的workOrderStatusRecLst和serialOrderStatusRecLst中的outputEvent和outputStatus赋值逻辑
|
3 years ago |
|
zhangxin
|
bdadd55424
|
查询serialorder 拼接status
|
3 years ago |
|
zhangxin
|
58f8c3d61c
|
添加sheduler 服务接口的功能实现
|
3 years ago |
|
zhangxin
|
d00c55334f
|
修改根绝duration生产派工的逻辑
|
3 years ago |
|
zhangxin
|
9d20465036
|
添加output_failed状态
|
3 years ago |
|
zhangxin
|
dd06689428
|
生成系列订单的接口返回对应的workOrderId和变更之后的status
|
3 years ago |
|
zhangxin
|
ceb2658a14
|
添加生产派工的接口功能
|
3 years ago |
|
weichenglei
|
62e6093ea7
|
Merge pull request '将Portal_WorkOrder改为了VW_PLan_Info' (#224) from feature_VW_Plan_Info into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/224
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
56c6a38d88
|
将Portal_WorkOrder改为了VW_PLan_Info
|
3 years ago |
|
zhangxin
|
bbd4f18cc7
|
Merge pull request '生产排程更新' (#223) from feature_schedu into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/223
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
899dc3ae9d
|
生产排程更新
|
3 years ago |
|
weichenglei
|
0c666e571c
|
Merge pull request '添加andon功能的开发' (#222) from feature_api into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/222
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
67d8406f39
|
添加andon功能的开发
|
3 years ago |
|
weichenglei
|
4c7a4dd8cd
|
Merge pull request '分拆了容器中的代理和代理创建器' (#221) from feature_NewContainer into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/221
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
weichenglei
|
c314be1d80
|
Merge branch 'develop' into feature_NewContainer
|
3 years ago |
|
allanwei
|
13f27ae502
|
分拆了容器中的代理和代理创建器
|
3 years ago |
|
weichenglei
|
068199dea7
|
Merge pull request '修改字段命名' (#220) from feature_api into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/220
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
3244a08ce1
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_api
|
3 years ago |
|
zhangxin
|
e2f150dee9
|
修改字段命名
|
3 years ago |
|
娄文智
|
bd89523102
|
Merge pull request '删除掉无用的mes meta文件' (#218) from feature_api into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/218
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
c297cc811f
|
删除掉无用的mes meta文件
|
3 years ago |
|
weichenglei
|
5e402fe6b6
|
Merge pull request '添加api打螺丝的数据交互' (#217) from feature_api into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/217
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
504afb475d
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_api
|
3 years ago |
|
zhangxin
|
8cddfc89ce
|
添加api打螺丝的数据交互
|
3 years ago |
|
zhangxin
|
6103391fa5
|
Merge pull request '产线负载' (#216) from feature_workLoad into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/216
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
6822bc8ac2
|
Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_BACKEND into feature_workLoad
|
3 years ago |
|
weichenglei
|
a2febe02f0
|
Merge pull request '添加从数据库同步解析portalWorkOrder数据功能，添加从mes回写数据到aps系统的功能' (#215) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/215
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
ac42915e43
|
修改mesWorkOrder的表明为portalWorkOrder
|
3 years ago |
|
zhangxin
|
d96c698a31
|
修改数据类型
|
3 years ago |
|
zhangxin
|
c64fdebf53
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om
|
3 years ago |
|
zhangxin
|
09b8bc53f2
|
添加从数据库同步portal work order的功能代码
|
3 years ago |
|
娄文智
|
1920a2c477
|
产线负载
|
3 years ago |
|
weichenglei
|
79b8f0ae97
|
Merge pull request '调整了部分数据表名称和数据库字段' (#213) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/213
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
12403b4852
|
调整了部分数据表名称和数据库字段
|
3 years ago |
|
zhangxin
|
7dabb66b77
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om
|
3 years ago |
|
zhangxin
|
5922da8f3e
|
去掉数据库中不存在的字段
|
3 years ago |
|
zhangxin
|
47b13660fd
|
将解析workOrder的方法拆到parseMesWorkOrder文件中
|
3 years ago |
|
weichenglei
|
110a88dd1f
|
Merge pull request '为DemandLst添加了字段,新增了OM_DemandHeadFromDB代码' (#211) from feature_NewOMCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/211
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
79412098ea
|
为DemandLst添加了字段,新增了OM_DemandHeadFromDB代码
|
3 years ago |
