Commit Graph

660 Commits (c3a8c5da54cf3de96d91bb833380eb362a75f526)

Author SHA1 Message Date
anthonywj c3a8c5da54 删除任务同步相关调整(后续还需调整) 2 years ago
anthonywj 1931ece8a3 修改设备任务ID为雪花ID(自增同步会有问题) 2 years ago
anthonywj d28b4f1699 同步任务备份 2 years ago
郑明梁 a7725c066c Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
郑明梁 1b271cab9d Merge remote-tracking branch 'origin/dev' into dev2.0 2 years ago
anthonywj 2ac43431a4 第三方业务单据下载重复问题 2 years ago
wangwei b400a08d83 同步删除基础数据 2 years ago
anthonywj 8cb095693c 第三方单据下载异常回滚问题 2 years ago
anthonywj df219f13c4 切换分支代码备份 2 years ago
郑明梁 a88db37eb6 Merge remote-tracking branch 'origin/dev' into dev2.0 2 years ago
郑明梁 0990597b59 设备bug修改提交 2 years ago
郑明梁 e3dae86c72 Merge remote-tracking branch 'origin/dev' into dev2.0 2 years ago
郑明梁 a268df2cdb 设备bug修改提交 2 years ago
anthonywj 249edf57b8 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
anthonywj 422f9e788c 新增单据核对接口 2 years ago
黄泽腾 0d85313688 Merge branch 'dev' into dev2.0 2 years ago
郑明梁 4ffe2f71c8 库存代码提交 2 years ago
郑明梁 1514065484 库存代码提交 2 years ago
anthonywj 40f8701bc2 新增同步操作日志相关方法 2 years ago
anthonywj cc2cd0b511 新增同步操作日志相关方法 2 years ago
anthonywj 79033ac6b1 切换分支备份 2 years ago
薛宇 5367acb349 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 13ada50cc3 Merge branch 'dev' into ywj_dev
# Conflicts:
#	src/main/resources/application-dev.yml
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
anthonywj c0a9d39535 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
anthonywj 8cf48f17d2 新增控制是否只校验批次号 2 years ago
郑明梁 a8ad971567 设备报修代码提交 2 years ago
薛宇 48904a0239 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 e5d28786dd 设备报修代码提交 2 years ago
wangwei cffb595319 报修详情接口 2 years ago
wangwei 21294acab7 详情接口 2 years ago
wangwei 6d8e7bdf87 报修详情接口 2 years ago
anthonywj f7cbc4f69d socket链接问题 2 years ago
郑明梁 f6f9b599a5 设备保修详情代码提交 2 years ago
郑明梁 32c2798027 设备巡检任务代码提交 2 years ago
郑明梁 c67e86556f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 d66303b2fb 设备巡检任务代码提交 2 years ago
anthonywj 5d8e8861b9 Merge branch 'dev' into ywj_dev
# Conflicts:
#	src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
#	src/main/resources/application-dev.yml
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
薛宇 5c788f950c Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj d086c63ab2 根据全局设置项,不校验生产日期和失效日期 2 years ago
anthonywj c57b6a645f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj cda668a04b 第三方单据下载问题 2 years ago
wangwei 1a87f29e4d 我的巡检任务 2 years ago
anthonywj 8e102c1659 第三方产品信息异常问题(回滚) 2 years ago
anthonywj ad2a95e94c 诊断单据产品下载问题 2 years ago
anthonywj 6d1f77967a 打包后消息同步问题 2 years ago
郑明梁 7588e50521 设备巡检计划代码提交 2 years ago
郑明梁 6c66ec37ca 设备代码提交 2 years ago
anthonywj 5a22d137d8 预验收选入时增加过滤条件 2 years ago
wangwei b27758f8db 报修单 维保设备清单 2 years ago
黄泽腾 f69b85697c 物资资质新增--新增配送产品资质信息 2 years ago