Commit Graph

1003 Commits (c6859d461f0fa8c1982c7f975695c6690eaaeb1f)

Author SHA1 Message Date
wangwei c6859d461f 8-15 工位管理 1.0 11 months ago
anthonywj 6b60cc0244 代码备份 11 months ago
wangwei 0a28aa21f6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 4db6d15acf 工位管理 11 months ago
chenhc 2ff822c07a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 904e8a9950 8/14 工位单据管理 11 months 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
11 months ago
chenhc a5c6d5b44e feat: 首页复制 11 months ago
anthonywj fda2478831 切换分支备份 11 months ago
anthonywj b481843d24 切换分支备份 11 months ago
anthonywj 5af357d158 专为平潭写的删除所有科室出库单据的接口 11 months ago
anthonywj b30a908894 重写采集点代码 11 months ago
anthonywj 8f67e20d19 缺了个预出库队列校验 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 e3410ca4c2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 95cd6628f5 8/9 药品管理字段优化,生成单据的时候设置产品类型,响应字段,带票出入库根据订单号分组过滤 11 months ago
anthonywj c8c57e2f86 新增产品上传 11 months ago
anthonywj d96d75634f 切换分支备份 11 months ago
anthonywj 7e021afe6e 药品扫码相关修改 11 months ago
anthonywj e7d743faa0 切换分支备份 11 months ago
anthonywj 274aefa911 处方相关修改 11 months ago
anthonywj c2b8f4bf2e 处方分配工位修改 11 months ago
anthonywj 0f1ee49172 预出库扫码修改,处方赋码修改 11 months ago
chenhc 2860529256 feat: 处方下载 11 months ago
anthonywj 01d873f317 基础数据修改 11 months ago
chenhc 4b6ac18da9 feat: 带票出入库明细 11 months ago
anthonywj f1cd9fd1d6 四级库库存查询 11 months ago
chenhc 8fdd2a487d feat: 带票出入库明细 11 months ago
anthonywj 4e21a083b2 新增拆零队列 11 months ago
anthonywj 0cc61f9f59 新增拆零队列 11 months ago
anthonywj 17b98d8ab0 药品信息编辑以及层级包装数量换算 11 months ago
anthonywj 4409ea42e3 药品字典修改 11 months ago
anthonywj 791f8c09fd 切换分支备份,选择库存自定义界面 11 months ago
wangwei c84ff8236c 7/30 药品管理 11 months ago
anthonywj 6cde6e6fee 单据删除 11 months ago
wangwei 58a8377531 7/29 1.1 更改药品 11 months ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 11 months ago
wangwei 4d6291d1f3 Merge branch 'dev_fifo_z1' into dev_fifo_z 11 months ago
wangwei 6ab09e803f 7/29 11 months ago
anthonywj 147c9f3fa9 拆零相关修改 11 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
11 months ago
wangwei 7b0a9dd058 7/27 1.1 11 months ago
anthonywj 878f571a3b 新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等 11 months ago
anthonywj de0987058c Merge branch 'dev_fifo' into dev_fifo_z 11 months ago
wangwei 8a614fd0bc 1.1 11 months ago
anthonywj 7fd4b216aa 第三方收费明细修改 12 months ago
anthonywj c0bcbe75fc PDA登录修改 12 months ago
anthonywj 28b2a5d7ee 调拨出库往来部门问题 12 months ago