chenhc
|
96dba85918
|
feat: 三方出入库明细功能
|
1 year ago |
|
chenhc
|
d4ac5e9fcf
|
feat: 增加产品-产品属性字段
|
1 year ago |
|
chenhc
|
9b652cd815
|
feat: 保存代码
|
1 year ago |
anthonywj
|
c3c232ccf8
|
ThrInvResultResponse 字段修改
|
1 year ago |
|
chenhc
|
63958a1963
|
feat: 删除测试代码
|
1 year ago |
|
chenhc
|
4db974d0df
|
feat: 代码提交
|
1 year ago |
|
chenhc
|
eb02f7b4cc
|
Merge branch '20231126-yw' into dev_ksck
# Conflicts:
# src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
# src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java
# src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java
|
1 year ago |
|
chenhc
|
8a1f122230
|
feat: 代码提交
|
1 year ago |
|
anthonywj
|
c30ba149f9
|
切换分支备份
|
1 year ago |
|
chenhc
|
da429ea7dc
|
feat: 产品新增
|
1 year ago |
|
anthonywj
|
a0b6eb4b27
|
新增产品字典字段补齐
|
1 year ago |
|
anthonywj
|
9e79e7cda9
|
Merge branch '20231126-yw' into dev_ksck
# Conflicts:
# src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java
# src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java
# src/main/java/com/glxp/api/service/thrsys/ThrInvOrderDetailService.java
# src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java
# src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml
# src/main/resources/mybatis/mapper/thrsys/ThrInvOrderMapper.xml
|
1 year ago |
|
anthonywj
|
1aa81fe5de
|
科室出库，集采拆单
|
1 year ago |
|
chenhc
|
85c9db2ae5
|
feat: 项目组套和三方出入库明细
|
1 year ago |
|
chenhc
|
2de35f3091
|
feat: 项目组套和三方出入库明细
|
1 year ago |
|
anthonywj
|
34ac7603bd
|
Merge branch '20231126-yw' into dev_ksck
|
1 year ago |
|
anthonywj
|
e3fc4cd3dc
|
第三方出入库明细
|
1 year ago |
|
chenhc
|
a20becfb13
|
feat: 耗材字典新增功能
|
1 year ago |
|
anthonywj
|
be5ce3104b
|
新增产品属性
|
1 year ago |
|
anthonywj
|
584bbcaed6
|
临床使用出库修改，新增采购类型，使用出库拆单补单等
|
1 year ago |
|
chenhc
|
a83523fe58
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
1 year ago |
|
chenhc
|
87600e2b3e
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
1 year ago |
|
chenhc
|
6c859a9470
|
fix: 修复临床出库过滤库存数0的供应商
|
1 year ago |
|
anthonywj
|
ea708c5303
|
预验收库存校验问题
|
1 year ago |
yuanwei
|
65cd5b0ec5
|
合并冲突
|
1 year ago |
|
yuanwei
|
7a74235bcd
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
1 year ago |
|
anthonywj
|
04f790caf8
|
单据重复上传问题，东山第三方产品信息新增库房代码
|
1 year ago |
|
anthonywj
|
6b22bfb862
|
第三方产品信息过滤问题
|
1 year ago |
|
yuanwei
|
7ffe727deb
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
# Conflicts:
# src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
|
1 year ago |
|
anthonywj
|
805c82e972
|
新增生产企业字典维护
|
1 year ago |
|
anthonywj
|
1ed3360997
|
新增第三方生产企业
|
1 year ago |
|
anthonywj
|
3f06c5a1dd
|
审核人问题
|
1 year ago |
|
anthonywj
|
4854df1f7f
|
申购问题
|
1 year ago |
|
anthonywj
|
0a0155a967
|
1：东山nginx转发问题(头部参数修改);
2：再次领用；再次申购问题；
3.生成内部码是否以最小使用单元问题
|
1 year ago |
|
anthonywj
|
c065ed3a6d
|
集采拆单问题
|
1 year ago |
|
anthonywj
|
d970162fca
|
库存对比修改
|
1 year ago |
|
anthonywj
|
640e3ed137
|
校验后处方结果保存
|
1 year ago |
|
anthonywj
|
bc4b627077
|
患者信息远程下载，提供中医院设备查询界面
|
1 year ago |
|
anthonywj
|
b73e4a3826
|
预验收补单多个供应商带入不同产品
|
2 years ago |
|
anthonywj
|
3ff1367628
|
协调平台查询出入库新增序列号查询
|
2 years ago |
|
anthonywj
|
77525665e9
|
设备入库，变更，销毁等修改，自定义汇总统修改
|
2 years ago |
|
anthonywj
|
5fad9e2835
|
新增自定义库存明细汇总
|
2 years ago |
|
anthonywj
|
4508e48438
|
患者往来单位问题
|
2 years ago |
|
anthonywj
|
f6ecc65386
|
患者处方相关修改优化
|
2 years ago |
|
anthonywj
|
d345794cdb
|
患者处方相关修改
|
2 years ago |
|
anthonywj
|
270410daea
|
s设备标签打印问题
|
2 years ago |
|
anthonywj
|
c73e2bf1f2
|
第三方接口修改，第三接口容错处理，患者信息相关修改，单据类型患者相关修改，临床出库患者信息选择，是否对照处方等相关配置
|
2 years ago |
|
anthonywj
|
5f110bea39
|
患者处方相关修改
|
2 years ago |
wj
|
1df50657b0
|
设备相关
|
2 years ago |
|
anthonywj
|
33676f7c2f
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
anthonywj
|
27cc68ff98
|
新增库存出库模式，总库库存，上级库存，当前库存
|
2 years ago |
|
wj
|
45bd2c8e1e
|
调整
|
2 years ago |
|
yuanwei
|
b5108288a5
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
yuanwei
|
e8a0c53057
|
集成动态表单
|
2 years ago |
|
anthonywj
|
be1475a5da
|
新增库存出库模式，总库库存，上级库存，当前库存
|
2 years ago |
|
yuanwei
|
ba23b3e90e
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
yuanwei
|
b382a19fc4
|
出入库单管理配置
|
2 years ago |
|
anthonywj
|
6d0090c058
|
长泰新增配送产品，物资分类问题
|
2 years ago |
|
yuanwei
|
508e93bb91
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
yuanwei
|
9b4ac353f7
|
单据管理
|
2 years ago |
|
anthonywj
|
f79458bb45
|
长泰新增配送产品，物资分类问题
|
2 years ago |
|
anthonywj
|
e7cdbf7140
|
第三方产品信息上传
|
2 years ago |
|
anthonywj
|
81a57129f8
|
价格问题
|
2 years ago |
|
anthonywj
|
7ef66921cf
|
切换分支备份
|
2 years ago |
|
anthonywj
|
d17110bcaf
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
anthonywj
|
9dba332648
|
切换分支备份
|
2 years ago |
|
yuanwei
|
498c3be047
|
出入库单管理配置
|
2 years ago |
|
yuanwei
|
6502b3a7a7
|
出入库单管理配置
|
2 years ago |
|
yuanwei
|
91b6e4ff2f
|
采购订单管理配置
|
2 years ago |
|
yuanwei
|
0d2eb0d69c
|
计划管理配置
|
2 years ago |
|
yuanwei
|
a257c8a3a7
|
申购管理配置
|
2 years ago |
|
yuanwei
|
600a688072
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
wj
|
08d4462530
|
调整
|
2 years ago |
|
yuanwei
|
9112dbdf08
|
领用管理提交
|
2 years ago |
|
yuanwei
|
31144b596b
|
字典功能处理
|
2 years ago |
|
anthonywj
|
426b966cb3
|
合并分支备份
|
2 years ago |
|
yuanwei
|
1ad478b286
|
初始化动态配置
|
2 years ago |
|
yuanwei
|
1eab520dfd
|
初始化动态配置
|
2 years ago |
|
anthonywj
|
399d6c3881
|
出入库明细单据类型
|
2 years ago |
|
anthonywj
|
677f368635
|
退货补单，多级仓库补单修改，新增灭菌批号，灭菌日期
|
2 years ago |
|
anthonywj
|
f839f4633d
|
单据打印，库存查询修改
|
2 years ago |
|
anthonywj
|
32bd31903d
|
每日汇总统计等
|
2 years ago |
|
anthonywj
|
4d307a42a3
|
单据按di排序
|
2 years ago |
|
anthonywj
|
7de61eb509
|
预验收入库单区分带回与不带回
|
2 years ago |
|
anthonywj
|
8bde8b365c
|
selectByRelId
|
2 years ago |
|
anthonywj
|
a277bc0ba2
|
项目组套相关更新
|
2 years ago |
|
anthonywj
|
15e7286003
|
患者信息，处方信息下载
|
2 years ago |
|
anthonywj
|
7450916af4
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
anthonywj
|
5085b66a7f
|
新增物价类别
|
2 years ago |
|
wj
|
d817527800
|
调整
|
2 years ago |
|
wj
|
fc4cbf3cf3
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
wj
|
a83e44fad4
|
调整
|
2 years ago |
|
anthonywj
|
d7109caf5a
|
物资分类添加仓库与部门
|
2 years ago |
|
anthonywj
|
f23c0136dd
|
新增退货补单流程，诏安两个分库问题，单据明细打印问题
|
2 years ago |
|
anthonywj
|
0264531d28
|
修改产品资质证书添加规格型号
|
2 years ago |
|
anthonywj
|
6f43a8a666
|
库存添加过滤条件，领用单据流转生成出入库单据，DI查询库存
|
2 years ago |
|
anthonywj
|
6d5e0228d9
|
单据复制校验库存，申购加到货仓库
|
2 years ago |
|
anthonywj
|
30813b31bd
|
新增库存过滤方式，新增内网版本更新
|
2 years ago |
|
anthonywj
|
9904fff69f
|
按部门获取仓单据类型
|
2 years ago |
|
anthonywj
|
ed4dc216bb
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
