Commit Graph

90 Commits (d345794cdba673829a9f54db9ef55c29d589352f)

Author SHA1 Message Date
anthonywj c73e2bf1f2 第三方接口修改,第三接口容错处理,患者信息相关修改,单据类型患者相关修改,临床出库患者信息选择,是否对照处方等相关配置 2 years ago
anthonywj 15e7286003 患者信息,处方信息下载 2 years ago
anthonywj 6d5e0228d9 单据复制校验库存,申购加到货仓库 2 years ago
anthonywj d9d4ca1771 新增价格相关处理 2 years ago
anthonywj 5f3aca56b2 超时修改密码 2 years ago
郑明梁 70483edee8 设备代码提交 2 years ago
anthonywj c3a8c5da54 删除任务同步相关调整(后续还需调整) 2 years ago
anthonywj d28b4f1699 同步任务备份 2 years ago
wangwei b400a08d83 同步删除基础数据 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 8cf48f17d2 新增控制是否只校验批次号 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
郑明梁 680e6b9979 设备状态类型代码提交 2 years ago
郑明梁 6c66ec37ca 设备代码提交 2 years ago
anthonywj 6a3d9113f6 新增发票确认实时同步 2 years ago
anthonywj 1476a0f894 新增websocket通信(中继服务同步相关) 2 years ago
郑明梁 35594d91a2 单据查询问题修复(带校验) 2 years ago
anthonywj 89732532fa Merge branch 'dev_ywj' into dev 2 years ago
郑明梁 ec39ea48d1 修改往来单位查询问题 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
anthonywj 375ff7aa5d 新增第三方单据上传过滤 2 years ago
anthonywj b3b935c0fe 根据单据类型查询问题 2 years ago
anthonywj 6c2e5b7f14 备份 2 years ago
anthonywj 428ed71f4e 申购单据,采购订单等相关修改 2 years ago
anthonywj 4cd4d9b44c 单据重复提交问题 2 years ago
郑明梁 3a26eafb7d 多次使用出库新增功能代码提交 2 years ago
anthonywj 38f2e7b1a6 修改文件统一路径 2 years ago
anthonywj 59a0078a84 新增按货位出库功能 2 years ago
anthonywj 75077b05a4 同步相关问题修改。用户选入物资字典相关修改 2 years ago
wj 46fe9a5e7d 测试环境调整 2 years ago
anthonywj a7ef10a6d7 寄售出库问题,预验收入库问题,同步问题,领用单据问题 2 years ago
wj 09915f0e66 手动上传数据 2 years ago
anthonywj 3cae7526bc 摆货相关修改,添加货位查询,预验收,寄售等相关库存摆货 2 years ago
anthonywj eec7d4f87a 带配货功能修改 2 years ago
x_z 90340e2607 1.调整摆放功能代码,添加上架记录 2 years ago
anthonywj 37af4d2462 合并同步 分支 2 years ago
wj 1c6ebe2899 调整 2 years ago
anthonywj aa9d903fd7 bug修改 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
anthonywj 1f6a08e74c 新增三期拣货,无三期拣货,为配货等页面 2 years ago
wj 3f4c4511d6 第三方数据同步 2 years ago
wj 1517d71b78 用户数据同步 2 years ago
anthonywj 1e82f37f7f 物资字典参数设置,单据类型修改 2 years ago
wj 729badbb04 由内向外同步 2 years ago
wj 6c13eb05d4 Merge remote-tracking branch 'origin/master' 2 years ago
wj cdfda6af2a 由内向外同步 2 years ago