Commit Graph

107 Commits (81da44c6a2579a40ffde21fb8723fe106e951070)

Author SHA1 Message Date
yewj c14d32bf57 耗材字典使用单元,流通单元等配置修改 11 months ago
yewj 7542711f97 库存问题 11 months ago
chenhc 243a6c3be9 feat: 修改 11 months ago
anthonywj e9b939e99d 单据拆零赋码优化修改 11 months ago
anthonywj bae3fb9c30 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
anthonywj d4e2b85982 拆零优化 11 months ago
wangwei b757ab2ffb 8/12 药品字段数据 11 months ago
anthonywj 7e021afe6e 药品扫码相关修改 11 months ago
anthonywj 0f1ee49172 预出库扫码修改,处方赋码修改 11 months ago
anthonywj 0cc61f9f59 新增拆零队列 12 months ago
anthonywj acc2afebdf 切换分支备份 12 months ago
anthonywj 147c9f3fa9 拆零相关修改 12 months ago
wangwei dfd2e2bfce Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
12 months ago
wangwei 7b0a9dd058 7/27 1.1 12 months ago
anthonywj 878f571a3b 新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等 12 months ago
anthonywj 0b257f3087 新增发票确认时间 1 year ago
anthonywj bd9af3f14d 采购订单关联单号 1 year ago
chenhc 20699097fe feat: 明细列表增加术式模板id 1 year ago
chenhc d1743d12b4 feat: 增加定时扫描三方的明细表-生成单据 1 year ago
chenhc 45b7fad953 feat: 审核流程配置功能-sql删除 1 year ago
chenhc 79496895ad Merge remote-tracking branch 'origin/dev_20240306' into dev_fifo
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
anthonywj 1551cd46e2 长泰添加异常UDI码 1 year ago
anthonywj 04cbe6afc8 业务单生成扫码单执行先进先出原则 1 year ago
chenhc 79c5ac8ef4 feat: 代码保存 1 year ago
anthonywj 640e3ed137 校验后处方结果保存 2 years ago
anthonywj 77525665e9 设备入库,变更,销毁等修改,自定义汇总统修改 2 years ago
anthonywj 5fad9e2835 新增自定义库存明细汇总 2 years ago
anthonywj c73e2bf1f2 第三方接口修改,第三接口容错处理,患者信息相关修改,单据类型患者相关修改,临床出库患者信息选择,是否对照处方等相关配置 2 years ago
anthonywj 677f368635 退货补单,多级仓库补单修改,新增灭菌批号,灭菌日期 2 years ago
anthonywj f23c0136dd 新增退货补单流程,诏安两个分库问题,单据明细打印问题 2 years ago
anthonywj 30813b31bd 新增库存过滤方式,新增内网版本更新 2 years ago
anthonywj a038cac875 领用相关问题修改 2 years ago
anthonywj e319a9888d 汇总统计 2 years ago
anthonywj 12f1851bba 业务单据打印等,出入库明细打印等 2 years ago
anthonywj d9d4ca1771 新增价格相关处理 2 years ago
anthonywj d8a88547fe pda带配/拣货单据修改 2 years ago
anthonywj 5a22d137d8 预验收选入时增加过滤条件 2 years ago
郑明梁 80c5d58787 单据上传(回传自助单据号) 2 years ago
anthonywj 4f25b9ee57 新增备注字段查询时查备注或病人信息 2 years ago
anthonywj 89732532fa Merge branch 'dev_ywj' into dev 2 years ago
郑明梁 98c0d2c69f 去除临时表的没有用的字段 2 years ago
1178634255 999430aa52 新增往来类型为客户的医疗机构,新增出库单不会显示该信息 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
郑明梁 b1fc3a50ef 修改bug 2 years ago
郑明梁 883084f4c5 定数包代码提交 2 years ago
郑明梁 de55970ff8 定数包加工代码初始化 2 years ago
anthonywj ce801cd27c 单据带校验比对逻辑修改 2 years ago
郑明梁 c5b7ba7db5 客户管理功能代码提交 2 years ago
郑明梁 11be2ef830 修改货位上架按当前仓库筛选,和汇总导出加上仓库字段 2 years ago
wangwei 68fd6641ba 同步代码 发票优化 2 years ago