pref_mail@163.com
|
b3b08d85f5
|
Merge remote-tracking branch 'upstream/master' into dev
# Conflicts:
# blade-example-api/blade-dubbo-provider-api/pom.xml
# blade-example-api/pom.xml
# blade-example/blade-dubbo-consumer/pom.xml
# blade-example/blade-dubbo-provider/pom.xml
# blade-example/blade-easypoi/pom.xml
# blade-example/blade-mq-kafka/pom.xml
# blade-example/blade-mq-rabbit/pom.xml
# blade-example/blade-sharding-jdbc/pom.xml
# blade-example/blade-sharding-jdbc/src/main/java/org/springblade/sharding/config/ShardingConfiguration.java
# blade-example/blade-sharding-jdbc/src/main/resources/application-prod.yml
# blade-example/blade-sharding-jdbc/src/main/resources/application-test.yml
# blade-example/blade-stream-consumer/pom.xml
# blade-example/blade-websocket/pom.xml
# blade-example/pom.xml
# blade-service-api/logpm-basicdata-api/pom.xml
# blade-service-api/logpm-factory-api/pom.xml
# blade-service/logpm-aftersales/pom.xml
# blade-service/logpm-aftersales/src/main/resources/liteflow/demo.el.xml
# blade-service/logpm-basic/pom.xml
# blade-service/logpm-basic/src/main/java/com/logpm/basic/LiteFlowTest.java
# blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicPdaClient.java
# blade-service/logpm-statisticsdata/pom.xml
# blade-service/logpm-trunkline/pom.xml
# blade-service/pom.xml
# pom.xml
|
1 year ago |
zhenghaoyu
|
b470ce1061
|
1.工厂token验证问题 尝试性提交
|
1 year ago |
‘chaoosc’
|
1f6b108542
|
1.查询推送失败的原因
|
1 year ago |
|
zhenghaoyu
|
2b658d8eb2
|
1.同步老系统盘点任务bug修复
|
1 year ago |
 caoyizhong
|
89097291f7
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
caoyizhong
|
44f3c27907
|
修改包件转库存品
|
1 year ago |
|
zhenghaoyu
|
931f1bb0a6
|
1.拉取订单数据还原
|
1 year ago |
|
‘chaoosc’
|
7f3a4f9f97
|
1.增加配送单取消任务后的报错判断
|
1 year ago |
|
zhenghaoyu
|
3cb6da65c1
|
1.老系统同步盘点任务数据列表排序提交
|
1 year ago |
|
caoyizhong
|
09fa2152ec
|
修改包件转库存品
|
1 year ago |
kilo
|
2e67324176
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
kilo
|
74a4cd1d17
|
PDA零担装车
|
1 year ago |
|
caoyizhong
|
f0e705d7d7
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
caoyizhong
|
88a3a6dbca
|
修改包件转库存品
|
1 year ago |
|
zhenghaoyu
|
19487df1ad
|
1.同步老系统盘点任务代码提交,已完成
2.老系统扫描倒车入库推送订单拉取托盘信息
|
1 year ago |
|
caoyizhong
|
e48c480c69
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
caoyizhong
|
234d0e3dd2
|
修改市配打印不对
|
1 year ago |
|
zhenghaoyu
|
cedba19d8a
|
1.同步老系统盘点任务部分代码提交
|
1 year ago |
|
zhenghaoyu
|
a6fd571ba9
|
1.同步盘点任务数据提交
|
1 year ago |
|
caoyizhong
|
34812f04a3
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
caoyizhong
|
9c8449ee91
|
修改自提零担查询
|
1 year ago |
|
zhenghaoyu
|
89c9d873c7
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
zhenghaoyu
|
caceb13569
|
1.同步数据bug修复
|
1 year ago |
|
‘chaoosc’
|
a0b2a0bbc1
|
1.修改叉车
|
1 year ago |
|
zhenghaoyu
|
7feeb8fe20
|
1.同步数据bug修复
|
1 year ago |
|
‘chaoosc’
|
a927fbfc1d
|
1.取消增加的同步条件
|
1 year ago |
|
‘chaoosc’
|
0965f87706
|
1.增加欧派订单同步运单数据查询失败的问题2
|
1 year ago |
|
‘chaoosc’
|
83d5d6dfad
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
zhenghaoyu
|
af4ee90ad6
|
1.同步数据逻辑更新
|
1 year ago |
|
‘chaoosc’
|
4075ebe2e8
|
1.判断对
皮亚罗的特殊处理
|
1 year ago |
|
‘chaoosc’
|
7dbb0c2535
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
‘chaoosc’
|
955fa1600c
|
1.老系统扫码推送到新系统
|
1 year ago |
|
zhenghaoyu
|
c78d34ea2d
|
1.同步盘点任务中的打托数据
|
1 year ago |
0.0
|
f31a06b137
|
1.盘点任务详情
|
1 year ago |
|
‘chaoosc’
|
18ed884851
|
1.增加欧派订单同步运单数据查询失败的问题
|
1 year ago |
|
zhenghaoyu
|
b4a4b4becf
|
1.同步订单，零担订单数据bug修复
|
1 year ago |
|
zhenghaoyu
|
f2d38d77f9
|
1.查询包件盘点数据加入删除条件
|
1 year ago |
|
kilo
|
2362d03e19
|
市配预约订单、包件查询调整;
商配计划新增零担订单
仓库盘点商场限制取消
|
1 year ago |
|
caoyizhong
|
79066d0cab
|
修改PC备货查询
|
1 year ago |
|
zhenghaoyu
|
4d2a9c93e8
|
1.同步订单数据时判断是在存在于盘点任务中
2.同步包条数据时判断是否在盘点任务中
3.补全同步订单信息的入库时间
|
1 year ago |
|
caoyizhong
|
6a05344184
|
修改备货查询
|
1 year ago |
|
0.0
|
80a9a6a821
|
1.修改编号
|
1 year ago |
|
0.0
|
559988617d
|
1.修改任务类型
|
1 year ago |
|
zhenghaoyu
|
b5c674ecc2
|
1.盘点任务功能更新
|
1 year ago |
|
caoyizhong
|
ed1d084275
|
修改语言返回
|
1 year ago |
|
0.0
|
fe89838ee1
|
1.添加托盘码
|
1 year ago |
|
kilo
|
66ac3d1ad8
|
合同号盘点调整
|
1 year ago |
|
caoyizhong
|
95be671328
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
caoyizhong
|
2a4edd1543
|
修改打托判断
|
1 year ago |
|
zhenghaoyu
|
a6b31188a2
|
1.盘点任务合同号盘点逻辑修改
|
1 year ago |
