Commit Graph

99 Commits (394ee7e5859cad86060c9fe53f804136e42b0a3b)

Author SHA1 Message Date
yuanwei 7ffe727deb Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
# Conflicts:
#	src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
1 year ago
anthonywj bc4b627077 患者信息远程下载,提供中医院设备查询界面 2 years ago
anthonywj 77525665e9 设备入库,变更,销毁等修改,自定义汇总统修改 2 years ago
anthonywj c73e2bf1f2 第三方接口修改,第三接口容错处理,患者信息相关修改,单据类型患者相关修改,临床出库患者信息选择,是否对照处方等相关配置 2 years ago
yuanwei 498c3be047 出入库单管理配置 2 years ago
anthonywj 677f368635 退货补单,多级仓库补单修改,新增灭菌批号,灭菌日期 2 years ago
anthonywj 4d307a42a3 单据按di排序 2 years ago
anthonywj f23c0136dd 新增退货补单流程,诏安两个分库问题,单据明细打印问题 2 years ago
anthonywj 30813b31bd 新增库存过滤方式,新增内网版本更新 2 years ago
anthonywj a038cac875 领用相关问题修改 2 years ago
anthonywj fd31e5a224 平潭普耗相关修改,汇总统计修改 2 years ago
anthonywj 12f1851bba 业务单据打印等,出入库明细打印等 2 years ago
anthonywj ac4774981d 定量设置相关修改 2 years ago
anthonywj 1c202156b4 价格相关修改,新增库存定量设置 2 years ago
黄泽腾 55c2c3233d 中医院往来信息单位显示 2 years ago
黄泽腾 0d85313688 Merge branch 'dev' into dev2.0 2 years ago
anthonywj a6436a4642 pda待校验待配货等单据下载接口 2 years ago
黄泽腾 8af8962464 发票DI编码展示 2 years ago
anthonywj 5a22d137d8 预验收选入时增加过滤条件 2 years ago
薛宇 f189d0b6a3 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 eeb03f7226 单据上传状态 2 years ago
anthonywj 1846ce85dc 发票相关以orderresult表为准 2 years ago
薛宇 a14a6140bf 库存查询的注册/备案号显示多个 2 years ago
郑明梁 75f4ff7d7a 单据打印增加自助单号字段 2 years ago
黄泽腾 5c451346ea 供应商发票页面优化问题 2 years ago
黄泽腾 2af01de1e8 新增往来单位搜索备份 2 years ago
anthonywj 30dcdfd553 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 40fe92d304 发票代码提交 2 years ago
anthonywj 89732532fa Merge branch 'dev_ywj' into dev 2 years ago
schry 3d22b2c8b0 进入“多级产品管理”页面报错提交 2 years ago
1178634255 e20a65a00c 新增扫码单模块到待校验单据模块,备注会消失 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
郑明梁 883084f4c5 定数包代码提交 2 years ago
anthonywj bec91b93ca 新增协调平台追溯查询 2 years ago
anthonywj 3e28f48933 待校验,等相关修改, 2 years ago
郑明梁 5513726e0b 单据上传功能 2 years ago
郑明梁 5a377fe206 客户管理bug修复 2 years ago
郑明梁 134762db9e 单据上传功能代码提交 2 years ago
郑明梁 17a0e0b99c Merge branch 'zmlDev' into dev 2 years ago
郑明梁 31d1c52a30 单据上传功能代码提交 2 years ago
郑明梁 c5b7ba7db5 客户管理功能代码提交 2 years ago
wangwei 60b96aaec6 带票出入库明细 增加查询条件等 2 years ago
anthonywj 84b7aae6dc 发票修改同步 2 years ago
郑明梁 d72625c5cd Merge remote-tracking branch 'origin/zmlDev' into dev 2 years ago
郑明梁 3a26eafb7d 多次使用出库新增功能代码提交 2 years ago
郑明梁 14c4bd0248 多次使用出库新增功能代码提交 2 years ago
anthonywj f2968bf275 单据复制,单据流转带业务单信息,采购订单新增价格 2 years ago
郑明梁 32ff539034 多次使用出库设置功能代码提交 2 years ago
wangwei 4b917f22fd 冷链报告 2 years ago
anthonywj b4a00f5c51 发票,单据修改 2 years ago