Commit Graph

120 Commits (dbd58892ee2c58f03dc7cc14b8525d574664dd90)

Author SHA1 Message Date
anthonywj 54c7b550a2 单据类型添加编辑类型 2 years ago
anthonywj 44baefc855 系统升级相关修改 2 years ago
anthonywj cfdfe112ed 预验收价格问题 2 years ago
郑明梁 f835362043 设备代码提交 2 years ago
郑明梁 06ebf55ed0 Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
郑明梁 af21cfdf13 设备代码提交 2 years ago
anthonywj 90f7f1f927 PDA手持终端相关接口 2 years ago
anthonywj 5b15f6ff45 诊断第三方产品信息定时选入时,自动添加到耗材字典 2 years ago
郑明梁 70483edee8 设备代码提交 2 years ago
anthonywj dec79c047d 新增已执行次数字段;
自定义前端表头字段相关操作类
2 years ago
anthonywj 24cd753745 设备明细表字段补充 2 years ago
anthonywj 98951a39f0 设备使用记录相关操作类 2 years ago
anthonywj d31eee08c3 设备相关人员操作类 2 years ago
郑明梁 02335c77aa 设备sql提交 2 years ago
anthonywj 319484c145 1:手持终端相关接口补充
2:待校验以校验结果提交,未生成单据详情问题
2 years ago
anthonywj 1931ece8a3 修改设备任务ID为雪花ID(自增同步会有问题) 2 years ago
郑明梁 d5bcc60287 设备sql提交 2 years ago
郑明梁 aa5d34fdd9 业务菜单sql提交 2 years ago
郑明梁 d507470059 业务菜单sql提交 2 years ago
郑明梁 60f9a148de 领用代码提交 2 years ago
anthonywj cc2cd0b511 新增同步操作日志相关方法 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
郑明梁 8be3506529 设备巡检任务新增任务级别和保修类型字段 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
郑明梁 83d49b7e06 设备巡检任务sql 2 years ago
郑明梁 6c66ec37ca 设备代码提交 2 years ago
anthonywj 5a22d137d8 预验收选入时增加过滤条件 2 years ago
wangwei b27758f8db 报修单 维保设备清单 2 years ago
郑明梁 f3c2f13e2d sql提交 2 years ago
anthonywj d9371c48f5 新增设备管理相关实体类与字段 2 years ago
anthonywj de7412b096 库存无批次号系统繁忙问题 2 years ago
anthonywj c5f47f8139 bug修改,新增单据验收补单校验 2 years ago
anthonywj 177c600112 代码备份 2 years ago
郑明梁 02f9c363c0 单据表 新增自助单号sql 2 years ago
黄泽腾 d1d99533ce 代码备份 2 years ago
anthonywj 4f25b9ee57 新增备注字段查询时查备注或病人信息 2 years ago
anthonywj d53c9e87ab 新增第三方单据自动下载与配置,日志生成等 2 years ago
anthonywj 89732532fa Merge branch 'dev_ywj' into dev 2 years ago
anthonywj 3438e4e2fb bug修改 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
郑明梁 23d7d1623f 定数包sql提交 2 years ago
anthonywj 3e28f48933 待校验,等相关修改, 2 years ago
郑明梁 29df3286de 申购单流转价格问题修复 2 years ago
anthonywj 91ff79f125 第三方产品信息编辑bug 2 years ago
anthonywj 069069e32b bug修改 2 years ago
anthonywj fce5d7b7c6 申购单据,采购订单等相关修改 2 years ago
anthonywj f66705d82b 采购计划,采购订单等相关修改 2 years ago
anthonywj 5c0a78e70c 基础信息相关修改 2 years ago