娄文智
|
97b2f4356f
|
关包校验
|
3 years ago |
娄文智
|
c7e45110f3
|
Merge pull request '运单导入增加对格式列的限制' (#425) from feature_shipOrder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/425
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
yehongyang
|
8c85c75c7f
|
运单导入增加对格式列的限制
|
3 years ago |
yehongyang
|
a2deccc11d
|
Merge pull request '包装模板修改' (#424) from feature_carShip into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/424
Reviewed-by: yehongyang <hongyang.ye@le-it.com.cn>
|
3 years ago |
娄文智
|
4bd254536a
|
包装模板修改
|
3 years ago |
zhangxin
|
a58cd1d717
|
Merge pull request '发运扫描' (#423) from feature_carShip into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/423
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
娄文智
|
6ecf420604
|
发运扫描
|
3 years ago |
zhangxin
|
c1a5857d8a
|
Merge pull request '运费模板bug更新' (#422) from feature_shipOrder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/422
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
yehongyang
|
ce7c6d95af
|
运费模板bug更新
|
3 years ago |
娄文智
|
cef04fd931
|
Merge pull request '发运单导入完成' (#421) from feature_shipOrder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/421
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
yehongyang
|
818205614e
|
发运单导入完成
|
3 years ago |
娄文智
|
08b9f69e51
|
Merge pull request 'feature_shipOrder -3' (#420) from feature_shipOrder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/420
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
yehongyang
|
dd54f8f319
|
发运模板冲突 -3
|
3 years ago |
yehongyang
|
644c85fed3
|
Merge remote-tracking branch 'origin/feature_shipOrder' into feature_shipOrder
# Conflicts:
# services/jit/implments/ShipOrder.service.impl.go
|
3 years ago |
yehongyang
|
4a96b8c0d1
|
发货模板 -2 解决冲突
|
3 years ago |
yehongyang
|
c41da0e1c6
|
发货模板-2
|
3 years ago |
yehongyang
|
257e69ce49
|
Merge pull request '打印模板提交' (#418) from feature_packbin into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/418
Reviewed-by: yehongyang <hongyang.ye@le-it.com.cn>
|
3 years ago |
娄文智
|
641801d82b
|
打印模板提交
|
3 years ago |
娄文智
|
b3bce20243
|
Merge pull request 'feature_shipOrder' (#417) from feature_shipOrder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/417
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
yehongyang
|
1d96ef53a3
|
运货到导入
|
3 years ago |
yehongyang
|
98a1b28a9a
|
Merge remote-tracking branch 'origin/develop' into develop
|
3 years ago |
yehongyang
|
ccdc70f3d2
|
Merge pull request '包装生成打印消息,及其新版打印模板上线' (#416) from feature_packbin into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/416
Reviewed-by: yehongyang <hongyang.ye@le-it.com.cn>
|
3 years ago |
娄文智
|
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 |