anthonywj
|
1beea3a254
|
合并dev修改
|
2 years ago |
|
anthonywj
|
8d377e8839
|
Merge branch 'dev' into dev_ywj
# Conflicts:
# src/main/java/com/glxp/api/constant/Constant.java
# src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
# src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
# src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java
# src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java
# src/main/java/com/glxp/api/service/sync/HeartService.java
# src/main/java/com/glxp/api/task/SyncHeartTask.java
# src/main/java/com/glxp/api/task/SyncThirdSysTask.java
# src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java
# src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
|
2 years ago |
|
anthonywj
|
375ff7aa5d
|
新增第三方单据上传过滤
|
2 years ago |
|
anthonywj
|
0acfe9785f
|
单据上传至第三方相关调整，bug修改调整
|
2 years ago |
|
anthonywj
|
dae7656fff
|
单据上传至第三方相关调整，bug修改调整
|
2 years ago |
|
anthonywj
|
ce801cd27c
|
单据带校验比对逻辑修改
|
2 years ago |
|
anthonywj
|
fce5d7b7c6
|
申购单据，采购订单等相关修改
|
2 years ago |
|
anthonywj
|
86f084836e
|
选入第三方业务单据修改
|
2 years ago |
|
anthonywj
|
5c0a78e70c
|
基础信息相关修改
|
2 years ago |
郑明梁
|
17a0e0b99c
|
Merge branch 'zmlDev' into dev
|
2 years ago |
|
郑明梁
|
c5b7ba7db5
|
客户管理功能代码提交
|
2 years ago |
|
anthonywj
|
461dedf088
|
第三方单据上传相关bug修改
|
2 years ago |
|
郑明梁
|
a14c66d2c8
|
统计汇总代码提交
|
2 years ago |
|
郑明梁
|
bfbb85eb57
|
统计汇总代码提交
|
2 years ago |
|
anthonywj
|
eb3f48ce04
|
代码合并
|
2 years ago |
|
anthonywj
|
ab641cc9a3
|
新增异常打印
|
2 years ago |
|
anthonywj
|
70c0784584
|
申购，相关查询修改
|
2 years ago |
|
郑明梁
|
47fabd4fca
|
bug修复
|
2 years ago |
|
郑明梁
|
de32494a78
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
e713e03a31
|
日和月统计代码提交
|
2 years ago |
|
anthonywj
|
3e53fea186
|
第三方接口下载bug修改
|
2 years ago |
|
anthonywj
|
f7d09c1ec4
|
第三方接口相关修改
|
2 years ago |
|
anthonywj
|
3cae7526bc
|
摆货相关修改，添加货位查询，预验收，寄售等相关库存摆货
|
2 years ago |
wj
|
0499617822
|
系统设置同步
|
2 years ago |
|
anthonywj
|
6ba113593b
|
数据同步bug修改
|
2 years ago |
|
wj
|
92a6a6d253
|
增加异常捕获
|
2 years ago |
|
wj
|
b595764ad4
|
增加try捕获异常
|
2 years ago |
|
wj
|
ce8646320d
|
填补表名
|
2 years ago |
|
wj
|
dc8c63a14b
|
注释多余代码
|
2 years ago |
|
wj
|
943c02af52
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
1517d71b78
|
用户数据同步
|
2 years ago |
|
anthonywj
|
9f65dda33c
|
物资分类带代码迁移
|
2 years ago |
|
wj
|
27e1d95b47
|
由内向外同步,文档增强
|
2 years ago |
|
wj
|
467fa984a0
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
729badbb04
|
由内向外同步
|
2 years ago |
x_z
|
c906c6c616
|
1.调整第三方接口定时任务代码，修复多线程环境下可能出现的数据同步问题和标识未复位问题
|
2 years ago |
|
wj
|
6c13eb05d4
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
cdfda6af2a
|
由内向外同步
|
2 years ago |
wangwei
|
1524185bc6
|
同步 内部码
|
2 years ago |
|
x_z
|
02f1ce16c6
|
1.提交代码
|
2 years ago |
|
x_z
|
a0d6f3cc06
|
1.修复临时文件存储失败问题
2.修改下载第三方系统基础数据数据校验逻辑
|
2 years ago |
|
anthonywj
|
5bc3ce3115
|
业务单选入第三方单据bug
|
2 years ago |
|
x_z
|
9cc66f85da
|
1.添加第三方产品数据导入接口和逻辑
2.完善下载第三方系统数据逻辑
|
2 years ago |
|
wj
|
bc5891aa28
|
bug修复
|
2 years ago |
|
wj
|
a1088a5170
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
e871f8a9a2
|
设置统一入口
|
2 years ago |
|
x_z
|
faf499a4c6
|
1.合并第三方接口请求
|
2 years ago |
|
wj
|
f544f22cc9
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
dea175b4d7
|
下载同步数据--其他数据
|
2 years ago |
|
郑明梁
|
57898a6731
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java
# src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java
# src/main/java/com/glxp/api/task/AsyncUdiTask.java
# src/main/resources/schemas/schema_v2.1.sql
|
2 years ago |
|
郑明梁
|
35704f2221
|
单据类型设置代码提交(同步)
|
2 years ago |
|
anthonywj
|
e3c6399aa5
|
单据流转相关修改
|
2 years ago |
|
wj
|
61bbeeda53
|
拉取基础数据 插入数据库
|
2 years ago |
|
x_z
|
c68cb845a0
|
1.添加第三方基础数据同步和系统设置同步代码
|
2 years ago |
|
anthonywj
|
5c09ceeb6e
|
同步设置页面重整，，基础数据上传，单据类型上传
|
2 years ago |
chengqf
|
233ca8601c
|
文件不存在不加入上传列表
|
2 years ago |
|
anthonywj
|
78efd5b5eb
|
页面展示，同步相关修改
|
2 years ago |
admin
|
7b195af732
|
cron
|
2 years ago |
|
admin
|
684a431bc5
|
UDI拉取任务
|
2 years ago |
|
admin
|
b7d850c0a8
|
拉取任务拆分
|
2 years ago |
|
admin
|
5dd9aa3326
|
udiTask
|
2 years ago |
|
admin
|
b0fec590fc
|
udiTask
|
2 years ago |
|
anthonywj
|
adc2bae64b
|
新增业务单据同步
|
2 years ago |
|
x_z
|
cec3ccb030
|
1.添加删除日志定时任务
|
2 years ago |
|
admin
|
5f76842d2f
|
完善修改
|
2 years ago |
|
anthonywj
|
39baff10bf
|
UDI管理系统定时上传，定时下载单据相关
|
2 years ago |
|
admin
|
8d5501c7c1
|
新建UDI同步任务
|
2 years ago |
|
x_z
|
9868ebd8d0
|
1.添加生成单日出入库汇总数据逻辑
|
2 years ago |
|
x_z
|
340073ea81
|
1.添加物资出入库汇总数据生成代码
|
2 years ago |
|
x_z
|
501454a868
|
1.添加资质预警相关代码
|
2 years ago |
|
郑明梁
|
3f9968e9a3
|
产品添加预警设置
|
2 years ago |
|
x_z
|
ccb3445c75
|
1.调整线程池大小，库存预警任务使用自定义线程池管理
|
2 years ago |
|
x_z
|
f0f4b215c0
|
1.完善库存预警消息提醒，添加测试环境配置文件
|
2 years ago |
|
x_z
|
d4bb8ca1af
|
1.修复盘点审核功能接口bug
|
2 years ago |
|
x_z
|
dcbc6712eb
|
1.添加库存预警相关的实体类和接口
|
2 years ago |
|
anthonywj
|
7e9452d7de
|
第三方单据选入相关修改
|
2 years ago |
|
anthonywj
|
ec2cbf7c68
|
线程池配置
|
2 years ago |
|
anthonywj
|
4465cc57e7
|
线程池配置
|
2 years ago |
|
anthonywj
|
01d818b715
|
新增单据->库存流程走通
|
2 years ago |
