 zhangxin
|
6fcd7bd310
|
Merge pull request '排程bug修复' (#400) from fix_scheduler into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/400
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
 娄文智
|
2ba44c4a74
|
排程bug修复
|
3 years ago |
|
娄文智
|
fb15c17750
|
Merge pull request '资产搜索列表添加用户关联过滤' (#399) from fix_pm into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/399
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
b2b376a8c2
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_pm
|
3 years ago |
 weichenglei
|
45045c227b
|
Merge pull request 'pm 生成工单逻辑修改' (#398) from feature_pm into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/398
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
娄文智
|
986ce11881
|
pm 生成工单逻辑修改
|
3 years ago |
|
zhangxin
|
44bc1560ff
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_pm
|
3 years ago |
|
zhangxin
|
eb11d56591
|
Merge pull request '添加了自动生成代码' (#396) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/396
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
c2b845d207
|
添加了自动生成代码
|
3 years ago |
|
allanwei
|
a142fa247b
|
添加了自动生成代码
|
3 years ago |
|
zhangxin
|
ae79406989
|
资产搜索列表添加用户关联过滤
|
3 years ago |
|
weichenglei
|
cd11e30a13
|
Merge pull request '手动生成服务' (#395) from fix_pms into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/395
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
娄文智
|
2d9ba57dfd
|
手动生成服务
|
3 years ago |
|
weichenglei
|
d9d2bf58ff
|
Merge pull request '修复通过角色过滤产线进行工单查询时出现的bug' (#393) from fix_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/393
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
1d828a6ad2
|
修复通过角色过滤产线进行工单查询时出现的bug
|
3 years ago |
|
娄文智
|
3113c64e4e
|
Merge pull request '添加查询订单根绝角色关联产线进行过滤' (#392) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/392
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
3e12dda16c
|
添加查询订单根绝角色关联产线进行过滤
|
3 years ago |
|
zhangxin
|
b7372fd54d
|
Merge pull request '返修打印功能接口' (#391) from feature_Rprint into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/391
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
f090d897bb
|
返修打印功能接口
|
3 years ago |
|
weichenglei
|
35b1fd8531
|
Merge pull request '1.添加产线和角色过滤功能 2.修改excel解析生成workOrder的解析逻辑' (#389) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/389
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
32b3cc2e21
|
修改excel解析生成workOrder的解析逻辑
|
3 years ago |
|
zhangxin
|
38bc149814
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om
|
3 years ago |
|
zhangxin
|
2b45ade676
|
Merge pull request '打印功能开发' (#388) from feature_printer into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/388
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
f3ff5b1bc6
|
打印功能开发
|
3 years ago |
|
zhangxin
|
05305a4093
|
Merge pull request '修正了分页时分页参数和字段名冲突时发生的错误' (#387) from fix_Paging into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/387
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
d84eed57fa
|
修正了分页时分页参数和字段名冲突时发生的错误
|
3 years ago |
|
zhangxin
|
28cd08ac33
|
添加产线和角色过滤功能
|
3 years ago |
|
zhangxin
|
687b47128f
|
Merge pull request '添加了新的自动生成代码' (#386) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/386
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
4379662c85
|
添加了新的自动生成代码
|
3 years ago |
|
zhangxin
|
e105da4427
|
Merge pull request '打印功能提交' (#385) from fix_SAVEPrinter into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/385
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
6b9887d45a
|
打印功能提交
|
3 years ago |
|
weichenglei
|
27747e155a
|
Merge pull request '新增取消派工未生产的工单的功能' (#384) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/384
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
8abd03fd3f
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om
|
3 years ago |
|
zhangxin
|
fb48541d71
|
Merge pull request '添加了新的自动生成代码' (#383) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/383
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
25896c5f90
|
添加通过workOrderId进行搜索serialOrder时传入status
|
3 years ago |
|
zhangxin
|
97f26aa0e0
|
添加mes工单的取消状态
|
3 years ago |
|
zhangxin
|
c8d52dd975
|
添加取消派工未生产工单的功能
|
3 years ago |
|
zhangxin
|
5d4db27029
|
添加注释
|
3 years ago |
|
zhangxin
|
2742214e39
|
所有锁定的workOrder现改为24、26、40状态的workOrder
|
3 years ago |
|
zhangxin
|
c45af99ce2
|
通过workOrderId进行搜索时，传入状态
|
3 years ago |
|
zhangxin
|
a66dd90a0a
|
添加更新增加乐观锁
|
3 years ago |
|
allanwei
|
f29c4e9ae4
|
添加了新的自动生成代码
|
3 years ago |
|
weichenglei
|
41b06b1b71
|
Merge pull request '去掉创建内部订单得计划开始时间得校验' (#379) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/379
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
e9e5fc412d
|
去掉创建内部订单得计划开始时间得校验
|
3 years ago |
|
zhangxin
|
34ae45640e
|
Merge pull request '更新时间' (#378) from fix_SaveActtime into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/378
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
03cd7bafc5
|
更新时间
|
3 years ago |
|
娄文智
|
52915c08e2
|
Merge pull request '添加回写序列工单的完成时间' (#377) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/377
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
1cdb3522f6
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om
|
3 years ago |
|
zhangxin
|
dcc8eec926
|
添加回写序列工单的完成时间
|
3 years ago |
|
zhangxin
|
61a71a5a09
|
Merge pull request '调角器功能开发' (#375) from feature_rec into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/375
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
