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 |
anthonywj
|
fda2478831
|
切换分支备份
|
11 months ago |
|
anthonywj
|
5af357d158
|
专为平潭写的删除所有科室出库单据的接口
|
11 months ago |
wangwei
|
b757ab2ffb
|
8/12 药品字段数据
|
11 months ago |
|
wangwei
|
95cd6628f5
|
8/9 药品管理字段优化，生成单据的时候设置产品类型,响应字段，带票出入库根据订单号分组过滤
|
11 months ago |
|
anthonywj
|
6cde6e6fee
|
单据删除
|
11 months ago |
|
anthonywj
|
7fd4b216aa
|
第三方收费明细修改
|
12 months ago |
|
anthonywj
|
28b2a5d7ee
|
调拨出库往来部门问题
|
12 months ago |
|
wangwei
|
f5c5b10c21
|
7/11 sql
|
12 months ago |
|
anthonywj
|
184b3c8139
|
南靖接口调用查库存修改
|
1 year ago |
|
wangwei
|
b630f392f5
|
6/11 单据查询页面
|
1 year ago |
|
wangwei
|
2572ca2b7e
|
6/4 优化发票确认时间以及相关带票查询
|
1 year ago |
|
anthonywj
|
a6c355c091
|
单据同步删除
|
1 year ago |
|
anthonywj
|
0b257f3087
|
新增发票确认时间
|
1 year ago |
|
anthonywj
|
3cb3fcfdec
|
设备巡检管理
|
1 year ago |
|
anthonywj
|
e795be4b02
|
业务单生成扫码单数量不匹配问题
|
1 year ago |
|
anthonywj
|
506c61bf64
|
库存检验问题
|
1 year ago |
|
anthonywj
|
04cbe6afc8
|
业务单生成扫码单执行先进先出原则
|
1 year ago |
|
anthonywj
|
17c2f222e5
|
高值出库明细生成库存校验等
|
1 year ago |
|
anthonywj
|
c73e2bf1f2
|
第三方接口修改，第三接口容错处理，患者信息相关修改，单据类型患者相关修改，临床出库患者信息选择，是否对照处方等相关配置
|
2 years ago |
|
anthonywj
|
be1475a5da
|
新增库存出库模式，总库库存，上级库存，当前库存
|
2 years ago |
|
anthonywj
|
7de61eb509
|
预验收入库单区分带回与不带回
|
2 years ago |
|
anthonywj
|
6d5e0228d9
|
单据复制校验库存，申购加到货仓库
|
2 years ago |
|
anthonywj
|
30813b31bd
|
新增库存过滤方式，新增内网版本更新
|
2 years ago |
|
anthonywj
|
a038cac875
|
领用相关问题修改
|
2 years ago |
|
anthonywj
|
4631e2dfcc
|
PDA首页菜单问题
|
2 years ago |
|
anthonywj
|
ea411c4102
|
价格单据审核相关修改
|
2 years ago |
|
anthonywj
|
21a94967d8
|
业务单直接生成扫码单
|
2 years ago |
|
anthonywj
|
d9d4ca1771
|
新增价格相关处理
|
2 years ago |
|
anthonywj
|
54c7b550a2
|
单据类型添加编辑类型
|
2 years ago |
|
anthonywj
|
b4fdb1a165
|
替换 BeanUtil.copyProperties
|
2 years ago |
|
anthonywj
|
d160138cb7
|
切换分支备份
|
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 |
黄泽腾
|
1161499ed4
|
往来单位信息备份
|
2 years ago |
|
黄泽腾
|
55c2c3233d
|
中医院往来信息单位显示
|
2 years ago |
|
anthonywj
|
422f9e788c
|
新增单据核对接口
|
2 years ago |
|
anthonywj
|
a6436a4642
|
pda待校验待配货等单据下载接口
|
2 years ago |
|
anthonywj
|
5a22d137d8
|
预验收选入时增加过滤条件
|
2 years ago |
|
anthonywj
|
0b613af049
|
bug修改,物资字典boolean ->Boolean
|
2 years ago |
|
wangwei
|
79fa22c142
|
修改复制生成单据 填写备注 生成之后备注为空 问题
|
2 years ago |
郑明梁
|
ba0cfd96c9
|
维护出入库增加状态控制
|
2 years ago |
|
黄泽腾
|
55232a4b3f
|
无三期业务单配/拣货提交业务单时，会受到’有三期业务单配/拣货‘单据类型的影响
|
2 years ago |
|
anthonywj
|
447526f19c
|
误删登记状态
|
2 years ago |
|
郑明梁
|
a9f47f41b9
|
单据提交缺失备注字段
|
2 years ago |
|
anthonywj
|
4f25b9ee57
|
新增备注字段查询时查备注或病人信息
|
2 years ago |
|
郑明梁
|
01219e3f5b
|
单据查询问题修复（带校验）
|
2 years ago |
|
郑明梁
|
50edb4e747
|
单据查询问题修复（带校验）
|
2 years ago |
