 zhangxin
|
6c5801b7d4
|
使用json "github.com/json-iterator/go" 代替json
|
3 years ago |
 weichenglei
|
8c85d5812b
|
Merge pull request '扩展了供应商的字段' (#83) from feature_vendor into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/83
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
c2372127b9
|
扩展了供应商的字段
|
3 years ago |
|
weichenglei
|
bbbb27aa60
|
Merge pull request '添加对获取selectarr的临时处理' (#82) from feature_stdeftab into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/82
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
9bd238df0e
|
添加对获取selectarr的临时处理
|
3 years ago |
|
weichenglei
|
b2d170a1e8
|
Merge pull request '修改获取select方法中bug' (#81) from fix_vendor into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/81
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
cce3ead62c
|
如果筛选条件为status =3 只处理不紧急的情况
|
3 years ago |
|
zhangxin
|
17b6afe4cb
|
去掉测试代码
|
3 years ago |
|
zhangxin
|
08bad6aebd
|
修改获取select方法中bug，1.获取day小于10的解析错误，2.紧急度筛 已完成的计划设置为不紧急
|
3 years ago |
|
weichenglei
|
3fcfe29689
|
Merge pull request '修正了修改和删除缺陷分组时的错误' (#80) from fix_DefectGroup into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/80
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
685b082992
|
修正了修改和删除缺陷分组时的错误
|
3 years ago |
|
weichenglei
|
689952883b
|
Merge pull request '修复紧急度筛选bug' (#79) from fix_vendor into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/79
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
69e981465b
|
修复紧急度筛选bug
|
3 years ago |
|
weichenglei
|
af582f324f
|
Merge pull request '提交视频' (#78) from feature_meta into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/78
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
 娄文智
|
e60fffec77
|
提交类型
|
3 years ago |
|
娄文智
|
ba802462ed
|
提交视频
|
3 years ago |
|
weichenglei
|
c74c27fbdd
|
Merge pull request '插入单条artdemandlst检查对应的article是否存在' (#77) from fix_vendor into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/77
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
e76c7af0ff
|
插入单条artdemandlst检查对应的article是否存在
|
3 years ago |
|
weichenglei
|
7e62572f24
|
Merge pull request '添加不分页的字段拼接和筛选查询' (#76) from feature_vendor into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/76
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
a16dc17140
|
添加不分页的字段拼接和筛选查询
|
3 years ago |
|
weichenglei
|
7143111e0f
|
Merge pull request '实现了查询一条包装单模板同时返回所属包装项的功能' (#75) from feature_SelectPackTemplate into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/75
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
2a43fa6b21
|
实现了查询一条包装单模板同时返回所属包装项的功能
|
3 years ago |
|
weichenglei
|
ec99eda00c
|
Merge pull request 'artdemandlst列表页拼接物料数据和紧急度数据' (#74) from feature_vendor into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/74
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
c34db5498f
|
列表页返回的内容进行拼接
|
3 years ago |
|
zhangxin
|
9cb66e996e
|
添加注释
|
3 years ago |
|
zhangxin
|
ebbb85b614
|
添加响应返回结构体
|
3 years ago |
|
weichenglei
|
f3c04f8df3
|
Merge pull request '添加大于、大于等于、小于、小于等于的比较方法' (#73) from feature_grmi into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/73
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
cfd1142cdb
|
添加大于、大于等于、小于、小于等于的比较方法
|
3 years ago |
|
weichenglei
|
7b53eef486
|
Merge pull request '实现了记录谓词生成错误的功能' (#72) from fix_Predicate into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/72
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
bd25f5988b
|
实现了记录谓词生成错误的功能
|
3 years ago |
|
weichenglei
|
53c79d9673
|
Merge pull request '开放了删除一条包装类型的路由' (#71) from fix_DeletePackType into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/71
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
fce77776b2
|
开放了删除一条包装类型的路由
|
3 years ago |
|
weichenglei
|
0624310ec6
|
Merge pull request '修复了使用in子句查询数据库时列表为空时发生的错误.' (#69) from fix_Include into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/69
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
f8fd93f218
|
修复了使用in子句查询数据库时列表为空时发生的错误.
|
3 years ago |
|
weichenglei
|
60e76e17b9
|
Merge pull request '添加事务' (#67) from featrue_rollback into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/67
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
娄文智
|
53f3d4440c
|
添加事务
|
3 years ago |
|
weichenglei
|
ef6c2c79bb
|
Merge pull request 'ods工序从头部里删除' (#66) from featrue_odesbug into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/66
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
娄文智
|
d7a1d4b273
|
ods工序从头部里删除
|
3 years ago |
|
weichenglei
|
ce50b98936
|
Merge pull request '修正了无法删除菜单的错误' (#65) from fix_DeleteMen into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/65
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
7609207ea4
|
修正了无法删除菜单的错误
|
3 years ago |
|
weichenglei
|
e05516902a
|
Merge pull request '完善了缺陷采集模块接口' (#64) from fix_DEfect into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/64
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
8fa8bbc62a
|
修改物料视图关联时将视图的描述的图片地址保存到了关联上
|
3 years ago |
|
allanwei
|
417357ffb3
|
完善了查询单条缺陷分组和查询单条视图
|
3 years ago |
|
weichenglei
|
f7f23499bd
|
Merge pull request '修正了引用错误' (#63) from fix_ref into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/63
Reviewed-by: louwenzhi <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
allanwei
|
980d2f2d55
|
修正了引用错误
|
3 years ago |
|
weichenglei
|
2f540f4da2
|
Merge pull request '实现了缺陷采集模块后台' (#62) from feature_Defect into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/62
Reviewed-by: louwenzhi <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
allanwei
|
0a2e323222
|
Merge branch 'feature_Defect' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_Defect
|
3 years ago |
|
allanwei
|
58a37a0b01
|
开放了修改物料视图关系的路由
|
3 years ago |
|
allanwei
|
4ef207dd6b
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_Defect
|
3 years ago |
|
allanwei
|
ea5e4a0f0b
|
实现了视图相关的增删改
|
3 years ago |
