 allanwei
|
730382c747
|
为WorkLine添加了字段
|
3 years ago |
|
weichenglei
|
5cbddc0b26
|
Merge pull request '添加非admin用户的权限数据过滤' (#179) from feature_log into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/179
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
 zhangxin
|
0037c4e547
|
添加非admin用户的权限数据过滤
|
3 years ago |
|
weichenglei
|
2f8f9ce97b
|
Merge pull request '角色权限bug修复' (#178) from debug_role into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/178
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
 娄文智
|
40e53bb39e
|
角色权限bug修复
|
3 years ago |
|
weichenglei
|
e6af94e884
|
Merge pull request '解析订单时 查询物料主数据并进行数据拼接' (#177) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/177
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
1966be63a0
|
添加初始化测试数据库的方法
|
3 years ago |
|
zhangxin
|
f7e749ae54
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om
|
3 years ago |
|
zhangxin
|
b8a4f0212a
|
添加加载产线主数据的字段映射
|
3 years ago |
|
zhangxin
|
42b2bd8278
|
添加对Sehduler releaseSchduler的单元测试
|
3 years ago |
|
zhangxin
|
2f5c7a053f
|
解析订单时 查询物料主数据并进行数据拼接
|
3 years ago |
|
weichenglei
|
435e7c6f69
|
Merge pull request '生产排程功能开发' (#176) from feature_scheduler into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/176
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
娄文智
|
78f8eb76ce
|
Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_BACKEND into feature_scheduler
|
3 years ago |
|
weichenglei
|
e936a62fa3
|
Merge pull request '修改需求订单和供应商门户数据的联动逻辑' (#175) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/175
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
娄文智
|
0b02af8360
|
生产排程功能开发
|
3 years ago |
|
zhangxin
|
f49b7661cd
|
修改需求订单和供应商门户数据的联动逻辑
|
3 years ago |
|
weichenglei
|
50f9b18092
|
Merge pull request '添加了新字段' (#174) from feature_NewArticle into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/174
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
allanwei
|
8ad9857e18
|
为Article添加了更多的新字段
|
3 years ago |
|
allanwei
|
07acb6caa5
|
为Article增加了两个字段
|
3 years ago |
|
weichenglei
|
ee70c15406
|
Merge pull request '根据数据表的修改修改供应商门户处接收处理的数据' (#173) from feature_log into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/173
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
ae4e1f98e8
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_log
|
3 years ago |
|
zhangxin
|
fe9980086e
|
根据数据表的修改修改供应商门户处接收处理的数据
|
3 years ago |
|
weichenglei
|
225bc57db0
|
Merge pull request '添加WorkOrder和ArtDemand的数据联动，修改部分日志' (#172) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/172
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
ea0d4cce57
|
添加workder和artdemand的数据联动
|
3 years ago |
|
zhangxin
|
a5b3390e7e
|
修改日志
|
3 years ago |
|
weichenglei
|
3bd3107cdd
|
Merge pull request '添加撤回workOrderStatus的功能' (#171) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/171
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
weichenglei
|
aa82885e94
|
Merge branch 'develop' into feature_om
|
3 years ago |
|
zhangxin
|
482aeabd97
|
添加撤回workOrderStatus的功能
|
3 years ago |
|
zhangxin
|
9801e63db1
|
修改status<40的workOrder才可以删除
|
3 years ago |
|
weichenglei
|
1756585d0c
|
Merge pull request '修复查询分页数据覆盖的bug' (#169) from fix_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/169
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
1abb478058
|
修复查询分页数据覆盖的bug
|
3 years ago |
|
weichenglei
|
faf33cbebb
|
Merge pull request '修复insertone、deleteone、updateone未commit的bug' (#168) from fix_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/168
|
3 years ago |
|
zhangxin
|
3339251409
|
修复insertone、deleteone、updateone未commit的bug
|
3 years ago |
|
zhangxin
|
0d2da343a3
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_om
|
3 years ago |
|
weichenglei
|
d1fef2d03a
|
Merge pull request '修改同步到artDemandLst的orderStatus' (#166) from fix_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/166
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
6de0c6628f
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_om
|
3 years ago |
|
weichenglei
|
d94b6c3bd4
|
Merge branch 'develop' into fix_om
|
3 years ago |
|
zhangxin
|
85d70809ee
|
修改提取变量名
|
3 years ago |
|
zhangxin
|
a4a7353c6d
|
修改常量名
|
3 years ago |
|
zhangxin
|
9b9e32059b
|
修改同步到artDemandLst的orderStatus
|
3 years ago |
|
weichenglei
|
d679ef82c4
|
Merge pull request '1. 修复订单管理查询失败的bug， 2.修复保存文件没有存储文件名的bug' (#165) from fix_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/165
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
e0d67dc62e
|
添加注释
|
3 years ago |
|
zhangxin
|
9ba3490876
|
1. 修复订单管理查询失败的bug， 2.修复保存文件没有存储文件名的bug
|
3 years ago |
|
weichenglei
|
3fb11cfe65
|
Merge pull request '1. 添加供应商门户的需求批次功能开发 2. 需求明细 根据数据库字段调整进行代码调整' (#164) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/164
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
d8c29d7ca6
|
修复 订单解析 数据同步到供应商门户时 存在进度 同步status错误
|
3 years ago |
|
zhangxin
|
6d72bf597b
|
1. 添加供应商门户的需求批次功能开发 2. 需求明细 根据数据库字段调整进行代码调整
|
3 years ago |
|
weichenglei
|
ee45436a68
|
Merge pull request '代码规范调整' (#163) from feature_spec into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/163
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
娄文智
|
de15f31956
|
代码规范调整
|
3 years ago |
|
weichenglei
|
51a55c15aa
|
Merge pull request '开放worklineshiftlst的接口' (#162) from feature_base_worklineshift into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/162
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
weichenglei
|
0a2ad0bcb7
|
Merge branch 'develop' into feature_base_worklineshift
|
3 years ago |
