Commit Graph

13 Commits (40913d3813c3a53548ee414481d6636a4db7c6ed)

Author SHA1 Message Date
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
wangwei b757ab2ffb 8/12 药品字段数据 11 months ago
wangwei 95cd6628f5 8/9 药品管理字段优化,生成单据的时候设置产品类型,响应字段,带票出入库根据订单号分组过滤 11 months ago
wangwei dfe7b8769e 8/8 药品搜索字段以及插入字段维护 11 months ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 11 months ago
chenhc 8bf33df981 feat: 0531增加是否需要扫码字段 1 year ago
chenhc b096280db6 feat: 设备管理优化-0513-合同管理复制 1 year ago
chenhc fc91a02cf4 feat: 医保耗材信息增加字段 1 year ago
anthonywj 584bbcaed6 临床使用出库修改,新增采购类型,使用出库拆单补单等 1 year ago
anthonywj 651a0ef658 内部码打印问题,启用使用单元数量问题,申购系统繁忙问题 2 years ago
wangwei dbaa3cf85e 修改 维护往来id问题 2 years ago
郑明梁 37be575f8e 内部码打印功能代码提交 2 years ago
anthonywj 58bf32ddf5 供应商耗材字典管理,单据管理 2 years ago