Commit Graph

119 Commits (7ddccf734f302649ee1f2d33cc67b76ff76a6aa7)

Author SHA1 Message Date
chenhc e66332e4fb feat: 药品关联信息上下传输功能 9 months ago
chenhc dbf696db1e feat: 手工、拼箱关联修改 9 months ago
zane 9a9dafa28c 上传关联优化 9 months ago
chenhc dbe6477e09 feat: 器械处方 9 months ago
yewj 6efe7321b4 批量扫码 10 months ago
zane 03b9171a75 单据 10 months ago
yewj f03fd0f1e1 损耗出库添加产品 10 months ago
yewj b1eca2aab3 代码备份 11 months ago
anthonywj d79001655c 代码备份 11 months ago
anthonywj dcd227d367 校验方式修改,1.三期,无三期,扫码单生成业务单,等一些功能修改 11 months ago
anthonywj 8f67e20d19 缺了个预出库队列校验 11 months ago
anthonywj f1cd9fd1d6 四级库库存查询 11 months ago
wangwei bcbe3745b5 6/21 同步优化 1 year ago
chenhc 65e6bdf631 feat: 0521 优化 1 year ago
chenhc fc6daa33f2 feat: 0517优化 1 year ago
wangwei ed8ca33559 Merge branch 'dev_fifo1.0' into dev_fifo
# Conflicts:
#	src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailEntity.java
#	src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java
#	src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java
#	src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
chenhc 770caa552c feat: 设备管理优化-0512-增加移除设备的审批流程 1 year ago
wangwei f9b273fcb6 5-10 数据同步 1 year ago
anthonywj 8fa91cee91 新增下载收费项目字典 1 year ago
chenhc baff72c8ef feat: 术式名称修改 1 year ago
chenhc d4a5f6d67f feat: 定数包项目 1 year ago
anthonywj a58e9e6229 盘点修改,审核重复提交问题 1 year ago
chenhc 8c0e5a73ba feat: 三方出入库明细功能 1 year ago
chenhc 96dba85918 feat: 三方出入库明细功能 1 year ago
chenhc 85c9db2ae5 feat: 项目组套和三方出入库明细 1 year ago
chenhc 2de35f3091 feat: 项目组套和三方出入库明细 1 year ago
anthonywj 04f790caf8 单据重复上传问题,东山第三方产品信息新增库房代码 1 year ago
anthonywj 1ed3360997 新增第三方生产企业 1 year ago
anthonywj f6ecc65386 患者处方相关修改优化 2 years ago
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