Commit Graph

196 Commits (2983a32c3e1c93f6cbc46b718c358bac60bf2d97)

Author SHA1 Message Date
anthonywj d345794cdb 患者处方相关修改 2 years ago
anthonywj c73e2bf1f2 第三方接口修改,第三接口容错处理,患者信息相关修改,单据类型患者相关修改,临床出库患者信息选择,是否对照处方等相关配置 2 years ago
anthonywj 5f110bea39 患者处方相关修改 2 years ago
wj 1df50657b0 设备相关 2 years ago
anthonywj 27cc68ff98 新增库存出库模式,总库库存,上级库存,当前库存 2 years ago
anthonywj be1475a5da 新增库存出库模式,总库库存,上级库存,当前库存 2 years ago
anthonywj f79458bb45 长泰新增配送产品,物资分类问题 2 years ago
anthonywj 1372f4d92f 第三方产品信息上传 2 years ago
anthonywj 677f368635 退货补单,多级仓库补单修改,新增灭菌批号,灭菌日期 2 years ago
anthonywj 32bd31903d 每日汇总统计等 2 years ago
anthonywj 7de61eb509 预验收入库单区分带回与不带回 2 years ago
anthonywj d7109caf5a 物资分类添加仓库与部门 2 years ago
anthonywj 30813b31bd 新增库存过滤方式,新增内网版本更新 2 years ago
wj 41babe7e64 库存对比相关--未完结 2 years ago
anthonywj 00c2995717 预验收库存,领用等修改 2 years ago
anthonywj a038cac875 领用相关问题修改 2 years ago
anthonywj 4f35b8365f 库存仓库领用等修改 2 years ago
anthonywj fd31e5a224 平潭普耗相关修改,汇总统计修改 2 years ago
anthonywj e319a9888d 汇总统计 2 years ago
anthonywj 94e09d6d8d 盘点相关功能--盘点方式,部分盘点修改 2 years ago
anthonywj 0074c56c9d 盘点相关功能 2 years ago
anthonywj ae8c560cde 代码备份 2 years ago
anthonywj 12f1851bba 业务单据打印等,出入库明细打印等 2 years ago
anthonywj ac4774981d 定量设置相关修改 2 years ago
anthonywj d9d4ca1771 新增价格相关处理 2 years ago
anthonywj 5f3aca56b2 超时修改密码 2 years ago
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
anthonywj dd1f68f103 发票相关问题修改 2 years ago
anthonywj 374f8261f8 相关bug修改 2 years ago
郑明梁 ef0bdb8869 sql inv_place_order_detail 增加 topInvSpaceCode字段 2 years ago
anthonywj d3697401a2 单据上传重盖 2 years ago
郑明梁 b895be051e 产品表新增拼音字段 2 years ago
郑明梁 f81471d4e6 新增扫码单据排序 2 years ago
anthonywj f7d09c1ec4 第三方接口相关修改 2 years ago
wj d02dc617a8 sql记录 2 years ago
wj ab780d007f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj dc0a842edf ThrSystemDetailEntity增加表名,ThrProductsEntity增加字段[生产厂家编码,配送企业编码] 2 years ago
郑明梁 ddf0a1866f 内部码报表打印代码提交 2 years ago
郑明梁 fe4b0082e3 单据报表打印代码提交 2 years ago
anthonywj f2968bf275 单据复制,单据流转带业务单信息,采购订单新增价格 2 years ago
wangwei 4b917f22fd 冷链报告 2 years ago
wangwei f6c9fd2297 修改字段 2 years ago
anthonywj 8de2927b19 用户关联单据类型 2 years ago
anthonywj b4a00f5c51 发票,单据修改 2 years ago
anthonywj 1003d2ec8f 业务单据详情改成雪花ID 2 years ago
anthonywj 23dacbc0d7 bug修改 2 years ago
郑明梁 40c9648762 物质摆放变更功能代码提交 2 years ago
wangwei f45d18ec7f 同步发票代码 2 years ago
anthonywj 75077b05a4 同步相关问题修改。用户选入物资字典相关修改 2 years ago
anthonywj cc248bab94 上线bug修改,同步修改,发票修改 2 years ago
wj 0214b2cf94 代码调整 2 years ago