Commit Graph

501 Commits (dfcf62f1a8210e9789196971254016eb0e50c4e9)

Author SHA1 Message Date
yewj 201d03bf4e 扫码作业问题 1 year ago
yewj b1eca2aab3 代码备份 1 year ago
chenhc 840f411779 feat: 单据备注字段响应出去 1 year ago
yewj d71bb120f8 单据流程修改 1 year ago
yewj e7fbdab3c0 拆零整取数量重新计算 1 year ago
wangwei 6ae6c1c329 8/22 现场管理工位调整,单据 1 year ago
yewj 4f5b4282e1 代码备份 1 year ago
chenhc 88513a51f4 feat: 修改 1 year ago
chenhc 1150a2bec9 feat: 修改 1 year ago
wangwei 1bb1291753 8/20 工位绑定单据类型 1 year ago
anthonywj 5e1d1e51e2 代码备份 1 year ago
anthonywj e04b28efe1 代码备份 1 year ago
anthonywj 1a3d5dbc9a 代码备份 1 year ago
anthonywj 44b8a8d04b 代码备份 1 year ago
chenhc 243a6c3be9 feat: 修改 1 year ago
anthonywj 5e7af56b93 自动拆零查询详情 1 year ago
anthonywj e9b939e99d 单据拆零赋码优化修改 1 year ago
wangwei 7a219014e1 7/11 优化工位 1 year ago
chenhc ab91277787 feat: 页面修改-业务类型、来源系统 1 year ago
wangwei 595651c193 1.2 增加往来单位类型 1 year ago
wangwei 67726020ec 8/15 搜索用户加入仓库字段 1 year ago
anthonywj dcd227d367 校验方式修改,1.三期,无三期,扫码单生成业务单,等一些功能修改 1 year ago
anthonywj 6b60cc0244 代码备份 1 year ago
wangwei 0a28aa21f6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 4db6d15acf 工位管理 1 year ago
chenhc 2ff822c07a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 904e8a9950 8/14 工位单据管理 1 year ago
chenhc b697699668 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo_z
# Conflicts:
#	src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
#	src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
#	src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
#	src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
#	src/main/java/com/glxp/api/res/inv/InvProductResponse.java
#	src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
#	src/main/resources/application-dev.yml
#	src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
#	src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
#	src/main/resources/mybatis/mapper/inv/invProductDao.xml
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
anthonywj b30a908894 重写采集点代码 1 year ago
anthonywj bae3fb9c30 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
anthonywj d4e2b85982 拆零优化 1 year ago
wangwei b757ab2ffb 8/12 药品字段数据 1 year ago
wangwei 95cd6628f5 8/9 药品管理字段优化,生成单据的时候设置产品类型,响应字段,带票出入库根据订单号分组过滤 1 year ago
wangwei f9a09de847 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
wangwei dfe7b8769e 8/8 药品搜索字段以及插入字段维护 1 year ago
anthonywj 274aefa911 处方相关修改 1 year ago
wangwei 26d23af14a 8/02 选入收费项目 1 year ago
anthonywj 01d873f317 基础数据修改 1 year ago
chenhc 4b6ac18da9 feat: 带票出入库明细 1 year ago
anthonywj 771886a42d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
anthonywj f1cd9fd1d6 四级库库存查询 1 year ago
chenhc 8fdd2a487d feat: 带票出入库明细 1 year ago
wangwei b329488995 单据查看药品字典详情 1 year ago
anthonywj 0cc61f9f59 新增拆零队列 1 year ago
anthonywj 17b98d8ab0 药品信息编辑以及层级包装数量换算 1 year ago
anthonywj 4409ea42e3 药品字典修改 1 year ago
anthonywj ed3b454631 切换分支备份,选择库存自定义界面 1 year ago
chenhc a4a05d4756 feat: 药品出入库明细、汇总、入账库 1 year ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 1 year ago
anthonywj 147c9f3fa9 拆零相关修改 1 year ago
wangwei dfd2e2bfce Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
wangwei 7b0a9dd058 7/27 1.1 1 year ago
anthonywj 878f571a3b 新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等 1 year ago
wangwei 8a614fd0bc 1.1 1 year ago
anthonywj c064fa3629 患者信息修改, 1 year ago
anthonywj f16521fbbb 平潭修改患者信息下载 1 year ago
anthonywj a508f850a2 南靖新增第三方产品编码返回 1 year ago
chenhc 6ce53c5bea feat: 0702-扫码校验功能 1 year ago
wangwei bcbe3745b5 6/21 同步优化 1 year ago
wangwei b630f392f5 6/11 单据查询页面 1 year ago
wangwei d2a7f661a0 6/7 单据搜索 1 year ago
wangwei 2572ca2b7e 6/4 优化发票确认时间以及相关带票查询 1 year ago
chenhc 8bf33df981 feat: 0531增加是否需要扫码字段 1 year ago
anthonywj 3f649b0abf Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
anthonywj 87d3b9486f 新增耗材类别校验 1 year ago
chenhc e4faa404e0 feat: 0523开发询价模块 1 year ago
chenhc fc6daa33f2 feat: 0517优化 1 year ago
anthonywj 0b257f3087 新增发票确认时间 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 560af1ae62 feat: 设备管理优化-0514-设备卡片 1 year ago
chenhc eaf83b2ca3 feat: 设备管理优化-0514-合同管理 1 year ago
chenhc b096280db6 feat: 设备管理优化-0513-合同管理复制 1 year ago
wangwei c584701c32 5-10 数据同步返回设置 1 year ago
wangwei f9b273fcb6 5-10 数据同步 1 year ago
chenhc 958aa625ad feat: 设备管理优化-0510 1 year ago
chenhc 46ae4e7141 feat: 本部门保修单、报修单大厅、我的报修单、我的维修单 1 year ago
anthonywj 36a026f075 申购仓库修改 1 year ago
chenhc 20699097fe feat: 明细列表增加术式模板id 1 year ago
chenhc baff72c8ef feat: 术式名称修改 1 year ago
chenhc 449de7adb4 feat: 术士套包、定数包功能开发优化 1 year ago
chenhc 50490a88dc feat: 术士套包、定数包功能开发 1 year ago
anthonywj bfca9fa283 科室出库修改 1 year ago
chenhc ad57946821 feat: 产品增加采购类型校验 1 year ago
chenhc d4a5f6d67f feat: 定数包项目 1 year ago
chenhc 11270c57dc feat: 第三方明细下载增加字段 1 year ago
anthonywj e7ae556f8d 新增配送产品,申请与审核,创建后回填 1 year ago
chenhc fc91a02cf4 feat: 医保耗材信息增加字段 1 year ago
chenhc 4b5be8fb3b feat: 增加定时扫描三方的明细表-生成单据 1 year ago
chenhc b50b981c65 feat: 增加页面的医保耗材信息调用功能 2 years ago
chenhc 07be51ee6f feat: 审核开关-业务页面修改 2 years ago
chenhc 9acdef9af4 feat: 审核开关 2 years ago
chenhc db533938c8 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
2 years ago
chenhc 1cde4618ad feat: 供三方调用接口开发 2 years ago
anthonywj e6b51b0637 收费项目添加价格与计量单位 2 years ago
chenhc 45b7fad953 feat: 审核流程配置功能-sql删除 2 years ago
chenhc 54d3d3244a feat: 审核流程配置功能 2 years ago
chenhc 79496895ad Merge remote-tracking branch 'origin/dev_20240306' into dev_fifo
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
2 years ago
anthonywj fba3db5d38 新增收费出库是否过滤高值耗材 2 years ago
anthonywj 778258acec 第三方出库明细 2 years ago
anthonywj 53585f97a6 新增耗材分类 2 years ago