 zhangxin
|
9f4960ff57
|
Merge pull request '条码替代零件号' (#438) from fix_print into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/438
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
 娄文智
|
a47f2b690e
|
条码替代零件号
|
3 years ago |
 徐腾飞
|
6e3db2e515
|
Merge pull request '添加所有物料车型的接口' (#437) from feature_base into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/437
Reviewed-by: 徐腾飞 <tengfei.xue@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
b56b008618
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om
|
3 years ago |
|
zhangxin
|
381490bbae
|
添加所有物料车型的接口
|
3 years ago |
|
娄文智
|
13f1711216
|
Merge pull request '添加字段version' (#436) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/436
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
feca7118b6
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om
|
3 years ago |
|
zhangxin
|
5a8feab648
|
添加字段version
|
3 years ago |
 yehongyang
|
c846a0496f
|
Merge pull request '打印模板修改' (#435) from fix_print into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/435
Reviewed-by: yehongyang <hongyang.ye@le-it.com.cn>
|
3 years ago |
|
娄文智
|
adf7ae9ece
|
打印模板修改
|
3 years ago |
|
yehongyang
|
0819eb5d3b
|
Merge pull request '包装单扫描进发运车逻辑修改' (#434) from feature_carshippackorder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/434
Reviewed-by: yehongyang <hongyang.ye@le-it.com.cn>
|
3 years ago |
|
娄文智
|
10b793f369
|
包装单扫描进发运车逻辑修改
|
3 years ago |
|
娄文智
|
757979e081
|
Merge pull request 'article新增字段status 创建订单时校验是否启用' (#433) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/433
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
897f54185a
|
创建订单时校验物料是否启用
|
3 years ago |
|
zhangxin
|
d8a335e8ac
|
生成的工单流水号使用article的partId
|
3 years ago |
|
zhangxin
|
afe1e2a104
|
添加新字段status
|
3 years ago |
|
娄文智
|
ee23481800
|
Merge pull request '修复派生总成下单没有写入生产开关和JPH数据的bug' (#432) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/432
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
fcb7a78278
|
修复派生总成下单没有写入生产开关和JPH数据的bug
|
3 years ago |
|
zhangxin
|
1c63adca72
|
Merge pull request '侧边栏搜索' (#431) from fix_carshiporder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/431
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
095aced365
|
debug关闭
|
3 years ago |
|
娄文智
|
d83b6a1e43
|
侧边栏搜索
|
3 years ago |
|
yehongyang
|
f0d8763083
|
Merge pull request '发运扫描修改' (#430) from fix_carship into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/430
|
3 years ago |
|
娄文智
|
32939e1928
|
发运扫描修改
|
3 years ago |
|
娄文智
|
e068279708
|
Merge pull request '增加序号' (#429) from feature_shipOrder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/429
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
yehongyang
|
b10c52ccb9
|
增加序号
|
3 years ago |
|
yehongyang
|
bdadcbc767
|
Merge pull request '包装返回信息' (#428) from fix_car into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/428
Reviewed-by: yehongyang <hongyang.ye@le-it.com.cn>
|
3 years ago |
|
娄文智
|
a24b389f0f
|
包装返回信息
|
3 years ago |
|
娄文智
|
26f273b23c
|
Merge pull request '订单描述取订单号' (#427) from feature_shipOrder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/427
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
yehongyang
|
140596b4e6
|
订单描述取订单号
|
3 years ago |
|
yehongyang
|
340d662f38
|
Merge pull request '关包校验' (#426) from fix_packorders into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/426
Reviewed-by: yehongyang <hongyang.ye@le-it.com.cn>
|
3 years ago |
|
娄文智
|
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 |
