Commit Graph

985 Commits (fce6af7827ab423021a9315434380ee84590e66f)

Author SHA1 Message Date
anthonywj a4838a4459 解决选入用户,移除用户系统繁忙问题 2 years ago
wangwei 5b970dc4c7 修改id问题 2 years ago
anthonywj 89aaac673f 预验收按货位退货 2 years ago
anthonywj 8ca7d523df 预验收按货位退货 2 years ago
wangwei d5a8a5e1fb Merge remote-tracking branch 'origin/wtest' 2 years ago
wangwei dbbcd67347 修改id问题 2 years ago
郑明梁 c573d485b6 修改测试 2 years ago
郑明梁 7596c5e446 Merge remote-tracking branch 'origin/test' into test 2 years ago
郑明梁 bd77dc9bb5 修改测试 2 years ago
anthonywj 095aecff9e 用户选入单据类型系统繁忙 2 years ago
anthonywj d24990f5c7 Merge branch 'master' into test 2 years ago
anthonywj 14e43730de ID相关修改 2 years ago
anthonywj 3360b7e2bd bug修改代码备份 2 years ago
wj ab7587d383 Merge branch 'master' into test 2 years ago
wj 62a210fa0a 测试环境 2 years ago
wj cce0712a24 Merge branch 'master' into test 2 years ago
wj 48806f3208 Merge remote-tracking branch 'origin/master' 2 years ago
wj 97256b24f4 测试环境 2 years ago
x_z 90340e2607 1.调整摆放功能代码,添加上架记录 2 years ago
wj 33d0dabc6f 测试环境 2 years ago
wj 4b0c1170f8 测试环境 2 years ago
wj c0aa3f4107 下载记录文件 2 years ago
anthonywj 37af4d2462 合并同步 分支 2 years ago
anthonywj e62c88dfbe 合并git 分支 2 years ago
wj 1c6ebe2899 调整 2 years ago
anthonywj 73d6187176 合并master分支 2 years ago
anthonywj aa9d903fd7 bug修改 2 years ago
郑明梁 2e36abdc60 修改单据bug 2 years ago
wangwei 23d1193b56 修改业务管理 模块中无法根据紧急成都查询 2 years ago
wangwei d6336d806e 修改 仓库编辑时候判断 同部门下是否有同名的仓库 2 years ago
anthonywj 164c76858c 文件上传修改,路径修改 2 years ago
wj 4f7b490d88 上传及下载写入文件 2 years ago
wj c85d0f445d 上传及下载写入文件 2 years ago
anthonywj 655ecb508c bug修复 2 years ago
anthonywj 4318495bac 同步数据bug相关修复 2 years ago
wj 19d156e2c4 Merge remote-tracking branch 'origin/generId' into generId
# Conflicts:
#	src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java
#	src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java
#	src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml
2 years ago
wj 0499617822 系统设置同步 2 years ago
anthonywj 4ea1efaa92 同步数据bug相关修复 2 years ago
wangwei cfe0153f1b 修改 用户管理,编辑时候,会把之前选入的部门替换掉 2 years ago
郑明梁 9f3bed8cf0 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 e12f19f502 往来单位编辑提示重复 2 years ago
anthonywj 2f826221e4 雪花算法字段超出问题 2 years ago
anthonywj 6ba113593b 数据同步bug修改 2 years ago
wangwei db2b9bcafe 修复单据查询bug 2 years ago
x_z 00bd1ac2a4 1.调整摆放列表查询逻辑 2 years ago
郑明梁 48188c661c 耗材领用代码修改 2 years ago
wj 56fcc52b2b 修改下载记录状态
(cherry picked from commit 07b6f3e9b0)
2 years ago
wj 07b6f3e9b0 修改下载记录状态 2 years ago
anthonywj 54dc7cd0eb 同步数据修改为雪花ID 2 years ago
anthonywj 9e25fc5036 bug修改代码备份 2 years ago
wj 92a6a6d253 增加异常捕获 2 years ago
x_z fc2ab43807 1.调整摆放功能代码 2 years ago
anthonywj 1f6a08e74c 新增三期拣货,无三期拣货,为配货等页面 2 years ago
x_z 18719072d6 1.调整盘点代码 2 years ago
wj 76630f303d idDatas赋值调整 2 years ago
wj 0dc4a2a419 关键字属性增加`` 2 years ago
郑明梁 d6e68e11d2 出入库明细代码修改 2 years ago
郑明梁 ca4e1757a9 库存产品拉取报错没有指定表字段 2 years ago
wj 06f8a707ad Merge remote-tracking branch 'origin/master' 2 years ago
wj b595764ad4 增加try捕获异常 2 years ago
郑明梁 b648cd1999 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 e0da5a4c12 院内分类代码提交(需同步) 2 years ago
wj 57dce301ec 剔除属性 2 years ago
wj 9b5d865bd8 Merge remote-tracking branch 'origin/master' 2 years ago
wj ce8646320d 填补表名 2 years ago
anthonywj a7b1403123 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 32a30b5fec bug修改 2 years ago
wj b6032d25b8 Merge remote-tracking branch 'origin/master' 2 years ago
wj dc8c63a14b 注释多余代码 2 years ago
郑明梁 d4fa6da5af 部门bug代码提交 2 years ago
郑明梁 064e779747 业务代码修改提交 2 years ago
郑明梁 cc7cde1e29 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 9676304a40 计划单据提交 2 years ago
x_z d0ce12b6d9 1.调整获取货位编码方法位置 2 years ago
x_z 0eb427119c 1.调整添加货位逻辑 2 years ago
wangwei df4d51cbba 修改 部门 仓库问题 2 years ago
anthonywj 5d1875ebb9 库存详情新增入库数量与出库数量,方便后续分组统计查询 2 years ago
anthonywj 4278cf047e bug修改 2 years ago
wangwei 0e502f8666 修改部门 仓库bug 2 years ago
郑明梁 9cce01e788 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 0c7a738fb7 申购单据提交 2 years ago
wj 1174147d7f Merge remote-tracking branch 'origin/master' 2 years ago
wj 3f4c4511d6 第三方数据同步 2 years ago
郑明梁 140403de6d 耗材领用单据提交 2 years ago
wj e7f5cfb87f 用户数据同步 2 years ago
wj 943c02af52 Merge remote-tracking branch 'origin/master' 2 years ago
wj 1517d71b78 用户数据同步 2 years ago
anthonywj 9f65dda33c 物资分类带代码迁移 2 years ago
wangwei 1a5279e608 修改 bug 2 years ago
wangwei 4ca132aabe 同步 部门代码 2 years ago
x_z d86907486c 1.同步自助平台资质预警代码 2 years ago
wj a57b6a23a4 存储单据类型 2 years ago
wj d9026565f5 Merge remote-tracking branch 'origin/master' 2 years ago
wj 27e1d95b47 由内向外同步,文档增强 2 years ago
anthonywj 1e82f37f7f 物资字典参数设置,单据类型修改 2 years ago
anthonywj f3f717cf17 新增委托验收 2 years ago
wangwei a1a8172dd1 修改 内部码bug 2 years ago
wj 79f23bd511 由内向外同步 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 2bfc6a0b75 Merge remote-tracking branch 'origin/master' 2 years ago
wj a2cdc0bbfe 解决循环问题 2 years ago
anthonywj 81cae64e57 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 2ca37b890a 预验收,寄售撤回bug 2 years ago
wj 6c13eb05d4 Merge remote-tracking branch 'origin/master' 2 years ago
wj cdfda6af2a 由内向外同步 2 years ago
x_z f6ca9ee95b 1.初步完成第三方系统接口定时任务 2 years ago
wangwei 1524185bc6 同步 内部码 2 years ago
x_z bbb845f1bc Merge remote-tracking branch 'origin/master' 2 years ago
x_z 02f1ce16c6 1.提交代码 2 years ago
郑明梁 b05f001af6 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 b0543b862a 资质代码同步 2 years ago
anthonywj 422311d7df UDI码过期禁止录入 2 years ago
anthonywj e4e94c3118 物资字典代码迁移,新增国家库同步到外网查询 2 years ago
anthonywj bd7fd9691a 物资字典代码迁移,新增国家库同步到外网查询 2 years ago
x_z a0d6f3cc06 1.修复临时文件存储失败问题
2.修改下载第三方系统基础数据数据校验逻辑
2 years ago
anthonywj 5bc3ce3115 业务单选入第三方单据bug 2 years ago
anthonywj 8a9607f690 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj d730b5c084 数据同步修改 2 years ago
wangwei a2944efa3e 修改bug 2 years ago
x_z 2302660639 1.医院系统配置表添加第三方系统标识字段 2 years ago
x_z 2d98bd3651 1.添加下载第三方单据类型逻辑 2 years ago
anthonywj ec9c295e03 单据库存相关代码迁移 2 years ago
x_z 9cc66f85da 1.添加第三方产品数据导入接口和逻辑
2.完善下载第三方系统数据逻辑
2 years ago
anthonywj ea93694923 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj a8504f276e 代码迁移备份,预验收退回修改 2 years ago
wj bc5891aa28 bug修复 2 years ago
wj 9fc23761ac 去除多余代码 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 fc898119ed Merge remote-tracking branch 'origin/master' 2 years ago
wj 98730beeaf 增加返回状态码判断 2 years ago
wangwei 6ef9f8dc9c 同步 部门仓库代码 2 years ago
wj f544f22cc9 Merge remote-tracking branch 'origin/master' 2 years ago
wj dea175b4d7 下载同步数据--其他数据 2 years ago
wangwei c965db25d9 同步 部门信息 仓库信息 用户关系 角色管理 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
x_z e3c25b05b5 1.添加接口请求时间设置 2 years ago
anthonywj abe47786b5 领用单据审核bug修改,自动生成业务单,扫码单等修改迁移 2 years ago
anthonywj d395703a81 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java
2 years ago
anthonywj 76994ae9f5 领用单据审核bug修改,自动生成业务单,扫码单等修改迁移 2 years ago
wangwei d175bf1e66 恢复代码 2 years ago
anthonywj e3c6399aa5 单据流转相关修改 2 years ago
x_z 15848414a9 1.添加上传模板文件逻辑 2 years ago
x_z abbc13b2f5 1.合并自助平台库存预警设置的代码 2 years ago
wj 48981033e8 Merge remote-tracking branch 'origin/master' 2 years ago
wj d3e6df8623 bug修复 2 years ago
chengqf 1fec249ff6 文件上传,下载后台方法 2 years ago
chengqf 5d0a562056 增加后台上传,下载文件方法 2 years ago
chengqf 6f569f0988 Merge remote-tracking branch 'origin/master' 2 years ago
chengqf 558eef6aff 增加后台调用上传,下载文件方法 2 years ago
wj ff27b8e807 Merge remote-tracking branch 'origin/master' 2 years ago
wj 929ad3718a entity增加表名 字段名 2 years ago
anthonywj 68a6479694 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 31a875afae 上传文件名称 2 years ago
wj a9d19e0f47 entity增加表名 2 years ago
chengqf 987a69591c 文件下载 2 years ago
chengqf 971b3ecf62 Merge remote-tracking branch 'origin/master' 2 years ago
chengqf bf675bc6df 文件下载 2 years ago
wj 4d26d59cd2 Merge remote-tracking branch 'origin/master' 2 years ago
wj 61bbeeda53 拉取基础数据 插入数据库 2 years ago
chengqf e2fda72926 文件下载 2 years ago
chengqf 3adaf6fea1 Merge remote-tracking branch 'origin/master' 2 years ago
chengqf f86d15c72b 文件下载 2 years ago
anthonywj 7b96cfab4e 1.单据类型修改,
2。预验收退回,
3.预验收库存
2 years ago
anthonywj 7b38541ad4 新增预验收单据查询接口 2 years ago
chengqf 5966de3e5a 文件下载 2 years ago
chengqf 85ae23bf45 signleDownloadFile改pbulic 2 years ago
chengqf 3320e2daa9 signleDownloadFile文件大于0返回成功 2 years ago
chengqf 6babaa7135 Merge remote-tracking branch 'origin/master' 2 years ago
chengqf 1f5141bd98 signleDownloadFile文件大于0返回成功 2 years ago
anthonywj 5cc077a4b9 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj f5d87597d6 新增预验收单据类型退回字段 2 years ago
x_z 628d991efe 1.添加更新时间字段的更新逻辑 2 years ago
anthonywj 3a13555c5c by中继服务验收单据 2 years ago
anthonywj 2bd885c398 同步国家库数据 2 years ago
wangwei 1e57b7ca4f 汇总记录,导出excel 2 years ago
x_z c68cb845a0 1.添加第三方基础数据同步和系统设置同步代码 2 years ago
wangwei 7d6341a9c2 导出excel 2 years ago
chengqf 5653ecac41 文件上传 2 years ago
chengqf 40279f5014 文件上传 2 years ago
chengqf 745af75f10 增加单独文件上传 2 years ago
chengqf f0b483dfc7 writeFile 2 years ago
chengqf 27eb158ee6 writeFile 2 years ago
chengqf 54d2c644cb Merge remote-tracking branch 'origin/master' 2 years ago
chengqf 504ddf32d3 writeFile 2 years ago
郑明梁 982b4553d0 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 303e1e7217 模板打印代码提交 2 years ago
wangwei b3bf13592b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java
2 years ago
anthonywj 497764e61a 同步基础类 2 years ago
chengqf b73d8b681c 怎嘎吉上传失败重新上传 2 years ago
chengqf b280dcbf16 增加上传失败重新上传 2 years ago
chengqf bc2d7974fb status 2 years ago
chengqf 3625d3fcc8 Merge remote-tracking branch 'origin/master' 2 years ago
chengqf aeeed11d3a status 2 years ago
anthonywj 5c09ceeb6e 同步设置页面重整,,基础数据上传,单据类型上传 2 years ago
chengqf 406381ee55 增加数据删除同步 2 years ago
chengqf 7df76165cb 增加数据删除同步 2 years ago
chengqf d8a1abad4b 数据删除同步 2 years ago
chengqf b10e7928d4 数据删除同步 2 years ago
chengqf 8c719d92c5 数据删除同步修改 2 years ago
chengqf 8f8f98f3a3 数据删除同步 2 years ago
chengqf 9028aefdde 数据删除同步 2 years ago
chengqf c8bc8528e6 增加条件参数0,1为空无需判断可同步 2 years ago
chengqf 0876e33128 数据删除同步接口 2 years ago
chengqf 06bb65aef0 路径问题 2 years ago
chengqf dda63a86e6 连通检测 2 years ago
chengqf 8ee61210f5 连通检测 2 years ago
chengqf 2a4960fbbd 修改同步数据时间条件到当前时间 2 years ago
chengqf 8bef5b9c66 删除拉取0k文件 2 years ago
chengqf 116c59ba90 updateTime 2 years ago
chengqf a9683c7675 out.close() 2 years ago
chengqf 1e79ea6764 connect check 2 years ago
chengqf 1cd60dd170 outputStream.close() 2 years ago
chengqf 78e4e4ecfe Merge remote-tracking branch 'origin/master' 2 years ago
chengqf d9b778ba6d outputStream.close() 2 years ago
chengqf 8f9078c456 outputStream.close() 2 years ago
anthonywj b9590dcd50 单据同步相关修改 2 years ago
anthonywj 03097198f5 单据同步 2 years ago
chengqf 7d90ddee48 优化 2 years ago
chengqf 564b29d2b3 列名加饭引号,防止因关键字报错 2 years ago
chengqf fd7d7d160c 增加独立发送方法,接口 2 years ago
chengqf f0b090c17d 增加同步表未设置的也上传 2 years ago
chengqf 5782034e0a 增加同步表未设置的也上传 2 years ago
chengqf c85b9d1079 spit,null问题 2 years ago
chengqf 9f13b99a90 子表被执行bug 2 years ago
chengqf 7b3d5d5db5 Merge remote-tracking branch 'origin/master' 2 years ago
chengqf 28f4b19568 子表被执行bug 2 years ago
x_z 2e2b7d0bda 1.修复无单据类型时查询单据表报错问题 2 years ago
x_z 9bab80a61e 1.同步库存预警设置代码 2 years ago
anthonywj d47ff60dd6 迁移自助平台单据相关代码 2 years ago
chengqf e6c2229ec7 upload,download,status 2 years ago
chengqf 57b420a11d 优化 2 years ago
chengqf 45df91badb 优化 2 years ago
chengqf 233ca8601c 文件不存在不加入上传列表 2 years ago
chengqf f168489ac7 id问题 2 years ago
chengqf 78ae9d9806 SYNC_TABLS由TableUtils.syncTables()获取 2 years ago
chengqf f4e17649c5 表参数移入TableUtils 2 years ago
anthonywj d14cba051e 单据类型迁移,内部码打印迁移 2 years ago
anthonywj 685e65d6e6 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 073e87eae1 代码备份 2 years ago
chengqf 6ba9ae6a1a 同步任务-文件路径 2 years ago
chengqf 13fbdc424e download 2 years ago
chengqf 7a28da6836 增加备注 2 years ago
admin 413d5c03a5 download 2 years ago
admin ecf2514975 download 2 years ago
admin 740634a797 UDI->中继,存_upload_,中继->自助,存_downlaod_ 2 years ago
admin 85d48f9b6b 任务id,开始,结束时间 2 years ago
anthonywj 78efd5b5eb 页面展示,同步相关修改 2 years ago
admin a291802443 任务id保持一致,开始,结束时间 2 years ago
x_z 437938b6c9 1.测试 2 years ago
admin 5b55cf2168 删除调试日志 2 years ago
admin a73dff56f0 bug 2 years ago
admin 13c74fafba Merge remote-tracking branch 'origin/master' 2 years ago
admin 5383565933 bug 2 years ago
admin fe94e808db bug 2 years ago
x_z 3f81a88bce 1.调整同步设置业务单据类型代码 2 years ago
x_z f2e715bd9a 1.添加同步,业务单据类型代码 2 years ago
admin d7a1453cfd code==20000 2 years ago
admin 3bd393227b bug 2 years ago
admin 9778983246 SYNC_TABLES 2 years ago
admin b25065174a where 2 years ago
admin 78a40ab575 receiveStatus 2 years ago
admin 8bb73c6f5c 拉取状态保存 2 years ago
admin bd40a9a29a 修复半小时重复发问题 2 years ago
admin b1144b753b 图片下载 2 years ago
admin 68c9c7a43c 图片下载 2 years ago
admin dd348c8a1c 子表图片 2 years ago
admin e7ae867da5 子表图片 2 years ago
admin 1fc4478fe0 优化 2 years ago
admin 7b195af732 cron 2 years ago
wangwei 56ea125915 添加事务注解 2 years ago
x_z 71cb1c1e2d 1.添加采购计划和采购单明细接口 2 years ago
x_z 72a4b9095c 1.添加申购单据明细查询接口 2 years ago
admin 1bc6935a8c controller 2 years ago
admin 1fa25691ec updateTime大于当前时间数据,15分钟内部重复发 2 years ago
admin c921ff5b38 条件 2 years ago
admin 056041f5a3 图片下载 2 years ago
admin 2de7b22b5c 优化 2 years ago
admin 0eaec187c3 完善子表处理 2 years ago
admin a7259b0672 优化 2 years ago
admin 6a8dceef2a 优化 2 years ago
admin 21bc4f8de0 优化 2 years ago
admin a0193fdf5c 优化 2 years ago
admin 88c07ca3e4 优化 2 years ago
admin b2a9f4f830 拉取优化 2 years ago
admin 33777da1ca 优化 2 years ago
admin 19fff9038b 优化 2 years ago
admin 684a431bc5 UDI拉取任务 2 years ago
admin b7d850c0a8 拉取任务拆分 2 years ago
admin 1202e3c1d0 body().string 2 years ago
admin 27d4f991a4 @ResponseBody 2 years ago
admin e2338d5fe8 cron 2 years ago
admin 58de05025e directory 2 years ago
admin 5dd9aa3326 udiTask 2 years ago
admin b0fec590fc udiTask 2 years ago
admin e8be747527 dlAllOrder null检查 2 years ago