Commit Graph

2345 Commits (b7ff531f30b9bcbf1ebe34cae577219c25ea80a7)
 

Author SHA1 Message Date
zane 136334c444 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
zane b2b34206da 单据 10 months ago
wangwei 40e1e228c5 增加字段 10 months ago
wangwei e38fe7250b Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei 3157887c6a 增加第三方产品 制剂规格和制剂单位 10 months ago
wangwei 12070e3c36 9/5 第三方产品增加制剂规格和制剂单位 10 months ago
zane bbdbb1ac0e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
chenhc c5007e249c fix: 不做锁的互斥 10 months ago
zane 4dc9eb6d12 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj bb46fbd9d5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj 252a3a6106 自动赋码逻辑修改 10 months ago
chenhc 4a266cb8fd fix: 扫码回车触发处方下载 10 months ago
chenhc 976a3bf411 fix: 扫码回车触发处方下载 10 months ago
yewj 65d6d718c1 自动赋码逻辑修改 10 months ago
zane 8d5e61cc14 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj c78b04188e 代码备份 10 months ago
chenhc 2e77aa6bd5 fix: 原始转待处理修改 10 months ago
yewj 82973f06be 处方单据时间问题 10 months ago
yewj 8b76c7d458 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj b00841f3bf 单据上传 10 months ago
zane 44a924973e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei a99bbe942e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei a068acd71a 9/4 bug 修改 10 months ago
yewj 78f87227f1 单据上传 10 months ago
yewj 00788a0597 代码备份 10 months ago
chenhc 1ae16bd771 fix: 请求方式修改 10 months ago
zane a750f65344 搜索bug 10 months ago
wangwei 85bee382c4 9/3 追溯码查询1.0 10 months ago
yewj affd4a9e8e 代码备份 10 months ago
wangwei 0500733b55 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei d3c9544dc1 9/2 药品关联 10 months ago
zane 9c3d1b94ab 单据上传状态 10 months ago
wangwei f032261e1f 8/2 损耗出库库存修改 10 months ago
zane c313dba342 单据上传状态 10 months ago
zane 94abad9642 单据上传 10 months ago
yewj e83a0ecdb7 医保单据上传修改 10 months ago
zane a052a6582b 单据上传 10 months ago
chenhc b66f0d5fc2 fix: sql 10 months ago
wangwei 0cb38e625f 9/2 下载处方信息 10 months ago
yewj 59a762c5bf 单据上传与下载 10 months ago
zane f17b2d5b79 类型bug 10 months ago
yewj bcbcda9ebb 代码备份 10 months ago
yewj 8ea1b42e7d 代码备份 10 months ago
wangwei 1b36ce9bb2 8/91 优化 10 months ago
wangwei 27b1a4e5ee 8/31 损耗出库修改 业务类型增加 是否独占 10 months ago
chenhc ace5595719 fix: 是否自动赋码 10 months ago
yewj bb2d265e22 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java
10 months ago
yewj 7a01a5c5ae 拆零损耗出库 10 months ago
wangwei 71cc6024a5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
zane 30aba260ec 调整排序 10 months ago