Commit Graph

695 Commits (14254daeb7ef4d68c5c37373225de4f56a8ec241)

Author SHA1 Message Date
anthonywj 14254daeb7 设备资质相关操作类 2 years ago
黄泽腾 e91a030744 bug修复 2 years ago
郑明梁 02335c77aa 设备sql提交 2 years ago
郑明梁 5c5f667cf5 设备代码提交 2 years ago
anthonywj 319484c145 1:手持终端相关接口补充
2:待校验以校验结果提交,未生成单据详情问题
2 years ago
anthonywj 1931ece8a3 修改设备任务ID为雪花ID(自增同步会有问题) 2 years ago
anthonywj d28b4f1699 同步任务备份 2 years ago
郑明梁 d5bcc60287 设备sql提交 2 years ago
anthonywj df219f13c4 切换分支代码备份 2 years ago
anthonywj 4eb14efc5f 手持终端获取单据类型 2 years ago
薛宇 7ee7d05d2b 配置 2 years ago
黄泽腾 9dd61ba841 Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
#	src/main/resources/application-dev.yml
2 years ago
黄泽腾 55c2c3233d 中医院往来信息单位显示 2 years ago
郑明梁 e3dae86c72 Merge remote-tracking branch 'origin/dev' into dev2.0 2 years ago
郑明梁 a268df2cdb 设备bug修改提交 2 years ago
薛宇 b44f38ef0c Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
#	src/main/resources/application-dev.yml
2 years ago
薛宇 e05519acc1 资质上传 2 years ago
郑明梁 aa5d34fdd9 业务菜单sql提交 2 years ago
郑明梁 d507470059 业务菜单sql提交 2 years ago
郑明梁 60f9a148de 领用代码提交 2 years ago
黄泽腾 0d85313688 Merge branch 'dev' into dev2.0 2 years ago
黄泽腾 8af8962464 发票DI编码展示 2 years ago
黄泽腾 0a1f3ab488 新增设备领用‘手动添加’窗口列表中的产品不会显示供应商名称 2 years ago
薛宇 384a0f54cc 领用仓库选择二级仓库的话,可以领用上一级中心库的产品 2 years ago
anthonywj 40f8701bc2 新增同步操作日志相关方法 2 years ago
anthonywj cc2cd0b511 新增同步操作日志相关方法 2 years ago
anthonywj 161e457797 Merge branch 'dev' into dev2.0 2 years ago
anthonywj 79033ac6b1 切换分支备份 2 years ago
薛宇 5367acb349 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 6cac80437b 明细列表中的‘DI/物资编码’字段显示有误 2 years ago
wangwei b5c1f907eb 巡检 添加查询字段 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
wangwei 21294acab7 详情接口 2 years ago
wangwei 6d8e7bdf87 报修详情接口 2 years ago
郑明梁 8be3506529 设备巡检任务新增任务级别和保修类型字段 2 years ago
郑明梁 f6f9b599a5 设备保修详情代码提交 2 years ago
郑明梁 32c2798027 设备巡检任务代码提交 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
wangwei 1a87f29e4d 我的巡检任务 2 years ago
anthonywj ad2a95e94c 诊断单据产品下载问题 2 years ago
郑明梁 83d49b7e06 设备巡检任务sql 2 years ago
郑明梁 6c66ec37ca 设备代码提交 2 years ago
wangwei 76e3df3611 报修查询接口优化 2 years ago
anthonywj 5a22d137d8 预验收选入时增加过滤条件 2 years ago