 zhangxin
|
39feb28b8f
|
添加参数
|
3 years ago |
|
zhangxin
|
3c5a76310f
|
添加请求头
|
3 years ago |
|
zhangxin
|
6e6a669a1c
|
添加请求头
|
3 years ago |
|
zhangxin
|
17292a0231
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_portal
|
3 years ago |
|
zhangxin
|
6274d358e2
|
Merge pull request '合并' (#259) from feature_synv into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/259
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
 娄文智
|
1ac7011e32
|
提交
|
3 years ago |
|
娄文智
|
5101e9003e
|
Merge branch 'feature_sync' of 101.201.121.115:leo/LAPP_GAAS_GFrame_BACKEND into feature_sync
|
3 years ago |
|
zhangxin
|
ce853d5d38
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_portal
|
3 years ago |
|
zhangxin
|
1c547dcaa0
|
添加解析G-FRAME的订单的功能
|
3 years ago |
|
zhangxin
|
a4cb144173
|
添加解析G-FRAME订单的功能
|
3 years ago |
|
zhangxin
|
82608a78f7
|
添加解析来源常量定义
|
3 years ago |
|
zhangxin
|
95e1fa7843
|
添加字段TaskNr
|
3 years ago |
|
zhangxin
|
3abd766bf4
|
优化查询条件
|
3 years ago |
|
娄文智
|
fb7412a8fe
|
Merge pull request '修改解析时时load数据的排序方式' (#258) from fix_scheduler into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/258
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
80b97253ba
|
修改解析时时load数据的排序方式
|
3 years ago |
|
zhangxin
|
7f1a82d774
|
Merge pull request '数据同步' (#257) from feature_sync into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/257
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
2ff1608ab2
|
Merge branch 'develop' into feature_sync
|
3 years ago |
|
娄文智
|
cd9c5a7b86
|
数据同步
|
3 years ago |
 weichenglei
|
d936dc9c89
|
Merge pull request '修改解析portal数据的排序字段，修改response中data的数据类型' (#255) from fix_portal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/255
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
b63b13aa3c
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_portal
|
3 years ago |
|
weichenglei
|
3c56df9068
|
Merge pull request '添加了新的自动生成代码' (#256) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/256
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
c4fc764f6a
|
添加了新的自动生成代码
|
3 years ago |
|
zhangxin
|
490dac11d0
|
添加对最后更新新时间的处理及response的data改为string类型
|
3 years ago |
|
zhangxin
|
61794942f8
|
修改解析portal数据的排序字段排序字段
|
3 years ago |
|
zhangxin
|
6d8669e0a9
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_aps
|
3 years ago |
|
zhangxin
|
d75a05bc9b
|
Merge pull request '修改获取产线的参数' (#254) from fix_scheduler into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/254
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
f567ddecaf
|
修改获取产线的参数
|
3 years ago |
|
zhangxin
|
8231b8d187
|
修改获取产线的参数
|
3 years ago |
|
zhangxin
|
d39f7bb1a1
|
Merge pull request '基于restful,权限配置' (#253) from feature_casbin into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/253
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
c1d233545d
|
基于restful,权限配置
|
3 years ago |
|
娄文智
|
f315f15b7b
|
Merge pull request '添加新增和更新产线数据时对派工参数的校验' (#252) from fix_base into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/252
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
8680237648
|
设置新建产线 weekModelNr不是必填的
|
3 years ago |
|
zhangxin
|
dd236f841b
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_base
|
3 years ago |
|
zhangxin
|
548149ffe2
|
添加新增和更新产线数据时对派工参数的校验
|
3 years ago |
|
娄文智
|
982033a81a
|
Merge pull request '添加创建订单的计划日期校验' (#250) from fix_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/250
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
8d186166d2
|
添加创建订单的计划日期校验
|
3 years ago |
|
zhangxin
|
f81322aa6e
|
Merge pull request '修改art model字段' (#249) from fix_artmodel into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/249
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
66da2e70cf
|
修改art model字段
|
3 years ago |
|
zhangxin
|
62a68391a3
|
Merge pull request '产线修改' (#247) from fix_scheduler into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/247
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
236c2d0433
|
产线修改
|
3 years ago |
|
zhangxin
|
d5092a3243
|
Merge pull request '调度排程调试' (#246) from fix_scheduler into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/246
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
600ea6104e
|
调度排程调试
|
3 years ago |
|
娄文智
|
d87abf85ad
|
Merge pull request '修改序列工单的id生成规则' (#245) from fix_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/245
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
60013bceb5
|
修改序列工单的id生成规则
|
3 years ago |
|
weichenglei
|
2e9d2af828
|
Merge pull request '添加创建订单的计划时间校验' (#244) from fix_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/244
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
aeb55e3fc1
|
添加创建订单的时间校验
|
3 years ago |
|
zhangxin
|
94e5697c22
|
添加创建订单的计划时间校验
|
3 years ago |
|
weichenglei
|
32e3ee69ab
|
Merge pull request '添加人员班组校验和修改定时任务时间间隔' (#243) from fix_base into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/243
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
31c3122126
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_base
|
3 years ago |
|
zhangxin
|
32f821a3c6
|
添加人员班组校验和修改定时任务时间间隔
|
3 years ago |
