 zhangxin
|
8a0b200824
|
修复解析订单数量不一致的bug
|
3 years ago |
 weichenglei
|
6edb864e75
|
Merge pull request '添加aps release的功能代码' (#234) from fix_sheduler into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/234
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
3389fa98d9
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_sheduler
|
3 years ago |
|
zhangxin
|
b6fae5bf35
|
添加aps release的功能代码
|
3 years ago |
|
weichenglei
|
17a4c5e1c9
|
Merge pull request '产线负载接口调试' (#233) from fix_scheduler into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/233
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
 娄文智
|
499760c142
|
产线负载接口调试
|
3 years ago |
|
weichenglei
|
7c96eb1ec5
|
Merge pull request '修复派工中检索和状态置为的bug' (#232) from fix_scheduler into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/232
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
653abb7e0b
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_scheduler
|
3 years ago |
|
zhangxin
|
0c41276662
|
添加调度派工的定时任务
|
3 years ago |
|
zhangxin
|
381975cbab
|
添加日志
|
3 years ago |
|
zhangxin
|
d6312a1426
|
修复传输到mes成功状态置为错误
|
3 years ago |
|
zhangxin
|
0942ab515c
|
添加过滤projectid
|
3 years ago |
|
weichenglei
|
d1546933a3
|
Merge pull request '添加派工调度任务及和mes的数据交互' (#231) from fix_scheduler into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/231
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
6caee10b0e
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_scheduler
|
3 years ago |
|
zhangxin
|
6cda72bfd5
|
启用调度task
|
3 years ago |
|
zhangxin
|
ba3304e502
|
注释掉不启用的功能
|
3 years ago |
|
zhangxin
|
48aabea66f
|
添加对取消状态的处理
|
3 years ago |
|
zhangxin
|
abcc55d618
|
添加不加权限的selectWithoutAuthority方法
|
3 years ago |
|
zhangxin
|
210bcd1de6
|
调试从数据库同步订单
|
3 years ago |
|
zhangxin
|
458b62969a
|
Merge pull request '条件查询项目为G-FRAME' (#229) from feature_frame into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/229
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
b7e01f3e1a
|
条件查询项目为G-FRAME
|
3 years ago |
|
zhangxin
|
6ee9f8c8a5
|
Merge pull request '同步数据,屏蔽token验证和权限验证' (#228) from feature_syncData into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/228
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
6a6ff47b0f
|
同步数据,屏蔽token验证和权限验证
|
3 years ago |
|
zhangxin
|
65cb1ae0f3
|
添加配置参数
|
3 years ago |
|
zhangxin
|
f71dae9c52
|
添加vwPlaninfo的处理方法
|
3 years ago |
|
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 |
