 娄文智
|
58b7b17011
|
返修修改
|
3 years ago |
 zhangxin
|
4ead0c5328
|
Merge pull request '包装扫描分类' (#451) from fix_logPackorder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/451
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
1d8a92274a
|
包装扫描分类
|
3 years ago |
 徐腾飞
|
37e5256a0e
|
Merge pull request '从mes一次同步10条改为一次同步所有符合条件的' (#450) from fix_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/450
Reviewed-by: 徐腾飞 <tengfei.xue@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
e61f80fc70
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_om
|
3 years ago |
|
zhangxin
|
12bd181a24
|
Merge pull request '返修条码进包装变更' (#449) from feature_barcode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/449
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
62999445ef
|
从mes一次同步10条改为一次同步所有符合条件的
|
3 years ago |
|
娄文智
|
702d523dd6
|
返修条码进包装变更
|
3 years ago |
|
zhangxin
|
b0435c66ff
|
Merge pull request '条码打印更新及其包装单数量错误' (#448) from feature_barcode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/448
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
f3172c8ef7
|
条码打印更新及其包装单数量错误
|
3 years ago |
|
zhangxin
|
9230cfbcea
|
Merge pull request '修改弧焊机返修订单号' (#447) from fix_editOrder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/447
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
0294ba0285
|
修改弧焊机返修订单号
|
3 years ago |
|
zhangxin
|
b4610670e2
|
Merge pull request '添加打印日志' (#446) from fix_printer1 into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/446
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
9d3922a098
|
添加打印日志
|
3 years ago |
 yehongyang
|
c2f9b31984
|
Merge pull request '更新数量' (#445) from fix_qty into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/445
Reviewed-by: yehongyang <hongyang.ye@le-it.com.cn>
|
3 years ago |
|
娄文智
|
731efc2d4b
|
更新数量
|
3 years ago |
|
zhangxin
|
7f469efd7f
|
Merge pull request '返修逻辑添加及其自动打印功能' (#444) from feture_fanxiupack into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/444
Reviewed-by: yehongyang <hongyang.ye@le-it.com.cn>
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
436c09dc03
|
Merge branch 'develop' into feture_fanxiupack
|
3 years ago |
|
娄文智
|
45cf9a016a
|
Merge pull request '1.向mes里写入workOrder写入sort字段,2.修改生成的流水号使用的日期为当前日期 不再使用计划开始日期' (#443) from fix_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/443
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
娄文智
|
6a008202ed
|
返修逻辑添加及其自动打印功能
|
3 years ago |
|
zhangxin
|
63bbb7ef8c
|
向mes里写入workOrder写入sort字段
|
3 years ago |
|
zhangxin
|
331086663f
|
修改读取日志配置的方法
|
3 years ago |
|
zhangxin
|
7a9d869dcd
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_om
|
3 years ago |
|
yehongyang
|
2882871c27
|
Merge pull request '选中创建的包装单' (#442) from feature_pack into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/442
Reviewed-by: yehongyang <hongyang.ye@le-it.com.cn>
|
3 years ago |
|
娄文智
|
2954563476
|
选中创建的包装单
|
3 years ago |
|
zhangxin
|
9e5133dfea
|
修改生成的流水号使用的日期为当前日期 不再使用计划开始日期
|
3 years ago |
|
yehongyang
|
d7ddbbf784
|
Merge pull request '进入发运车的包装不能拆包' (#441) from feature_log into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/441
Reviewed-by: yehongyang <hongyang.ye@le-it.com.cn>
|
3 years ago |
|
娄文智
|
ce49103f8a
|
进入发运车的包装不能拆包
|
3 years ago |
|
yehongyang
|
34b7be497a
|
Merge pull request '打印替换客户零件号' (#440) from feature_log into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/440
Reviewed-by: yehongyang <hongyang.ye@le-it.com.cn>
|
3 years ago |
|
娄文智
|
c87ca48384
|
打印替换客户零件号
|
3 years ago |
|
娄文智
|
7b26fe7381
|
Merge pull request '添加支持导入excel中物料是carset类型的解析功能,修改查询workOrder的排序字段' (#439) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/439
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
91e9d0a33f
|
添加支持导入excel中物料是carset类型的解析功能
|
3 years ago |
|
zhangxin
|
af818b0a05
|
修改查询workOrder的排序字段
|
3 years ago |
|
zhangxin
|
04694eb712
|
定时任务只解析A30的文件需求任务
|
3 years ago |
|
zhangxin
|
90746d11ec
|
修复写入bom出现不是Carset类型 不能写入的bug
|
3 years ago |
|
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 |
