Commit Graph

83 Commits (0a28aa21f67f350d002dc2dcd40207fb0658583e)

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
1 year ago
anthonywj d96d75634f 切换分支备份 1 year ago
anthonywj 0f1ee49172 预出库扫码修改,处方赋码修改 1 year ago
anthonywj ca74b54400 切换分支备份 1 year ago
anthonywj 3f0bffd21a 收费明细多个供应商问题 1 year ago
anthonywj eaa0c50011 无批次号出库默认赋予批次号 1 year ago
anthonywj 024f027f6b 高值耗材扫码实时出库 1 year ago
anthonywj 5e62af17e7 平潭收费生成单据问题 1 year ago
anthonywj ef16874927 平潭出入库明细更新 2 years ago
anthonywj 75b29b956e 业务单生成扫码单双重校验 2 years ago
anthonywj d812b5c41f 业务单生成扫码单执行先进先出原则 2 years ago
anthonywj 04cbe6afc8 业务单生成扫码单执行先进先出原则 2 years ago
anthonywj 17c2f222e5 高值出库明细生成库存校验等 2 years ago
anthonywj 1aa81fe5de 科室出库,集采拆单 2 years ago
anthonywj 584bbcaed6 临床使用出库修改,新增采购类型,使用出库拆单补单等 2 years ago
chenhc 6c859a9470 fix: 修复临床出库过滤库存数0的供应商 2 years ago
anthonywj 640e3ed137 校验后处方结果保存 2 years ago
anthonywj f6ecc65386 患者处方相关修改优化 2 years ago
anthonywj d345794cdb 患者处方相关修改 2 years ago
anthonywj c73e2bf1f2 第三方接口修改,第三接口容错处理,患者信息相关修改,单据类型患者相关修改,临床出库患者信息选择,是否对照处方等相关配置 2 years ago
anthonywj be1475a5da 新增库存出库模式,总库库存,上级库存,当前库存 2 years ago
anthonywj 81a57129f8 价格问题 2 years ago
anthonywj 30813b31bd 新增库存过滤方式,新增内网版本更新 2 years ago
anthonywj 450dcbf2a2 申购修改 2 years ago
anthonywj 5da495fbaf 价格修改 2 years ago
anthonywj 2702e27fa0 价格问题 2 years ago
anthonywj fd31e5a224 平潭普耗相关修改,汇总统计修改 2 years ago
anthonywj 12f1851bba 业务单据打印等,出入库明细打印等 2 years ago
anthonywj 8677fb7fdc 业务单据打印相关 2 years ago
anthonywj ea411c4102 价格单据审核相关修改 2 years ago
anthonywj c91f10609f 价格校验备份 2 years ago
anthonywj 21a94967d8 业务单直接生成扫码单 2 years ago
anthonywj 1c202156b4 价格相关修改,新增库存定量设置 2 years ago
anthonywj d9d4ca1771 新增价格相关处理 2 years ago
anthonywj 1a30e1b923 手持终端下载供应商问题 2 years ago
anthonywj b4fdb1a165 替换 BeanUtil.copyProperties 2 years ago
anthonywj 23bbe2166c pda单据复制问题 2 years ago
anthonywj 84feefd4c8 手持终端提交单据校验库存/物资字典对照问题 2 years ago
anthonywj d160138cb7 切换分支备份 2 years ago
anthonywj 9320dfe462 pda待审核相关修改 2 years ago
anthonywj d8a88547fe pda带配/拣货单据修改 2 years ago
anthonywj 90f7f1f927 PDA手持终端相关接口 2 years ago
anthonywj cdffd6e6f8 更换BeanUtils.copyProperties 2 years ago
anthonywj 319484c145 1:手持终端相关接口补充
2:待校验以校验结果提交,未生成单据详情问题
2 years ago
anthonywj 5810d14716 修改诊断现存量查询,库存实时查询 2 years ago
anthonywj b3b935c0fe 根据单据类型查询问题 2 years ago
anthonywj 6ce3adb1f4 待配货,待校验提交修改 2 years ago
anthonywj 86f084836e 选入第三方业务单据修改 2 years ago
郑明梁 f81471d4e6 新增扫码单据排序 2 years ago
anthonywj e954b9b4c2 异常单据显示问题 2 years ago