薛宇
|
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 |
|
黄泽腾
|
608d3280dc
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
黄泽腾
|
0d85313688
|
Merge branch 'dev' into dev2.0
|
2 years ago |
|
薛宇
|
ead6a7a824
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
薛宇
|
ec90b9eed4
|
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 |
