娄文智
|
592f211b70
|
包装生成打印消息,及其新版打印模板上线
|
3 years ago |
yehongyang
|
7ff0c447ce
|
Revert "导入发货订单 -1"
This reverts commit d211a2a19d .
|
3 years ago |
yehongyang
|
d211a2a19d
|
导入发货订单 -1
|
3 years ago |
yehongyang
|
c30bbcdaab
|
Merge pull request '包装和缺陷合并' (#414) from feature_packbin into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/414
Reviewed-by: yehongyang <hongyang.ye@le-it.com.cn>
|
3 years ago |
娄文智
|
285caf09d7
|
包装和缺陷合并
|
3 years ago |
娄文智
|
70495ad2af
|
Merge pull request '派生得物料使用BOM生成批次工单,article添加字段learArtId和PartNumber 写入到mes中的partno改为使用partNumber' (#413) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/413
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
zhangxin
|
ca4501e1dc
|
派生得物料使用BOM生成批次工单
|
3 years ago |
zhangxin
|
b44304445e
|
article添加字段learArtId和PartNumber 写入到mes中的partno改为使用partNumber
|
3 years ago |
娄文智
|
7d0adbb454
|
Merge pull request '新增计划看板展示功能接口' (#412) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/412
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
zhangxin
|
22341bade7
|
添加ignore url
|
3 years ago |
zhangxin
|
e8dc44eafa
|
新增计划看板展示功能接口
|
3 years ago |
徐腾飞
|
e1a35a24ab
|
Merge pull request '添加了自动生成代码' (#411) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/411
Reviewed-by: 徐腾飞 <tengfei.xue@le-it.com.cn>
|
3 years ago |
allanwei
|
c37c41f12e
|
添加了自动生成代码
|
3 years ago |
zhangxin
|
3977ddf54c
|
Merge pull request '添加了自动生成代码' (#410) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/410
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
allanwei
|
5d4cd58ffe
|
添加了自动生成代码
|
3 years ago |
zhangxin
|
0a86f77e2d
|
Merge pull request 'me_bom 修改bug' (#409) from me_bom into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/409
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
d44d19ea41
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into me_bom
# Conflicts:
# models/me/BomHead.model.go
# models/me/BomLst.model.go
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
ec770500c9
|
Bom功 bug修改
|
3 years ago |
weichenglei
|
58025b6985
|
Merge pull request '订单解析支持订单解析' (#408) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/408
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
zhangxin
|
1a8907ecc3
|
订单解析支持订单解析
|
3 years ago |
zhangxin
|
a2bbdb3418
|
修复dao中where = "1+1"的bug
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
b637422088
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into me_bom
|
3 years ago |
zhangxin
|
5559cd4ebd
|
Merge pull request '按照实际时间生产工单' (#407) from fix_pm into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/407
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
娄文智
|
80bae1d3cb
|
按照实际时间生产工单
|
3 years ago |
DESKTOP-4672LME\Xu Tengfei
|
2d9bee05b7
|
bom上传
|
3 years ago |
徐腾飞
|
8d43c88d4d
|
Merge pull request '添加了自动生成代码' (#406) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/406
Reviewed-by: 徐腾飞 <tengfei.xue@le-it.com.cn>
|
3 years ago |
allanwei
|
0af6f6b4d3
|
添加了自动生成代码
|
3 years ago |
zhangxin
|
eb1f62a72f
|
Merge pull request 'pm添加维护工单' (#405) from fix_pmchange into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/405
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
娄文智
|
a9aef7aca0
|
pm添加维护工单
|
3 years ago |
娄文智
|
eff5d887bd
|
Merge pull request '手动创建维护工单' (#404) from fix_pmedit into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/404
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
娄文智
|
cd1148badc
|
手动创建维护工单
|
3 years ago |
zhangxin
|
78d805659e
|
Merge pull request '排程修复调度' (#402) from fix_repireSche into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/402
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
娄文智
|
5f0d4243aa
|
排程调度修复功能
|
3 years ago |
娄文智
|
c4cf0b4dc0
|
Revert "排程调度"
This reverts commit 7e8fd72096 .
|
3 years ago |
娄文智
|
7e8fd72096
|
排程调度
|
3 years ago |
weichenglei
|
16a94b2e3e
|
Merge pull request '查询状态修改' (#401) from fix_schetwo into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/401
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
娄文智
|
908355b47d
|
提交
|
3 years ago |
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 |