chenhc
|
8e68e2d8d2
|
feat: 三方出入库明细功能
|
2 years ago |
|
chenhc
|
9e75867541
|
feat: 三方出入库明细功能
|
2 years ago |
anthonywj
|
eea1eab737
|
ThrInvResultResponse 字段修改
|
2 years ago |
|
chenhc
|
1f116efd92
|
feat: 三方出入库明细功能
|
2 years ago |
|
chenhc
|
8c0e5a73ba
|
feat: 三方出入库明细功能
|
2 years ago |
|
chenhc
|
96dba85918
|
feat: 三方出入库明细功能
|
2 years ago |
|
chenhc
|
d4ac5e9fcf
|
feat: 增加产品-产品属性字段
|
2 years ago |
|
chenhc
|
9b652cd815
|
feat: 保存代码
|
2 years ago |
|
anthonywj
|
c3c232ccf8
|
ThrInvResultResponse 字段修改
|
2 years ago |
|
chenhc
|
f9dc77b126
|
feat: 删除测试代码
|
2 years ago |
|
chenhc
|
63958a1963
|
feat: 删除测试代码
|
2 years ago |
|
chenhc
|
4db974d0df
|
feat: 代码提交
|
2 years 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
|
2 years ago |
|
chenhc
|
8a1f122230
|
feat: 代码提交
|
2 years ago |
|
anthonywj
|
c30ba149f9
|
切换分支备份
|
2 years ago |
|
chenhc
|
da429ea7dc
|
feat: 产品新增
|
2 years ago |
|
anthonywj
|
a0b6eb4b27
|
新增产品字典字段补齐
|
2 years 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
|
2 years ago |
|
anthonywj
|
1aa81fe5de
|
科室出库，集采拆单
|
2 years ago |
|
chenhc
|
85c9db2ae5
|
feat: 项目组套和三方出入库明细
|
2 years ago |
|
chenhc
|
2de35f3091
|
feat: 项目组套和三方出入库明细
|
2 years ago |
|
anthonywj
|
34ac7603bd
|
Merge branch '20231126-yw' into dev_ksck
|
2 years ago |
|
anthonywj
|
e3fc4cd3dc
|
第三方出入库明细
|
2 years ago |
|
chenhc
|
a20becfb13
|
feat: 耗材字典新增功能
|
2 years ago |
|
anthonywj
|
be5ce3104b
|
新增产品属性
|
2 years ago |
|
anthonywj
|
584bbcaed6
|
临床使用出库修改，新增采购类型，使用出库拆单补单等
|
2 years ago |
|
chenhc
|
a83523fe58
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
chenhc
|
87600e2b3e
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
chenhc
|
6c859a9470
|
fix: 修复临床出库过滤库存数0的供应商
|
2 years ago |
|
anthonywj
|
ea708c5303
|
预验收库存校验问题
|
2 years ago |
yuanwei
|
65cd5b0ec5
|
合并冲突
|
2 years ago |
|
yuanwei
|
7a74235bcd
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
|
anthonywj
|
04f790caf8
|
单据重复上传问题，东山第三方产品信息新增库房代码
|
2 years ago |
|
anthonywj
|
6b22bfb862
|
第三方产品信息过滤问题
|
2 years ago |
|
yuanwei
|
7ffe727deb
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
# Conflicts:
# src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
|
2 years ago |
|
anthonywj
|
805c82e972
|
新增生产企业字典维护
|
2 years ago |
|
anthonywj
|
1ed3360997
|
新增第三方生产企业
|
2 years ago |
|
anthonywj
|
3f06c5a1dd
|
审核人问题
|
2 years ago |
|
anthonywj
|
4854df1f7f
|
申购问题
|
2 years ago |
|
anthonywj
|
0a0155a967
|
1：东山nginx转发问题(头部参数修改);
2：再次领用；再次申购问题；
3.生成内部码是否以最小使用单元问题
|
2 years ago |
|
anthonywj
|
c065ed3a6d
|
集采拆单问题
|
2 years ago |
|
anthonywj
|
d970162fca
|
库存对比修改
|
2 years ago |
|
anthonywj
|
640e3ed137
|
校验后处方结果保存
|
2 years ago |
|
anthonywj
|
bc4b627077
|
患者信息远程下载，提供中医院设备查询界面
|
2 years 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
|
a0f90b9653
|
库存显示数量
|
2 years ago |
|
anthonywj
|
1372f4d92f
|
第三方产品信息上传
|
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 |
|
anthonywj
|
cd25fab565
|
UDI物资流向查询未查询到数据问题
|
2 years ago |
|
wj
|
b34ad7e181
|
调整
|
2 years ago |
|
wj
|
098280532f
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
wj
|
41babe7e64
|
库存对比相关--未完结
|
2 years ago |
|
anthonywj
|
b1ece4dbc6
|
申购添加商品名称等字段
|
2 years ago |
|
anthonywj
|
e192f70aba
|
患者信息，患者处方等相关接口新增
|
2 years ago |
|
anthonywj
|
c20dcbd4a5
|
患者信息，患者处方等相关接口新增
|
2 years ago |
|
anthonywj
|
bbc21a1a97
|
udi追溯查询
|
2 years ago |
|
anthonywj
|
4b0d54ba71
|
添加患者相关操作类，打印问题修改，项目、定数包相关修改
|
2 years ago |
|
anthonywj
|
00c2995717
|
预验收库存，领用等修改
|
2 years ago |
|
anthonywj
|
a038cac875
|
领用相关问题修改
|
2 years ago |
|
anthonywj
|
450dcbf2a2
|
申购修改
|
2 years ago |
|
anthonywj
|
4f35b8365f
|
库存仓库领用等修改
|
2 years ago |
|
anthonywj
|
2eb50644dc
|
领用预验收库存不足，领用相关问题修改
|
2 years ago |
|
anthonywj
|
974f1aca65
|
第三方服务修改
|
2 years ago |
|
anthonywj
|
5da495fbaf
|
价格修改
|
2 years ago |
|
anthonywj
|
2702e27fa0
|
价格问题
|
2 years ago |
|
anthonywj
|
8f3f7abf94
|
平潭普耗相关修改，汇总统计修改
|
2 years ago |
|
anthonywj
|
fd31e5a224
|
平潭普耗相关修改，汇总统计修改
|
2 years ago |
|
anthonywj
|
463ddaa3c3
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
anthonywj
|
e319a9888d
|
汇总统计
|
2 years ago |
|
wj
|
019635b291
|
调整
|
2 years ago |
|
wj
|
25b1e51633
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
|
wj
|
b65d72d1d5
|
调整/还原
|
2 years ago |
|
anthonywj
|
70323f2e5f
|
领用获取上级仓库
|
2 years ago |
|
anthonywj
|
4631e2dfcc
|
PDA首页菜单问题
|
2 years ago |
|
wj
|
feccc47758
|
调整
|
2 years ago |
|
wj
|
9fd6e1a41b
|
调整
|
2 years ago |
|
wj
|
006ada7ca6
|
调整
|
2 years ago |
|
anthonywj
|
b1a99cced7
|
盘点功能优化
|
2 years ago |
|
anthonywj
|
94e09d6d8d
|
盘点相关功能--盘点方式，部分盘点修改
|
2 years ago |
|
anthonywj
|
0074c56c9d
|
盘点相关功能
|
2 years ago |
|
anthonywj
|
b626d39d0d
|
盘点接口相关调整
|
2 years ago |
|
anthonywj
|
474971fb2f
|
新增盘点功能代码
|
2 years ago |
|
anthonywj
|
1b3c16482a
|
移除盘点相关功能
|
2 years ago |
|
anthonywj
|
1b6eb549d8
|
设备管理相关代码整理
|
2 years ago |
|
anthonywj
|
ae8c560cde
|
代码备份
|
2 years ago |
|
anthonywj
|
81e39ce167
|
耗材字典多个DI问题
|
2 years ago |
|
anthonywj
|
16e5b8de59
|
耗材字典多个DI问题
|
2 years ago |
|
anthonywj
|
12f1851bba
|
业务单据打印等，出入库明细打印等
|
2 years ago |
|
anthonywj
|
8677fb7fdc
|
业务单据打印相关
|
2 years ago |
|
anthonywj
|
ac4774981d
|
定量设置相关修改
|
2 years ago |
|
anthonywj
|
7a1f295fa7
|
单据审核相关修改
|
2 years ago |
|
anthonywj
|
ea411c4102
|
价格单据审核相关修改
|
2 years ago |
|
anthonywj
|
c91f10609f
|
价格校验备份
|
2 years ago |
|
anthonywj
|
d294d54d0c
|
定量设置相关调整
|
2 years ago |
|
anthonywj
|
af02503996
|
定量设置相关调整
|
2 years ago |
|
anthonywj
|
21a94967d8
|
业务单直接生成扫码单
|
2 years ago |
|
anthonywj
|
1c202156b4
|
价格相关修改，新增库存定量设置
|
2 years ago |
|
anthonywj
|
d9d4ca1771
|
新增价格相关处理
|
2 years ago |
|
anthonywj
|
a7c709c2e7
|
手持终端登录，审核等问题修改
|
2 years ago |
|
anthonywj
|
5f3aca56b2
|
超时修改密码
|
2 years ago |
|
anthonywj
|
1a30e1b923
|
手持终端下载供应商问题
|
2 years ago |
|
anthonywj
|
dbd58892ee
|
单据类型初始化问题
|
2 years ago |
|
anthonywj
|
5ab0fa6296
|
单据关联相关修改
|
2 years ago |
|
anthonywj
|
54c7b550a2
|
单据类型添加编辑类型
|
2 years ago |
|
anthonywj
|
44baefc855
|
系统升级相关修改
|
2 years ago |
|
anthonywj
|
9c55e09932
|
添加校验库存日志
|
2 years ago |
|
anthonywj
|
b4205b7cf3
|
系统升级bug修改
|
2 years ago |
|
anthonywj
|
2806032885
|
系统升级bug修改
|
2 years ago |
|
anthonywj
|
50456615ab
|
预验收退库修改
|
2 years ago |
|
anthonywj
|
b7ac44591c
|
切换分支备份
|
2 years ago |
|
anthonywj
|
b4fdb1a165
|
替换 BeanUtil.copyProperties
|
2 years ago |
|
anthonywj
|
e854b3c5b3
|
单据验收加日志查看
|
2 years ago |
|
anthonywj
|
3847e021b2
|
登录菜单问题
|
2 years ago |
|
anthonywj
|
23bbe2166c
|
pda单据复制问题
|
2 years ago |
|
anthonywj
|
4aa038d37d
|
手持终端预验收单据关键字查询
|
2 years ago |
|
anthonywj
|
b16422ae15
|
手持终端单据验收问题
|
2 years ago |
|
anthonywj
|
cfdfe112ed
|
预验收价格问题
|
2 years ago |
|
anthonywj
|
c621ac9e0f
|
单据维护减一问题
|
2 years ago |
|
anthonywj
|
84feefd4c8
|
手持终端提交单据校验库存/物资字典对照问题
|
2 years ago |
|
anthonywj
|
490df6ea57
|
s手持终端库存校验问题
|
2 years ago |
|
anthonywj
|
d160138cb7
|
切换分支备份
|
2 years ago |
郑明梁
|
4eb08d179c
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
郑明梁
|
f835362043
|
设备代码提交
|
2 years ago |
|
anthonywj
|
9320dfe462
|
pda待审核相关修改
|
2 years ago |
|
anthonywj
|
d8a88547fe
|
pda带配/拣货单据修改
|
2 years ago |
|
郑明梁
|
f3fa41f087
|
设备代码提交
|
2 years ago |
|
郑明梁
|
52e1ffd273
|
设备代码提交
|
2 years ago |
|
郑明梁
|
06ebf55ed0
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
# src/main/resources/schemas/schema_v2.2.sql
|
2 years ago |
|
郑明梁
|
af21cfdf13
|
设备代码提交
|
2 years ago |
|
anthonywj
|
90f7f1f927
|
PDA手持终端相关接口
|
2 years ago |
|
anthonywj
|
b6abc005f3
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
郑明梁
|
20b6055f1b
|
设备代码提交
|
2 years ago |
|
anthonywj
|
6da8fa4a2c
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
黄泽腾
|
e699316e91
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
黄泽腾
|
a3cb6e57e1
|
设备管理-技术资料
|
2 years ago |
|
anthonywj
|
5b15f6ff45
|
诊断第三方产品信息定时选入时，自动添加到耗材字典
|
2 years ago |
|
anthonywj
|
c62383ff51
|
自定义头部参数代码备份
|
2 years ago |
|
郑明梁
|
70483edee8
|
设备代码提交
|
2 years ago |
|
anthonywj
|
4a8fb12b43
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
anthonywj
|
dec79c047d
|
新增已执行次数字段；
自定义前端表头字段相关操作类
|
2 years ago |
|
黄泽腾
|
3e43f5f1c4
|
设备管理-设备资质
|
2 years ago |
|
anthonywj
|
24cd753745
|
设备明细表字段补充
|
2 years ago |
|
郑明梁
|
fe1f7e92e6
|
设备领用查看代码提交
|
2 years ago |
|
黄泽腾
|
ceb2ac74a8
|
设备管理-设备资质
|
2 years ago |
|
anthonywj
|
a77d2ca199
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
anthonywj
|
e16a34bc39
|
巡检计划定时任务补充（未完成）
|
2 years ago |
|
郑明梁
|
48431be244
|
设备领用审核代码提交
|
2 years ago |
|
anthonywj
|
ba5731260b
|
设备管理设备位置字典表
|
2 years ago |
|
anthonywj
|
795cd78540
|
生产企业字典相关代码
|
2 years ago |
|
anthonywj
|
98951a39f0
|
设备使用记录相关操作类
|
2 years ago |
|
anthonywj
|
024431999a
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
anthonywj
|
d31eee08c3
|
设备相关人员操作类
|
2 years ago |
|
郑明梁
|
8375447cc4
|
设备领用代码提交
|
2 years ago |
|
郑明梁
|
671131105a
|
设备领用代码提交
|
2 years ago |
|
anthonywj
|
14254daeb7
|
设备资质相关操作类
|
2 years ago |
|
anthonywj
|
4d6f807791
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
anthonywj
|
cdffd6e6f8
|
更换BeanUtils.copyProperties
|
2 years ago |
|
黄泽腾
|
ce3ceeeff7
|
新增申购单点击产品录入时显示系统繁忙
|
2 years ago |
|
黄泽腾
|
e91a030744
|
bug修复
|
2 years ago |
|
郑明梁
|
02335c77aa
|
设备sql提交
|
2 years ago |
|
郑明梁
|
5c5f667cf5
|
设备代码提交
|
2 years ago |
|
anthonywj
|
319484c145
|
1：手持终端相关接口补充
2：待校验以校验结果提交，未生成单据详情问题
|
2 years ago |
|
黄泽腾
|
1161499ed4
|
往来单位信息备份
|
2 years ago |
|
郑明梁
|
e5d967895b
|
设备bug修复
|
2 years ago |
|
郑明梁
|
b853ee66a5
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
郑明梁
|
eec65dea6c
|
设备bug修复
|
2 years ago |
|
anthonywj
|
66efd57b70
|
设备任务相互同步
|
2 years ago |
|
anthonywj
|
113457a42a
|
设备任务相互同步
|
2 years ago |
|
anthonywj
|
c3a8c5da54
|
删除任务同步相关调整（后续还需调整）
|
2 years ago |
|
anthonywj
|
1931ece8a3
|
修改设备任务ID为雪花ID（自增同步会有问题）
|
2 years ago |
|
anthonywj
|
d28b4f1699
|
同步任务备份
|
2 years ago |
|
郑明梁
|
a50fc4f2fb
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
郑明梁
|
025d2d4b67
|
设备任务同步到自助
|
2 years ago |
wangwei
|
89e11d3572
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
|
郑明梁
|
d5bcc60287
|
设备sql提交
|
2 years ago |
|
wangwei
|
836343539f
|
修改新增送货单 录入产品 指定备案号选入后出现多条问题
|
2 years ago |
|
郑明梁
|
a7725c066c
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
郑明梁
|
1b271cab9d
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
|
郑明梁
|
57596c1528
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
6f83935215
|
采购订单供应商字段为空问题修复
|
2 years ago |
|
anthonywj
|
2ac43431a4
|
第三方业务单据下载重复问题
|
2 years ago |
|
wangwei
|
838789986a
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
wangwei
|
b400a08d83
|
同步删除基础数据
|
2 years ago |
|
anthonywj
|
8cb095693c
|
第三方单据下载异常回滚问题
|
2 years ago |
|
郑明梁
|
10091d6d35
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
郑明梁
|
14dc22481b
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
|
anthonywj
|
df219f13c4
|
切换分支代码备份
|
2 years ago |
|
郑明梁
|
2771e60a67
|
设备bug修改提交
|
2 years ago |
|
anthonywj
|
4da98ae46d
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
anthonywj
|
4eb14efc5f
|
手持终端获取单据类型
|
2 years ago |
|
郑明梁
|
a88db37eb6
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
|
郑明梁
|
0990597b59
|
设备bug修改提交
|
2 years ago |
薛宇
|
7ee7d05d2b
|
配置
|
2 years ago |
|
黄泽腾
|
9dd61ba841
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
# src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
# src/main/resources/application-dev.yml
|
2 years ago |
|
黄泽腾
|
55c2c3233d
|
中医院往来信息单位显示
|
2 years ago |
|
郑明梁
|
e3dae86c72
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
|
郑明梁
|
a268df2cdb
|
设备bug修改提交
|
2 years ago |
|
薛宇
|
b44f38ef0c
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
# src/main/resources/application-dev.yml
|
2 years ago |
|
薛宇
|
e05519acc1
|
资质上传
|
2 years ago |
|
anthonywj
|
1409fdc451
|
接口地址重复
|
2 years ago |
|
郑明梁
|
aa5d34fdd9
|
业务菜单sql提交
|
2 years ago |
|
郑明梁
|
28e0ef79b7
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
郑明梁
|
d507470059
|
业务菜单sql提交
|
2 years ago |
|
anthonywj
|
249edf57b8
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
anthonywj
|
422f9e788c
|
新增单据核对接口
|
2 years ago |
|
郑明梁
|
60f9a148de
|
领用代码提交
|
2 years ago |
|
黄泽腾
|
0d85313688
|
Merge branch 'dev' into dev2.0
|
2 years ago |
|
anthonywj
|
a6436a4642
|
pda待校验待配货等单据下载接口
|
2 years ago |
|
郑明梁
|
4ffe2f71c8
|
库存代码提交
|
2 years ago |
|
郑明梁
|
1514065484
|
库存代码提交
|
2 years ago |
|
黄泽腾
|
8af8962464
|
发票DI编码展示
|
2 years ago |
|
黄泽腾
|
0a1f3ab488
|
新增设备领用‘手动添加’窗口列表中的产品不会显示供应商名称
|
2 years ago |
|
薛宇
|
384a0f54cc
|
领用仓库选择二级仓库的话，可以领用上一级中心库的产品
|
2 years ago |
|
anthonywj
|
40f8701bc2
|
新增同步操作日志相关方法
|
2 years ago |
|
anthonywj
|
cc2cd0b511
|
新增同步操作日志相关方法
|
2 years ago |
|
anthonywj
|
161e457797
|
Merge branch 'dev' into dev2.0
|
2 years ago |
|
anthonywj
|
79033ac6b1
|
切换分支备份
|
2 years ago |
|
薛宇
|
5367acb349
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
6cac80437b
|
明细列表中的‘DI/物资编码’字段显示有误
|
2 years ago |
|
wangwei
|
b5c1f907eb
|
巡检 添加查询字段
|
2 years ago |
|
anthonywj
|
13ada50cc3
|
Merge branch 'dev' into ywj_dev
# Conflicts:
# src/main/resources/application-dev.yml
# src/main/resources/schemas/schema_v2.2.sql
|
2 years ago |
|
anthonywj
|
c0a9d39535
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/resources/schemas/schema_v2.2.sql
|
2 years ago |
|
anthonywj
|
8cf48f17d2
|
新增控制是否只校验批次号
|
2 years ago |
|
郑明梁
|
a8ad971567
|
设备报修代码提交
|
2 years ago |
|
薛宇
|
48904a0239
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
e5d28786dd
|
设备报修代码提交
|
2 years ago |
|
wangwei
|
cffb595319
|
报修详情接口
|
2 years ago |
|
wangwei
|
c959fc118d
|
报修详情接口
|
2 years ago |
|
wangwei
|
21294acab7
|
详情接口
|
2 years ago |
|
wangwei
|
6d8e7bdf87
|
报修详情接口
|
2 years ago |
|
anthonywj
|
f7cbc4f69d
|
socket链接问题
|
2 years ago |
|
郑明梁
|
8be3506529
|
设备巡检任务新增任务级别和保修类型字段
|
2 years ago |
|
郑明梁
|
f6f9b599a5
|
设备保修详情代码提交
|
2 years ago |
|
郑明梁
|
32c2798027
|
设备巡检任务代码提交
|
2 years ago |
|
郑明梁
|
c67e86556f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
d66303b2fb
|
设备巡检任务代码提交
|
2 years ago |
|
anthonywj
|
5d8e8861b9
|
Merge branch 'dev' into ywj_dev
# Conflicts:
# src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
# src/main/resources/application-dev.yml
# src/main/resources/schemas/schema_v2.2.sql
|
2 years ago |
|
薛宇
|
5c788f950c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
d086c63ab2
|
根据全局设置项，不校验生产日期和失效日期
|
2 years ago |
|
anthonywj
|
c57b6a645f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
