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 |
