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
|
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 |
|
郑明梁
|
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 |
|
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 |
|
黄泽腾
|
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 |
|
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 |
|
薛宇
|
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 |
|
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 |
|
anthonywj
|
cda668a04b
|
第三方单据下载问题
|
2 years ago |
|
wangwei
|
1a87f29e4d
|
我的巡检任务
|
2 years ago |
|
anthonywj
|
8e102c1659
|
第三方产品信息异常问题（回滚）
|
2 years ago |
|
anthonywj
|
ad2a95e94c
|
诊断单据产品下载问题
|
2 years ago |
|
anthonywj
|
6d1f77967a
|
打包后消息同步问题
|
2 years ago |
|
郑明梁
|
7588e50521
|
设备巡检计划代码提交
|
2 years ago |
|
郑明梁
|
680e6b9979
|
设备状态类型代码提交
|
2 years ago |
|
郑明梁
|
6c66ec37ca
|
设备代码提交
|
2 years ago |
|
wangwei
|
76e3df3611
|
报修查询接口优化
|
2 years ago |
|
anthonywj
|
5a22d137d8
|
预验收选入时增加过滤条件
|
2 years ago |
|
wangwei
|
b27758f8db
|
报修单 维保设备清单
|
2 years ago |
|
黄泽腾
|
f69b85697c
|
物资资质新增--新增配送产品资质信息
|
2 years ago |
|
薛宇
|
f189d0b6a3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
6a3d9113f6
|
新增发票确认实时同步
|
2 years ago |
|
anthonywj
|
1476a0f894
|
新增websocket通信（中继服务同步相关）
|
2 years ago |
|
郑明梁
|
eeb03f7226
|
单据上传状态
|
2 years ago |
|
anthonywj
|
358081e37e
|
添加每日汇总测试接口
|
2 years ago |
|
anthonywj
|
3da6898176
|
自助平台确认状态同步问题
|
2 years ago |
|
wangwei
|
3585dde191
|
新增领用过滤零库存和负库存 保存时判断库存
|
2 years ago |
|
anthonywj
|
d9371c48f5
|
新增设备管理相关实体类与字段
|
2 years ago |
|
anthonywj
|
fdd3351a13
|
单据维护删除系统繁忙问题
|
2 years ago |
|
anthonywj
|
ddc5eab3cd
|
协调平台时间格式问题
|
2 years ago |
|
郑明梁
|
c39ffb1587
|
业务单缺失注册证号
|
2 years ago |
|
郑明梁
|
8e269ac3b5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
334523f8c9
|
单据查询问题修改
|
2 years ago |
|
anthonywj
|
1846ce85dc
|
发票相关以orderresult表为准
|
2 years ago |
|
anthonywj
|
de7412b096
|
库存无批次号系统繁忙问题
|
2 years ago |
|
薛宇
|
8303e81597
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
7fefd6dc24
|
追溯查询排序问题
|
2 years ago |
|
郑明梁
|
73c14e4e01
|
预验收库存不足问题修复
|
2 years ago |
|
薛宇
|
c43873fafd
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
0b613af049
|
bug修改,物资字典boolean ->Boolean
|
2 years ago |
|
薛宇
|
a1e607223a
|
养护记录提示
|
2 years ago |
|
薛宇
|
9be30bb338
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
430d5b2604
|
打印修改
|
2 years ago |
|
薛宇
|
7f3d03587f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wangwei
|
79fa22c142
|
修改复制生成单据 填写备注 生成之后备注为空 问题
|
2 years ago |
|
薛宇
|
a14a6140bf
|
库存查询的注册/备案号显示多个
|
2 years ago |
|
anthonywj
|
c5f47f8139
|
bug修改，新增单据验收补单校验
|
2 years ago |
|
wangwei
|
d69f9449e7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wangwei
|
18c83f4318
|
修改 产品di未绑定多个产品id 扫入条码弹指定产品的弹窗 问题
|
2 years ago |
|
郑明梁
|
88552a28d9
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
|
2 years ago |
|
郑明梁
|
3b0d22d0e0
|
单据bug修改
|
2 years ago |
|
wangwei
|
7f6f78f776
|
修改 编辑出入库单据流转设置中 无法切换 审核状态问题
|
2 years ago |
|
wangwei
|
0f73bcb8d5
|
修改 无序产品进行出库时 将数量编辑成结余数量 提示库存不足问题
|
2 years ago |
|
黄泽腾
|
7cd0d1c06d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
6daef0a567
|
字段更正
|
2 years ago |
|
anthonywj
|
dc78894221
|
新增自助平台与UDI管理系统库存校验同步
|
2 years ago |
|
郑明梁
|
49f578d505
|
加上规则注释
|
2 years ago |
|
郑明梁
|
ba0cfd96c9
|
维护出入库增加状态控制
|
2 years ago |
|
郑明梁
|
910bfe0e8e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
abc95ff8a4
|
模板增加字段
|
2 years ago |
|
wangwei
|
9bb86c7929
|
修改 核对送货单 撤回单据至带校验 再次以扫码结果提交 继续核对时核对页面 物资重复显示问题
|
2 years ago |
|
anthonywj
|
4498670058
|
诊断第三方单据详情重复下载问题
|
2 years ago |
|
anthonywj
|
721730166b
|
单据上传轮询遍历问题
|
2 years ago |
|
郑明梁
|
c386367832
|
bug修复
|
2 years ago |
|
anthonywj
|
4988e314fb
|
同步单据审核时间不一致问题
|
2 years ago |
|
anthonywj
|
177c600112
|
代码备份
|
2 years ago |
|
郑明梁
|
75f4ff7d7a
|
单据打印增加自助单号字段
|
2 years ago |
|
黄泽腾
|
1516a5104f
|
往来单位查询
|
2 years ago |
|
黄泽腾
|
45335cd21f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
6b6280852f
|
往来单位查询
|
2 years ago |
|
郑明梁
|
6473840e17
|
申购单查询状态判断
|
2 years ago |
|
黄泽腾
|
a9f1ff3932
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
b2fafe27ef
|
内部码打印更新代码
|
2 years ago |
|
wangwei
|
acd37c413a
|
修改 维护出入库执行减一 扫码数量未变化问题
|
2 years ago |
|
郑明梁
|
80c5d58787
|
单据上传（回传自助单据号)
|
2 years ago |
|
郑明梁
|
92f760d50b
|
明细打印
|
2 years ago |
|
黄泽腾
|
4ac8eb7c0e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
55232a4b3f
|
无三期业务单配/拣货提交业务单时，会受到’有三期业务单配/拣货‘单据类型的影响
|
2 years ago |
|
wangwei
|
b44424d672
|
修改 采购订单 到货时间比单据创建时间早
|
2 years ago |
|
薛宇
|
de65f6237a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
f3fb4e8552
|
物资过期处理方式无法弹框提醒
|
2 years ago |
|
郑明梁
|
cdce81ecb1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
eda6292cf0
|
库存明细打印
|
2 years ago |
|
薛宇
|
d95fa8811c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
1995a0c9ec
|
建议在“同步设置”页面，添加扫码单据类型功能模块：新增一个 搜索框功能
|
2 years ago |
|
郑明梁
|
a40530fc7c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
cece855d6b
|
三期出现重复序列号问题
|
2 years ago |
|
黄泽腾
|
5c451346ea
|
供应商发票页面优化问题
|
2 years ago |
|
郑明梁
|
d9462d3f2e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
a37ae92711
|
采购订单取消供应商控制
|
2 years ago |
|
wangwei
|
f5bd541e24
|
修改 新增单据明细重复问题
|
2 years ago |
|
wangwei
|
c0229625f9
|
优化发票打印
|
2 years ago |
|
wangwei
|
16a7a61a73
|
发票打印
|
2 years ago |
|
黄泽腾
|
4d2d13932d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
cddef69ce7
|
预警时间单位设置为“小时”，实际上单位还是“天”
|
2 years ago |
|
anthonywj
|
447526f19c
|
误删登记状态
|
2 years ago |
|
黄泽腾
|
702c4798d0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
2af01de1e8
|
新增往来单位搜索备份
|
2 years ago |
|
薛宇
|
e187c81b04
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
ea026d8f26
|
业务单自动补单-出入库单设置时间间隔，时间没有推移
|
2 years ago |
|
郑明梁
|
a9f47f41b9
|
单据提交缺失备注字段
|
2 years ago |
|
wangwei
|
f98133e100
|
修改 用内部码进行调拨出库 提示库存不足问题
|
2 years ago |
|
黄泽腾
|
4fd3c726f0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
60952f6168
|
新增往来单位搜索备份
|
2 years ago |
|
anthonywj
|
a9d68d3048
|
单据自动提交至第三方系统问题修改
|
2 years ago |
|
黄泽腾
|
4a81812f88
|
使用第三方产品编码生成的内部码无法在耗材字典查询
|
2 years ago |
|
薛宇
|
01293fe8ba
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
0c7b4455c4
|
同步设置功能，同步至自助平台或管理系统的扫码单据只能单线选择
|
2 years ago |
|
anthonywj
|
9afe11946b
|
批次号为空时插入库存出现空字符串
|
2 years ago |
|
黄泽腾
|
0dec5c2ed0
|
生成不了多级的内部码，会自动变成一级的内部码（片仔癀诊断和管理系统都有这个问题）
|
2 years ago |
|
郑明梁
|
010bcc3b2e
|
预验收单据新增备注查询
|
2 years ago |
|
wangwei
|
596a46130e
|
去除废弃字段
|
2 years ago |
|
anthonywj
|
ce5ff68e76
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
4f25b9ee57
|
新增备注字段查询时查备注或病人信息
|
2 years ago |
|
薛宇
|
2dfbef4154
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
e7392620b6
|
单据类型未启用，仍然可以做单（片仔癀诊断和管理系统都有这个问题）
|
2 years ago |
|
黄泽腾
|
c1ec9cb262
|
供应商器械信息模块可以重复选入产品
|
2 years ago |
|
anthonywj
|
d53c9e87ab
|
新增第三方单据自动下载与配置，日志生成等
|
2 years ago |
|
anthonywj
|
660d748cfa
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
5810d14716
|
修改诊断现存量查询，库存实时查询
|
2 years ago |
|
郑明梁
|
e9b979e300
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
35594d91a2
|
单据查询问题修复（带校验）
|
2 years ago |
|
wangwei
|
33cb628f22
|
物资类别 过滤停用产品
|
2 years ago |
|
郑明梁
|
01219e3f5b
|
单据查询问题修复（带校验）
|
2 years ago |
|
郑明梁
|
50edb4e747
|
单据查询问题修复（带校验）
|
2 years ago |
|
anthonywj
|
3d0dacb11c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
bc43d938b0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
447e8f128c
|
多次出库bug修复
|
2 years ago |
|
薛宇
|
1737372abc
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
51fea370b1
|
领用仓库选择手术室的话，是可以领用上一级中心库的产品
|
2 years ago |
|
wangwei
|
4402220c6b
|
修改bug
|
2 years ago |
|
anthonywj
|
30dcdfd553
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
40fe92d304
|
发票代码提交
|
2 years ago |
|
anthonywj
|
89732532fa
|
Merge branch 'dev_ywj' into dev
|
2 years ago |
|
anthonywj
|
0445657cf0
|
bug修改
|
2 years ago |
|
郑明梁
|
ec39ea48d1
|
修改往来单位查询问题
|
2 years ago |
|
anthonywj
|
658fb65413
|
委託驗收外網bug
|
2 years ago |
|
anthonywj
|
b7c6ef8cc7
|
委托验收不调拨入库问题
|
2 years ago |
|
anthonywj
|
f0788e4067
|
bug修改
|
2 years ago |
|
schry
|
e4da098ac4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
schry
|
3d22b2c8b0
|
进入“多级产品管理”页面报错提交
|
2 years ago |
|
郑明梁
|
096f7cd13b
|
新增出入库单三期校验重复扫码问题修复
|
2 years ago |
|
郑明梁
|
98c0d2c69f
|
去除临时表的没有用的字段
|
2 years ago |
|
schry
|
229c1bd241
|
进入“往来单位信息维护”，默认显示 供应商信息 ，选择“全部”查询也是显示供应商类型的往来单位信息
|
2 years ago |
|
1178634255
|
999430aa52
|
新增往来类型为客户的医疗机构，新增出库单不会显示该信息
|
2 years ago |
|
郑明梁
|
dbbf5a8811
|
定数包去掉无用代码
|
2 years ago |
|
郑明梁
|
e01ec88f65
|
内部码打印问题修复
|
2 years ago |
|
郑明梁
|
14c5e9a65c
|
选入di国家库查询
|
2 years ago |
|
郑明梁
|
4aaad76fe9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
edb42ada3d
|
修改自助单据审核问题
|
2 years ago |
|
wangwei
|
2738e58cbb
|
出入库补单 出入库单与目标出入库单相同给出提示
|
2 years ago |
|
wangwei
|
b86501eb88
|
新增出入库单 di绑定多个产品 产品重复问题
|
2 years ago |
|
1178634255
|
9b518e90a2
|
代码更新
|
2 years ago |
|
1178634255
|
165b81a0b2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
1178634255
|
c241831d6d
|
代码更新
|
2 years ago |
|
anthonywj
|
3438e4e2fb
|
bug修改
|
2 years ago |
|
anthonywj
|
9658dcd316
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
1178634255
|
91cf593506
|
修改密码代码备份
|
2 years ago |
|
1178634255
|
de6f13ec27
|
修改密码代码备份
|
2 years ago |
|
1178634255
|
42401e34ab
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
1178634255
|
420dea5428
|
代码备份
|
2 years ago |
|
schry
|
5fe7fb4067
|
页面优化
|
2 years ago |
|
schry
|
f89247401a
|
导出产品信息窗口执行‘结果全部导出’操作，导出的文件数据为空
|
2 years ago |
|
anthonywj
|
8e95a8e779
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
d2a56b42a1
|
默认允许无批次号
|
2 years ago |
|
anthonywj
|
7c15d5ba3d
|
默认允许无批次号
|
2 years ago |
|
1178634255
|
e20a65a00c
|
新增扫码单模块到待校验单据模块，备注会消失
|
2 years ago |
|
wangwei
|
133f841b7c
|
UdiRelevanceResponse实体类count修改类型
|
2 years ago |
|
anthonywj
|
1beea3a254
|
合并dev修改
|
2 years ago |
|
anthonywj
|
8d377e8839
|
Merge branch 'dev' into dev_ywj
# Conflicts:
# src/main/java/com/glxp/api/constant/Constant.java
# src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
# src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
# src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java
# src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java
# src/main/java/com/glxp/api/service/sync/HeartService.java
# src/main/java/com/glxp/api/task/SyncHeartTask.java
# src/main/java/com/glxp/api/task/SyncThirdSysTask.java
# src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java
# src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
|
2 years ago |
|
郑明梁
|
b1fc3a50ef
|
修改bug
|
2 years ago |
|
郑明梁
|
883084f4c5
|
定数包代码提交
|
2 years ago |
|
anthonywj
|
7480c8edbe
|
关联DI必填字段不被覆盖
|
2 years ago |
|
郑明梁
|
95e7c673c9
|
单据扫码序列号为空问题修复
|
2 years ago |
|
anthonywj
|
2e7d4c0999
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/resources/application-dev.yml
|
2 years ago |
|
anthonywj
|
bec91b93ca
|
新增协调平台追溯查询
|
2 years ago |
|
郑明梁
|
db6cfc0476
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
86bd9ebc9c
|
往来单位是客户的客户类型为患者
|
2 years ago |
|
wj
|
4da2b87169
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
87ee0073c1
|
ReplaceBatch.java调整
|
2 years ago |
|
郑明梁
|
0618f9b317
|
内部码扫码bug修复
|
2 years ago |
|
anthonywj
|
768bb39532
|
是否包含序列号
|
2 years ago |
|
anthonywj
|
1946e4dfef
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
375ff7aa5d
|
新增第三方单据上传过滤
|
2 years ago |
|
郑明梁
|
de55970ff8
|
定数包加工代码初始化
|
2 years ago |
|
郑明梁
|
70c4f26511
|
定数包设置代码提交
|
2 years ago |
|
郑明梁
|
3445442cbb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
dad49893d3
|
定数包设置代码提交
|
2 years ago |
|
anthonywj
|
0acfe9785f
|
单据上传至第三方相关调整，bug修改调整
|
2 years ago |
|
anthonywj
|
dae7656fff
|
单据上传至第三方相关调整，bug修改调整
|
2 years ago |
|
anthonywj
|
b3b935c0fe
|
根据单据类型查询问题
|
2 years ago |
|
anthonywj
|
6ce3adb1f4
|
待配货，待校验提交修改
|
2 years ago |
|
anthonywj
|
3e28f48933
|
待校验，等相关修改，
|
2 years ago |
|
anthonywj
|
ce801cd27c
|
单据带校验比对逻辑修改
|
2 years ago |
|
郑明梁
|
29df3286de
|
申购单流转价格问题修复
|
2 years ago |
|
anthonywj
|
6e38f6e9a3
|
备份
|
2 years ago |
|
anthonywj
|
2faa905bfb
|
第三方单据上传bug，发票重复bug
|
2 years ago |
|
anthonywj
|
ae4ff7d291
|
单据校验备份
|
2 years ago |
|
郑明梁
|
c50bd49100
|
多次出库bug修复
|
2 years ago |
|
郑明梁
|
e3bb14f114
|
定数包实体初始化
|
2 years ago |
|
anthonywj
|
c1d4d1b1df
|
分类第三方产品信息问题
|
2 years ago |
|
anthonywj
|
6c2e5b7f14
|
备份
|
2 years ago |
|
郑明梁
|
7af361a932
|
单据上传修改
|
2 years ago |
|
郑明梁
|
32be3ec3e8
|
新增申购单选入申购新增物资类别搜索
|
2 years ago |
|
anthonywj
|
91ff79f125
|
第三方产品信息编辑bug
|
2 years ago |
|
郑明梁
|
b77f1e215e
|
第三方单据bug修复
|
2 years ago |
|
郑明梁
|
3a923c18d8
|
第三方单据bug修复
|
2 years ago |
|
郑明梁
|
e2720aff8a
|
第三方单据新增字段
|
2 years ago |
|
郑明梁
|
5513726e0b
|
单据上传功能
|
2 years ago |
|
anthonywj
|
0e6b0be87d
|
第三方产品信息编辑bug
|
2 years ago |
|
anthonywj
|
ab66664e2f
|
bug修改
|
2 years ago |
|
anthonywj
|
069069e32b
|
bug修改
|
2 years ago |
|
郑明梁
|
d79a83de2d
|
bug修复
|
2 years ago |
|
anthonywj
|
aa17be0b83
|
bug修改
|
2 years ago |
|
anthonywj
|
428ed71f4e
|
申购单据，采购订单等相关修改
|
2 years ago |
|
郑明梁
|
5a377fe206
|
客户管理bug修复
|
2 years ago |
|
郑明梁
|
9eb3dfa675
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
fce5d7b7c6
|
申购单据，采购订单等相关修改
|
2 years ago |
|
anthonywj
|
562cbd5ac2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
f66705d82b
|
采购计划，采购订单等相关修改
|
2 years ago |
|
郑明梁
|
134762db9e
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
950301315d
|
更新审核人，核对人，供应商编辑信息bug
|
2 years ago |
|
anthonywj
|
86f084836e
|
选入第三方业务单据修改
|
2 years ago |
|
wangwei
|
77256a1516
|
bug修改
|
2 years ago |
|
郑明梁
|
47b1bd2cd4
|
单据上传功能代码提交
|
2 years ago |
|
郑明梁
|
dcb4cad964
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
4730d6fe78
|
单据上传功能代码提交
|
2 years ago |
|
wangwei
|
b7ecf98f9e
|
Merge remote-tracking branch 'origin/zmlDev' into dev
|
2 years ago |
|
wangwei
|
73057d3570
|
物资类别bug修改
|
2 years ago |
|
anthonywj
|
5c0a78e70c
|
基础信息相关修改
|
2 years ago |
|
郑明梁
|
17a0e0b99c
|
Merge branch 'zmlDev' into dev
|
2 years ago |
|
郑明梁
|
4a45824b8a
|
单据明细打印修改格式
|
2 years ago |
|
郑明梁
|
2576df6d2b
|
Merge remote-tracking branch 'origin/zmlDev' into zmlDev
|
2 years ago |
|
郑明梁
|
31d1c52a30
|
单据上传功能代码提交
|
2 years ago |
|
wangwei
|
19884e3aa3
|
修改bug
|
2 years ago |
|
wangwei
|
607414c4a1
|
物资类别bug修改
|
2 years ago |
|
郑明梁
|
c5b7ba7db5
|
客户管理功能代码提交
|
2 years ago |
|
anthonywj
|
a09eb7c2da
|
多级产品出库问题，申购新增备注字段搜索
|
2 years ago |
|
wangwei
|
5e3901e040
|
物资类别功能
|
2 years ago |
|
anthonywj
|
53aa0b11a8
|
界面标题等logo修改
|
2 years ago |
|
郑明梁
|
07b6009203
|
物资类别功能代码初始化
|
2 years ago |
|
wangwei
|
60b96aaec6
|
带票出入库明细 增加查询条件等
|
2 years ago |
|
郑明梁
|
2127c2f170
|
物资类别功能代码初始化
|
2 years ago |
|
anthonywj
|
461dedf088
|
第三方单据上传相关bug修改
|
2 years ago |
|
郑明梁
|
a7982e80dd
|
汇总修改汇总日期
|
2 years ago |
|
郑明梁
|
11be2ef830
|
修改货位上架按当前仓库筛选,和汇总导出加上仓库字段
|
2 years ago |
|
anthonywj
|
0149230284
|
预验收，寄售有序列号库存不足问题
|
2 years ago |
|
anthonywj
|
415b931c06
|
库存不足问题，单据验收问题
|
2 years ago |
|
郑明梁
|
ce2aa13b5f
|
修改单据bug
|
2 years ago |
|
郑明梁
|
7fd6639c18
|
汇总统计bug修复
|
2 years ago |
|
郑明梁
|
22b3ee6974
|
汇总统计bug修复
|
2 years ago |
|
anthonywj
|
dd1f68f103
|
发票相关问题修改
|
2 years ago |
|
anthonywj
|
84b7aae6dc
|
发票修改同步
|
2 years ago |
|
郑明梁
|
02a17df71a
|
多次出库bug修改
|
2 years ago |
|
wangwei
|
7893940cc6
|
修改第三方数据 单据类型新增 编辑问题
|
2 years ago |
|
wangwei
|
280859bb91
|
修改bug
|
2 years ago |
|
郑明梁
|
d8fe73595b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
487473f91c
|
多次出库bug修改
|
2 years ago |
|
wangwei
|
68fd6641ba
|
同步代码 发票优化
|
2 years ago |
|
anthonywj
|
374f8261f8
|
相关bug修改
|
2 years ago |
|
wangwei
|
320b8f0487
|
单据排序
|
2 years ago |
|
郑明梁
|
a14c66d2c8
|
统计汇总代码提交
|
2 years ago |
|
郑明梁
|
bfbb85eb57
|
统计汇总代码提交
|
2 years ago |
|
郑明梁
|
fed1bc9bde
|
单据判断序列号
|
2 years ago |
|
wangwei
|
d4e0107b91
|
新增出入库 物资录入查询问题
|
2 years ago |
|
郑明梁
|
d1fe07356c
|
多次出入库代码提交
|
2 years ago |
|
anthonywj
|
ea3c82f475
|
出入库扫码相关bug修改
|
2 years ago |
|
wangwei
|
690d415779
|
新增申购 调整产品录入多选
|
2 years ago |
|
郑明梁
|
d61ee07461
|
业务单据修改产品id类型（long）
|
2 years ago |
|
郑明梁
|
e38a4dad81
|
产品名称转拼音首字母
|
2 years ago |
|
郑明梁
|
d1eb441bca
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
90f1b6c334
|
产品名称转拼音首字母
|
2 years ago |
|
anthonywj
|
9249249182
|
申购产品生产企业对不上问题
|
2 years ago |
|
anthonywj
|
1a015238d6
|
采购计划提交系统繁忙问题，物资字典选入系统繁忙，生产企业查询系统繁忙
|
2 years ago |
|
anthonywj
|
d2cd3f803d
|
申购单据产品查询修改，提交采购订单修改
|
2 years ago |
|
wangwei
|
545905a5f3
|
新增申购产品录入多选问题
|
2 years ago |
|
anthonywj
|
bb43c32a1e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
d3697401a2
|
单据上传重盖
|
2 years ago |
|
郑明梁
|
46a981040a
|
业务单据功能修改
|
2 years ago |
|
郑明梁
|
d4119a70a8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
66d890ab18
|
业务单据功能修改
|
2 years ago |
|
wangwei
|
42cd45112b
|
修改第三方产品信息 结果全部导出问题以及 编辑第三方部门信息仓库会联动问题
|
2 years ago |
|
anthonywj
|
eb3f48ce04
|
代码合并
|
2 years ago |
|
anthonywj
|
ab641cc9a3
|
新增异常打印
|
2 years ago |
|
1178634255
|
68586c23cb
|
上传设置备份
|
2 years ago |
|
anthonywj
|
85324b42db
|
序列号校验
|
2 years ago |
|
anthonywj
|
2962670774
|
申购，相关查询修改
|
2 years ago |
|
anthonywj
|
70c0784584
|
申购，相关查询修改
|
2 years ago |
|
1178634255
|
f0cd926013
|
上传设置备份
|
2 years ago |
|
郑明梁
|
c3e32fd7ad
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
1b0c8638b9
|
修改统计汇总代码
|
2 years ago |
|
anthonywj
|
f51054ea40
|
第三方单据上传类型修改
|
2 years ago |
|
郑明梁
|
15ddba6d41
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
6b004099d3
|
业务单据功能优化
|
2 years ago |
|
wangwei
|
28d9198f0f
|
修改bug
|
2 years ago |
|
郑明梁
|
fce6af7827
|
单据复制bug修复
|
2 years ago |
|
郑明梁
|
aa76cb9578
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
b6ef0496d7
|
单据草稿保存创建往来单位
|
2 years ago |
|
wangwei
|
fa18f2787f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wangwei
|
e841371176
|
修改第三方仓库问题
|
2 years ago |
|
郑明梁
|
47fabd4fca
|
bug修复
|
2 years ago |
|
wangwei
|
bd75cdeee8
|
修改bug
|
2 years ago |
|
郑明梁
|
02a4a1f285
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
ff449d6371
|
预警设置bug修复
|
2 years ago |
|
wangwei
|
f8d481facc
|
发票二维码解析
|
2 years ago |
|
郑明梁
|
a6f82a7812
|
预警设置bug修复
|
2 years ago |
|
郑明梁
|
0c4e94a308
|
业务补单时间推迟bug修复
|
2 years ago |
|
anthonywj
|
651a0ef658
|
内部码打印问题，启用使用单元数量问题，申购系统繁忙问题
|
2 years ago |
|
郑明梁
|
393172f736
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
ba9711c467
|
库存预警bug修复
|
2 years ago |
|
wangwei
|
e0dc1d264c
|
库存预警信息 重置之后数据错误问题
|
2 years ago |
|
郑明梁
|
2334016fec
|
领用管理bug修复
|
2 years ago |
|
郑明梁
|
17a7d9859f
|
物资拜放bug修复
|
2 years ago |
|
wangwei
|
9974b9ec89
|
修改 新增出入库自动补单bug
|
2 years ago |
|
郑明梁
|
fb9aa452d1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
4b4d6beb7a
|
第三方bug修改
|
2 years ago |
|
anthonywj
|
906bb7e6a6
|
单据审核UDI码后面加GS1符号
|
2 years ago |
|
郑明梁
|
f81471d4e6
|
新增扫码单据排序
|
2 years ago |
|
郑明梁
|
adb9428e36
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
847de9c01b
|
汇总代码提交
|
2 years ago |
|
anthonywj
|
c87cfdd641
|
单据删除做限制
|
2 years ago |
|
anthonywj
|
4cd4d9b44c
|
单据重复提交问题
|
2 years ago |
|
anthonywj
|
5365852e1e
|
获取第三方产品规格型号问题
|
2 years ago |
|
anthonywj
|
d23ffecf3b
|
获取第三方产品规格型号问题
|
2 years ago |
|
anthonywj
|
7bb00727f3
|
打印全部内部码问题
|
2 years ago |
|
anthonywj
|
e954b9b4c2
|
异常单据显示问题
|
2 years ago |
|
郑明梁
|
78deeae108
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
ecc358f41b
|
增加查询用户接口
|
2 years ago |
|
anthonywj
|
111f196415
|
规格型号显示问题
|
2 years ago |
|
anthonywj
|
723c863bb2
|
定时下载任务重复下载问题
|
2 years ago |
|
anthonywj
|
3c98777e20
|
第三方接口调试
|
2 years ago |
|
anthonywj
|
0f93175ce0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
17827ab959
|
第三方产品信息接口新增厂家编码，供应商编码
|
2 years ago |
|
郑明梁
|
de32494a78
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
e713e03a31
|
日和月统计代码提交
|
2 years ago |
|
anthonywj
|
3e53fea186
|
第三方接口下载bug修改
|
2 years ago |
|
wj
|
7b3cf5a9d1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
6111d7c580
|
insertIgnoreBatch/replaceBatch改造
|
2 years ago |
|
anthonywj
|
f7d09c1ec4
|
第三方接口相关修改
|
2 years ago |
|
wj
|
1bed2cf9fd
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
598b58d8d4
|
下载第三方产品信息
|
2 years ago |
|
郑明梁
|
7b2f82c151
|
耗材批量导入问题修复
|
2 years ago |
|
wj
|
21b81c5e40
|
bug修复
|
2 years ago |
|
wj
|
1496bb4bda
|
bug修复--改方法名
|
2 years ago |
|
wj
|
1f3ba38e22
|
bug修复
|
2 years ago |
|
anthonywj
|
e1bf9bad81
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java
|
2 years ago |
|
anthonywj
|
6e6b56085c
|
代码备份
|
2 years ago |
|
wj
|
64fcfe9c22
|
bug修复
|
2 years ago |
|
郑明梁
|
bec086ca4c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
83baf6d325
|
打印代码提交
|
2 years ago |
|
1178634255
|
46d5cb0181
|
内部码标签打印
|
2 years ago |
|
1178634255
|
c5182c1965
|
修复查询采购计划删除报错
|
2 years ago |
|
wj
|
ab780d007f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
dc0a842edf
|
ThrSystemDetailEntity增加表名,ThrProductsEntity增加字段[生产厂家编码,配送企业编码]
|
2 years ago |
|
郑明梁
|
ddf0a1866f
|
内部码报表打印代码提交
|
2 years ago |
|
anthonywj
|
5619aa362c
|
代码备份
|
2 years ago |
|
郑明梁
|
bd15235a99
|
单据报表打印代码提交
|
2 years ago |
|
郑明梁
|
fe4b0082e3
|
单据报表打印代码提交
|
2 years ago |
|
1178634255
|
56aa7faa57
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
1178634255
|
ed08449b2c
|
修复审核申购单报错
|
2 years ago |
|
郑明梁
|
4a6f792398
|
多次使用出库新增功能代码提交
|
2 years ago |
|
郑明梁
|
d0a507981f
|
物资新增多次出库设置
|
2 years ago |
|
1178634255
|
e58e49b816
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
1178634255
|
9f1f491db3
|
修复入账库查询列表不会显示‘计量单位’,生产企业与单据类型的不一致
|
2 years ago |
|
郑明梁
|
d72625c5cd
|
Merge remote-tracking branch 'origin/zmlDev' into dev
|
2 years ago |
|
郑明梁
|
3a26eafb7d
|
多次使用出库新增功能代码提交
|
2 years ago |
|
anthonywj
|
ee89548201
|
排序相关修改
|
2 years ago |
|
anthonywj
|
de758b0fce
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
b0d1ddda6c
|
采购订单修改
|
2 years ago |
|
schry
|
f75b8fdd86
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
schry
|
a6a68cb35f
|
解决不显示计量单位
|
2 years ago |
|
郑明梁
|
14c4bd0248
|
多次使用出库新增功能代码提交
|
2 years ago |
|
anthonywj
|
f2968bf275
|
单据复制，单据流转带业务单信息，采购订单新增价格
|
2 years ago |
|
anthonywj
|
be6abd2063
|
bug修改
|
2 years ago |
|
wj
|
4ef46ec1b0
|
增加表名
|
2 years ago |
|
郑明梁
|
32ff539034
|
多次使用出库设置功能代码提交
|
2 years ago |
|
anthonywj
|
85d73a0ee4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
c3d9c20bc6
|
新增多次使用出库功能
|
2 years ago |
|
郑明梁
|
52393b786c
|
货位变更bug修改
|
2 years ago |
|
schry
|
ac3a97d284
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
schry
|
ccbeadfe68
|
目标出入库单显示出入库类型单据
|
2 years ago |
|
郑明梁
|
d24a412535
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
a1b4542df6
|
库存查询bug修改
|
2 years ago |
|
anthonywj
|
aaff1b1d7f
|
发票系统繁忙问题
|
2 years ago |
|
wangwei
|
4b917f22fd
|
冷链报告
|
2 years ago |
|
anthonywj
|
d166dd09d7
|
采购订单按供应商创建
|
2 years ago |
|
郑明梁
|
b517963a08
|
内部码报表打印代码提交
|
2 years ago |
|
wj
|
fd5aca89d9
|
调整
|
2 years ago |
|
wj
|
4f9a9e2126
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
0c3aa052fb
|
调整
|
2 years ago |
|
郑明梁
|
1fa5263492
|
库存明细打印代码提交
|
2 years ago |
|
anthonywj
|
385b9075ac
|
bug修改
|
2 years ago |
|
郑明梁
|
7b3f63f85d
|
用户库存代码提交
|
2 years ago |
|
郑明梁
|
75f346c7a7
|
用户库存代码提交
|
2 years ago |
|
郑明梁
|
cc736af286
|
inv_user_product,inv_user_product_detail表初始化代码提交
|
2 years ago |
|
郑明梁
|
92e2a0fe89
|
inv_user_product,inv_user_product_detail表初始化代码提交
|
2 years ago |
|
郑明梁
|
f22fc931f2
|
inv_user_product,inv_user_product_detail表初始化代码提交
|
2 years ago |
|
anthonywj
|
db3e3bd2ca
|
相关界面调整修改
|
2 years ago |
|
郑明梁
|
7a19bbe32f
|
物资摆放下架bug修改
|
2 years ago |
|
1178634255
|
6abd1137a8
|
1、业务流转设置了‘产品申购’自动生成‘采购计划’，无这个问题
申购单据审核提示‘系统繁忙’，可能是数据库多加了几条一样的数据
|
2 years ago |
|
wangwei
|
f9080d08b8
|
打印设置分页问题
|
2 years ago |
|
wangwei
|
f1374f50f8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wangwei
|
e25899a6ae
|
内部码
|
2 years ago |
|
anthonywj
|
be5f16b38d
|
库存货位查询
|
2 years ago |
|
wangwei
|
e1c80c5360
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wangwei
|
8837b12fd4
|
内部码
|
2 years ago |
|
郑明梁
|
8ec5a59d85
|
资质打印代码提交
|
2 years ago |
|
wangwei
|
a7f3caefe9
|
资质打印
|
2 years ago |
|
anthonywj
|
23d385fa7a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
38f2e7b1a6
|
修改文件统一路径
|
2 years ago |
|
郑明梁
|
f78f9d7e8b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
790c0d09ba
|
物资摆放修改
|
2 years ago |
|
anthonywj
|
59a0078a84
|
新增按货位出库功能
|
2 years ago |
|
wj
|
58e035ad03
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
fa79cbf280
|
自定义Iservice和ServiceImpl
|
2 years ago |
|
郑明梁
|
400f32ac9b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
ffc363773e
|
单据打印修改
|
2 years ago |
|
wangwei
|
10ecccc021
|
如果角色存在用户关联 就不能是禁用状态
|
2 years ago |
|
wangwei
|
4ddca65ad5
|
修改bug
|
2 years ago |
|
wj
|
508caa86e0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
eb470c4c55
|
优化
|
2 years ago |
|
郑明梁
|
a198add3af
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
851232e270
|
库存查询新增货架查询
|
2 years ago |
|
anthonywj
|
0d3c032660
|
库存查询修改，内网单据确认同步到外网
|
2 years ago |
|
郑明梁
|
17e1cdc144
|
库存查询新增货架查询
|
2 years ago |
|
郑明梁
|
4ed43cda03
|
库存查询新增货架查询
|
2 years ago |
|
郑明梁
|
2eccbe7c8a
|
物资摆放下架代码提交
|
2 years ago |
|
郑明梁
|
3b29b7f804
|
物资摆放下架代码提交
|
2 years ago |
|
wangwei
|
d55358b8cd
|
修改查询发票方法
|
2 years ago |
|
anthonywj
|
b4a00f5c51
|
发票，单据修改
|
2 years ago |
|
wj
|
62367e9acf
|
同步文件调整
|
2 years ago |
|
wj
|
9019c8b6cc
|
去除方法Resource注解
|
2 years ago |
|
wj
|
d3497f0536
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
b8a97dd2e6
|
文件下载调整
|
2 years ago |
|
anthonywj
|
5f5b4d1bbe
|
单据流转后价格小数点问题
|
2 years ago |
|
anthonywj
|
8a8965e1e7
|
新增单据详情，发票、确认状态，同步更新，
|
2 years ago |
|
anthonywj
|
1003d2ec8f
|
业务单据详情改成雪花ID
|
2 years ago |
|
郑明梁
|
075ebad24a
|
订单管理id问题修改
|
2 years ago |
|
郑明梁
|
82e46675a9
|
订单管理id问题修改
|
2 years ago |
|
wj
|
1ea8e7c2d4
|
文件下载调整
|
2 years ago |
|
wj
|
e3759f4c49
|
文件下载调整
|
2 years ago |
|
wj
|
8828718651
|
文件下载调整
|
2 years ago |
|
wj
|
95826f44e1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
0bc9b927ce
|
bug修复
|
2 years ago |
|
wangwei
|
f563478aa2
|
修改bug
|
2 years ago |
|
郑明梁
|
1379389f80
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
e61285dd5b
|
产品选入按国家库查询
|
2 years ago |
|
wj
|
f4d9f19a6b
|
idtype auto改为input
|
2 years ago |
|
wj
|
da57675d60
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
dded9d696b
|
时间判断调整
|
2 years ago |
|
anthonywj
|
23dacbc0d7
|
bug修改
|
2 years ago |
|
wangwei
|
972ed90e40
|
同步 优化发票代码
|
2 years ago |
|
wj
|
0c348c43ac
|
判断调整
|
2 years ago |
|
wj
|
4507e41043
|
判断调整
|
2 years ago |
|
郑明梁
|
40c9648762
|
物质摆放变更功能代码提交
|
2 years ago |
|
wj
|
4a35a538ae
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
7a3e8b72cb
|
文件下载问题
|
2 years ago |
|
wangwei
|
f45d18ec7f
|
同步发票代码
|
2 years ago |
|
郑明梁
|
f11e0fbb10
|
物质摆放变更功能代码提交
|
2 years ago |
|
wangwei
|
a4bf1e086c
|
发票刷新功能
|
2 years ago |
|
郑明梁
|
1071b496dd
|
物质摆放按单功能代码提交
|
2 years ago |
|
wangwei
|
1bf136848f
|
同步发票代码
|
2 years ago |
|
anthonywj
|
15c4a33fb4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
b54308121b
|
绑定供应商无法选择问题
|
2 years ago |
|
郑明梁
|
fa09ca7078
|
物质摆放功能代码提交
(cherry picked from commit e880330e7c)
|
2 years ago |
|
wj
|
943cea1816
|
Merge branch 'master' into dev
|
2 years ago |
|
郑明梁
|
9ac295028b
|
物质摆放功能代码提交
|
2 years ago |
|
anthonywj
|
75077b05a4
|
同步相关问题修改。用户选入物资字典相关修改
|
2 years ago |
|
wj
|
79c64f15f1
|
测试地址调整
|
2 years ago |
|
wj
|
1e55b3ea97
|
测试地址调整
|
2 years ago |
|
wj
|
004dea3694
|
拉取数据增加特殊处理
|
2 years ago |
|
wj
|
5208a1aea2
|
拉取数据增加特殊处理
|
2 years ago |
|
wj
|
102cf093c2
|
增加replace,replaceBatch,insertIgnore,insertIgnoreBatch
|
2 years ago |
|
wj
|
46fe9a5e7d
|
测试环境调整
|
2 years ago |
|
anthonywj
|
1e77692313
|
发票ID改为long
|
2 years ago |
|
wangwei
|
5697692584
|
发票修改
|
2 years ago |
|
wangwei
|
94118141b5
|
发票修改
|
2 years ago |
|
anthonywj
|
a7ef10a6d7
|
寄售出库问题，预验收入库问题，同步问题，领用单据问题
|
2 years ago |
|
anthonywj
|
cc248bab94
|
上线bug修改，同步修改，发票修改
|
2 years ago |
|
wj
|
e8cdafc14b
|
调整任务开始时间
|
2 years ago |
|
wj
|
948d9ce1f3
|
异步同步
|
2 years ago |
|
wj
|
09915f0e66
|
手动上传数据
|
2 years ago |
|
wj
|
f7247819da
|
手动上传数据
|
2 years ago |
|
wj
|
3143e58c0b
|
代码调整
|
2 years ago |
|
wj
|
0214b2cf94
|
代码调整
|
2 years ago |
|
郑明梁
|
9b0b346017
|
用户修改不能修改角色问题
|
2 years ago |
|
wj
|
7d39656d92
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
ef0c71b1e5
|
记录执行结果
|
2 years ago |
|
郑明梁
|
7ee91a1a2c
|
修改打印模板地址
|
2 years ago |
|
anthonywj
|
f658c2c4c9
|
bug修改，上架摆货修改
|
2 years ago |
|
anthonywj
|
4b08aa2a4e
|
bug修改，上架摆货修改
|
2 years ago |
|
anthonywj
|
6322a3bd03
|
修改预验收，寄售其他仓库用户可查看，修复修改角色bug，修复按单摆货bug
|
2 years ago |
|
anthonywj
|
c6e36d0a79
|
数据同步下载问题
|
2 years ago |
|
anthonywj
|
eda9b590d1
|
打印路径修改
|
2 years ago |
|
anthonywj
|
3cae7526bc
|
摆货相关修改，添加货位查询，预验收，寄售等相关库存摆货
|
2 years ago |
|
anthonywj
|
a9fd3f2c2b
|
相关bug修改
|
2 years ago |
|
anthonywj
|
ba410331a5
|
同步功能修改
|
2 years ago |
|
anthonywj
|
75d388e121
|
同步功能修改
|
2 years ago |
|
郑明梁
|
739462bcdf
|
Merge branch 'test'
|
2 years ago |
|
郑明梁
|
0d878f1d64
|
修复id问题
|
2 years ago |
|
wangwei
|
063ac24eb8
|
Merge remote-tracking branch 'origin/test'
|
2 years ago |
|
wangwei
|
0d51bce1a3
|
出入库自动补单 业务单自动补单 修改id问题
|
2 years ago |
|
wj
|
af379547ea
|
放开注释
|
2 years ago |
|
anthonywj
|
eec7d4f87a
|
带配货功能修改
|
2 years ago |
|
wangwei
|
dbaa3cf85e
|
修改 维护往来id问题
|
2 years ago |
|
郑明梁
|
7eac5e448a
|
Merge remote-tracking branch 'origin/test' into test
|
2 years ago |
|
郑明梁
|
ac199432c9
|
物资添加id问题
|
2 years ago |
|
anthonywj
|
eca01f3f4a
|
仓库用户单据类型移除问题
|
2 years ago |
|
anthonywj
|
a4838a4459
|
解决选入用户，移除用户系统繁忙问题
|
2 years ago |
|
wangwei
|
5b970dc4c7
|
修改id问题
|
2 years ago |
|
anthonywj
|
8ca7d523df
|
预验收按货位退货
|
2 years ago |
|
wangwei
|
d5a8a5e1fb
|
Merge remote-tracking branch 'origin/wtest'
|
2 years ago |
|
wangwei
|
dbbcd67347
|
修改id问题
|
2 years ago |
