schry
|
f0b8407c29
|
选入领用单据：“往来单位”查询框查询不到数据 230522
|
2 years ago |
郑明梁
|
4a6f792398
|
多次使用出库新增功能代码提交
|
2 years ago |
|
郑明梁
|
d0a507981f
|
物资新增多次出库设置
|
2 years ago |
|
schry
|
c669d89eb4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
schry
|
68782d1619
|
业务单自动补单的单据类型名称不支持模糊查询 230519
|
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 |
|
郑明梁
|
7bbd253d1a
|
多次使用出库新增功能代码提交
|
2 years ago |
|
郑明梁
|
3a26eafb7d
|
多次使用出库新增功能代码提交
|
3 years ago |
anthonywj
|
ee89548201
|
排序相关修改
|
3 years ago |
|
anthonywj
|
de758b0fce
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
anthonywj
|
b0d1ddda6c
|
采购订单修改
|
3 years ago |
|
schry
|
f75b8fdd86
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
schry
|
a6a68cb35f
|
解决不显示计量单位
|
3 years ago |
|
郑明梁
|
14c4bd0248
|
多次使用出库新增功能代码提交
|
3 years ago |
|
anthonywj
|
f2968bf275
|
单据复制，单据流转带业务单信息，采购订单新增价格
|
3 years ago |
|
anthonywj
|
be6abd2063
|
bug修改
|
3 years ago |
wj
|
21ee80cd17
|
Merge branch 'dev' into test
|
3 years ago |
|
郑明梁
|
32ff539034
|
多次使用出库设置功能代码提交
|
3 years ago |
|
anthonywj
|
85d73a0ee4
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
anthonywj
|
c3d9c20bc6
|
新增多次使用出库功能
|
3 years ago |
|
郑明梁
|
d24a412535
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
郑明梁
|
a1b4542df6
|
库存查询bug修改
|
3 years ago |
|
anthonywj
|
aaff1b1d7f
|
发票系统繁忙问题
|
3 years ago |
wangwei
|
4b917f22fd
|
冷链报告
|
3 years ago |
|
anthonywj
|
d166dd09d7
|
采购订单按供应商创建
|
3 years ago |
|
anthonywj
|
385b9075ac
|
bug修改
|
3 years ago |
|
郑明梁
|
92e2a0fe89
|
inv_user_product,inv_user_product_detail表初始化代码提交
|
3 years ago |
|
郑明梁
|
f22fc931f2
|
inv_user_product,inv_user_product_detail表初始化代码提交
|
3 years ago |
|
1178634255
|
6abd1137a8
|
1、业务流转设置了‘产品申购’自动生成‘采购计划’，无这个问题
申购单据审核提示‘系统繁忙’，可能是数据库多加了几条一样的数据
|
3 years ago |
|
anthonywj
|
be5f16b38d
|
库存货位查询
|
3 years ago |
|
wangwei
|
a7f3caefe9
|
资质打印
|
3 years ago |
|
anthonywj
|
59a0078a84
|
新增按货位出库功能
|
3 years ago |
|
郑明梁
|
400f32ac9b
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
郑明梁
|
ffc363773e
|
单据打印修改
|
3 years ago |
|
wangwei
|
10ecccc021
|
如果角色存在用户关联 就不能是禁用状态
|
3 years ago |
|
郑明梁
|
1d6a2d78d7
|
业务单明细修改可看状态
|
3 years ago |
|
wangwei
|
f6c9fd2297
|
修改字段
|
3 years ago |
|
anthonywj
|
8de2927b19
|
用户关联单据类型
|
3 years ago |
|
郑明梁
|
4472ad0490
|
库存查询新增货架查询
|
3 years ago |
|
wangwei
|
d83efd3e94
|
新增领用单 审核领用单 查询领用单 无法根据往来信息查询问题
|
3 years ago |
|
郑明梁
|
a198add3af
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
郑明梁
|
851232e270
|
库存查询新增货架查询
|
3 years ago |
|
anthonywj
|
0d3c032660
|
库存查询修改，内网单据确认同步到外网
|
3 years ago |
|
郑明梁
|
4ed43cda03
|
库存查询新增货架查询
|
3 years ago |
|
wangwei
|
d55358b8cd
|
修改查询发票方法
|
3 years ago |
|
anthonywj
|
b4a00f5c51
|
发票，单据修改
|
3 years ago |
|
wj
|
8386fd0b7d
|
Merge branch 'dev' into test
|
3 years ago |
|
anthonywj
|
8a8965e1e7
|
新增单据详情，发票、确认状态，同步更新，
|
3 years ago |
|
anthonywj
|
1003d2ec8f
|
业务单据详情改成雪花ID
|
3 years ago |
|
wangwei
|
36a62ff67b
|
修改查询发票方法
|
3 years ago |
|
wangwei
|
89e467a764
|
修改寄售 预验收库存查询
|
3 years ago |
|
wj
|
188bd442b2
|
Merge branch 'dev' into test
|
3 years ago |
|
anthonywj
|
23dacbc0d7
|
bug修改
|
3 years ago |
|
wangwei
|
972ed90e40
|
同步 优化发票代码
|
3 years ago |
|
wj
|
d7636825ff
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
0a07434e03
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
624aee5f1e
|
id映射问题
|
3 years ago |
|
郑明梁
|
40c9648762
|
物质摆放变更功能代码提交
|
3 years ago |
|
wj
|
3c3c96e927
|
Merge branch 'dev' into test
|
3 years ago |
|
wangwei
|
f45d18ec7f
|
同步发票代码
|
3 years ago |
|
wj
|
ef791d2671
|
Merge branch 'dev' into test
|
3 years ago |
|
郑明梁
|
fa09ca7078
|
物质摆放功能代码提交
(cherry picked from commit e880330e7c)
|
3 years ago |
|
wj
|
943cea1816
|
Merge branch 'master' into dev
|
3 years ago |
|
wj
|
0570ff2c52
|
设置默认test
|
3 years ago |
|
wj
|
b125b3e76c
|
设置默认dev
|
3 years ago |
|
郑明梁
|
9ac295028b
|
物质摆放功能代码提交
|
3 years ago |
|
anthonywj
|
75077b05a4
|
同步相关问题修改。用户选入物资字典相关修改
|
3 years ago |
|
wj
|
2311c643cc
|
设置默认dev环境
|
3 years ago |
|
wj
|
a953328f1f
|
设置默认dev环境
|
3 years ago |
|
wangwei
|
fd41fcc4db
|
Merge branch 'master' into test
|
3 years ago |
|
wangwei
|
94118141b5
|
发票修改
|
3 years ago |
|
anthonywj
|
a7ef10a6d7
|
寄售出库问题，预验收入库问题，同步问题，领用单据问题
|
3 years ago |
|
anthonywj
|
cc248bab94
|
上线bug修改，同步修改，发票修改
|
3 years ago |
|
wj
|
c85552a97a
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
ff2b622814
|
测试环境调整
|
3 years ago |
|
wj
|
3d28e40a03
|
测试环境调整
|
3 years ago |
|
wj
|
56794f2a3b
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
0214b2cf94
|
代码调整
|
3 years ago |
|
wj
|
a99eaac220
|
修改默认环境
|
3 years ago |
|
wj
|
7d39656d92
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
ef0c71b1e5
|
记录执行结果
|
3 years ago |
|
anthonywj
|
f658c2c4c9
|
bug修改，上架摆货修改
|
3 years ago |
|
anthonywj
|
4b08aa2a4e
|
bug修改，上架摆货修改
|
3 years ago |
|
anthonywj
|
6322a3bd03
|
修改预验收，寄售其他仓库用户可查看，修复修改角色bug，修复按单摆货bug
|
3 years ago |
|
anthonywj
|
c6e36d0a79
|
数据同步下载问题
|
3 years ago |
|
anthonywj
|
3cae7526bc
|
摆货相关修改，添加货位查询，预验收，寄售等相关库存摆货
|
3 years ago |
|
anthonywj
|
75d388e121
|
同步功能修改
|
3 years ago |
|
wj
|
872c4e5167
|
sql调整
|
3 years ago |
|
wj
|
6c44c6b690
|
sql调整
|
3 years ago |
|
郑明梁
|
0d878f1d64
|
修复id问题
|
3 years ago |
|
wangwei
|
0d51bce1a3
|
出入库自动补单 业务单自动补单 修改id问题
|
3 years ago |
|
wangwei
|
dbaa3cf85e
|
修改 维护往来id问题
|
3 years ago |
|
郑明梁
|
e616ccd7ff
|
修改test配置文件模板路径
|
3 years ago |
|
郑明梁
|
ac199432c9
|
物资添加id问题
|
3 years ago |
|
anthonywj
|
a4838a4459
|
解决选入用户，移除用户系统繁忙问题
|
3 years ago |
|
anthonywj
|
0486af3461
|
Merge branch 'master' into test
|
3 years ago |
|
anthonywj
|
4687aeea24
|
预验收按货位退货
|
3 years ago |
|
wangwei
|
d5a8a5e1fb
|
Merge remote-tracking branch 'origin/wtest'
|
3 years ago |
|
wangwei
|
dbbcd67347
|
修改id问题
|
3 years ago |
|
anthonywj
|
d24990f5c7
|
Merge branch 'master' into test
|
3 years ago |
|
anthonywj
|
14e43730de
|
ID相关修改
|
3 years ago |
|
anthonywj
|
3360b7e2bd
|
bug修改代码备份
|
3 years ago |
|
wj
|
ab7587d383
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
62a210fa0a
|
测试环境
|
3 years ago |
|
wj
|
cce0712a24
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
48806f3208
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
97256b24f4
|
测试环境
|
3 years ago |
x_z
|
90340e2607
|
1.调整摆放功能代码，添加上架记录
|
3 years ago |
|
wj
|
33d0dabc6f
|
测试环境
|
3 years ago |
|
wj
|
4b0c1170f8
|
测试环境
|
3 years ago |
|
anthonywj
|
37af4d2462
|
合并同步 分支
|
3 years ago |
|
anthonywj
|
e62c88dfbe
|
合并git 分支
|
3 years ago |
|
anthonywj
|
73d6187176
|
合并master分支
|
3 years ago |
|
郑明梁
|
2e36abdc60
|
修改单据bug
|
3 years ago |
|
wangwei
|
23d1193b56
|
修改业务管理 模块中无法根据紧急成都查询
|
3 years ago |
|
wj
|
4f7b490d88
|
上传及下载写入文件
|
3 years ago |
|
wj
|
19d156e2c4
|
Merge remote-tracking branch 'origin/generId' into generId
# Conflicts:
# src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java
# src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java
# src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml
|
3 years ago |
|
wj
|
0499617822
|
系统设置同步
|
3 years ago |
|
anthonywj
|
4ea1efaa92
|
同步数据bug相关修复
|
3 years ago |
|
wangwei
|
cfe0153f1b
|
修改 用户管理,编辑时候,会把之前选入的部门替换掉
|
3 years ago |
|
wangwei
|
db2b9bcafe
|
修复单据查询bug
|
3 years ago |
|
x_z
|
00bd1ac2a4
|
1.调整摆放列表查询逻辑
|
3 years ago |
|
anthonywj
|
54dc7cd0eb
|
同步数据修改为雪花ID
|
3 years ago |
|
anthonywj
|
9e25fc5036
|
bug修改代码备份
|
3 years ago |
|
x_z
|
fc2ab43807
|
1.调整摆放功能代码
|
3 years ago |
|
anthonywj
|
1f6a08e74c
|
新增三期拣货，无三期拣货，为配货等页面
|
3 years ago |
|
x_z
|
18719072d6
|
1.调整盘点代码
|
3 years ago |
|
郑明梁
|
d6e68e11d2
|
出入库明细代码修改
|
3 years ago |
|
郑明梁
|
ca4e1757a9
|
库存产品拉取报错没有指定表字段
|
3 years ago |
|
郑明梁
|
064e779747
|
业务代码修改提交
|
3 years ago |
|
郑明梁
|
cc7cde1e29
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
9676304a40
|
计划单据提交
|
3 years ago |
|
x_z
|
0eb427119c
|
1.调整添加货位逻辑
|
3 years ago |
|
wangwei
|
df4d51cbba
|
修改 部门 仓库问题
|
3 years ago |
|
anthonywj
|
5d1875ebb9
|
库存详情新增入库数量与出库数量，方便后续分组统计查询
|
3 years ago |
|
anthonywj
|
4278cf047e
|
bug修改
|
3 years ago |
|
wangwei
|
0e502f8666
|
修改部门 仓库bug
|
3 years ago |
|
郑明梁
|
9cce01e788
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
0c7a738fb7
|
申购单据提交
|
3 years ago |
|
wj
|
1174147d7f
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
3f4c4511d6
|
第三方数据同步
|
3 years ago |
|
郑明梁
|
140403de6d
|
耗材领用单据提交
|
3 years ago |
|
wj
|
943c02af52
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
1517d71b78
|
用户数据同步
|
3 years ago |
|
anthonywj
|
9f65dda33c
|
物资分类带代码迁移
|
3 years ago |
|
anthonywj
|
1e82f37f7f
|
物资字典参数设置，单据类型修改
|
3 years ago |
|
x_z
|
f6ca9ee95b
|
1.初步完成第三方系统接口定时任务
|
3 years ago |
|
wangwei
|
1524185bc6
|
同步 内部码
|
3 years ago |
|
x_z
|
bbb845f1bc
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
02f1ce16c6
|
1.提交代码
|
3 years ago |
|
郑明梁
|
b0543b862a
|
资质代码同步
|
3 years ago |
|
anthonywj
|
bd7fd9691a
|
物资字典代码迁移，新增国家库同步到外网查询
|
3 years ago |
|
x_z
|
a0d6f3cc06
|
1.修复临时文件存储失败问题
2.修改下载第三方系统基础数据数据校验逻辑
|
3 years ago |
|
anthonywj
|
5bc3ce3115
|
业务单选入第三方单据bug
|
3 years ago |
|
anthonywj
|
8a9607f690
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
d730b5c084
|
数据同步修改
|
3 years ago |
|
wangwei
|
a2944efa3e
|
修改bug
|
3 years ago |
|
x_z
|
2302660639
|
1.医院系统配置表添加第三方系统标识字段
|
3 years ago |
|
anthonywj
|
ec9c295e03
|
单据库存相关代码迁移
|
3 years ago |
|
x_z
|
9cc66f85da
|
1.添加第三方产品数据导入接口和逻辑
2.完善下载第三方系统数据逻辑
|
3 years ago |
|
anthonywj
|
a8504f276e
|
代码迁移备份，预验收退回修改
|
3 years ago |
|
x_z
|
faf499a4c6
|
1.合并第三方接口请求
|
3 years ago |
|
wangwei
|
c965db25d9
|
同步 部门信息 仓库信息 用户关系 角色管理
|
3 years ago |
|
郑明梁
|
57898a6731
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java
# src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java
# src/main/java/com/glxp/api/task/AsyncUdiTask.java
# src/main/resources/schemas/schema_v2.1.sql
|
3 years ago |
|
郑明梁
|
35704f2221
|
单据类型设置代码提交(同步)
|
3 years ago |
|
x_z
|
e3c25b05b5
|
1.添加接口请求时间设置
|
3 years ago |
|
anthonywj
|
76994ae9f5
|
领用单据审核bug修改，自动生成业务单，扫码单等修改迁移
|
3 years ago |
|
anthonywj
|
e3c6399aa5
|
单据流转相关修改
|
3 years ago |
|
x_z
|
abbc13b2f5
|
1.合并自助平台库存预警设置的代码
|
3 years ago |
|
wj
|
d3e6df8623
|
bug修复
|
3 years ago |
|
anthonywj
|
7b96cfab4e
|
1.单据类型修改，
2。预验收退回，
3.预验收库存
|
3 years ago |
|
anthonywj
|
5cc077a4b9
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
f5d87597d6
|
新增预验收单据类型退回字段
|
3 years ago |
|
x_z
|
628d991efe
|
1.添加更新时间字段的更新逻辑
|
3 years ago |
|
anthonywj
|
2bd885c398
|
同步国家库数据
|
3 years ago |
|
wangwei
|
1e57b7ca4f
|
汇总记录，导出excel
|
3 years ago |
|
x_z
|
c68cb845a0
|
1.添加第三方基础数据同步和系统设置同步代码
|
3 years ago |
|
wangwei
|
7d6341a9c2
|
导出excel
|
3 years ago |
|
郑明梁
|
303e1e7217
|
模板打印代码提交
|
3 years ago |
|
anthonywj
|
5c09ceeb6e
|
同步设置页面重整，，基础数据上传，单据类型上传
|
3 years ago |
|
anthonywj
|
03097198f5
|
单据同步
|
3 years ago |
|
x_z
|
2e2b7d0bda
|
1.修复无单据类型时查询单据表报错问题
|
3 years ago |
|
x_z
|
9bab80a61e
|
1.同步库存预警设置代码
|
3 years ago |
|
anthonywj
|
d47ff60dd6
|
迁移自助平台单据相关代码
|
3 years ago |
chengqf
|
233ca8601c
|
文件不存在不加入上传列表
|
3 years ago |
|
anthonywj
|
d14cba051e
|
单据类型迁移，内部码打印迁移
|
3 years ago |
|
anthonywj
|
78efd5b5eb
|
页面展示，同步相关修改
|
3 years ago |
|
x_z
|
3f81a88bce
|
1.调整同步设置业务单据类型代码
|
3 years ago |
|
x_z
|
f2e715bd9a
|
1.添加同步，业务单据类型代码
|
3 years ago |
|
x_z
|
71cb1c1e2d
|
1.添加采购计划和采购单明细接口
|
3 years ago |
|
x_z
|
72a4b9095c
|
1.添加申购单据明细查询接口
|
3 years ago |
|
anthonywj
|
adc2bae64b
|
新增业务单据同步
|
3 years ago |
|
anthonywj
|
1569560f5f
|
代码备份
|
3 years ago |
|
x_z
|
cec3ccb030
|
1.添加删除日志定时任务
|
3 years ago |
|
wangwei
|
b79a714aa6
|
设备保修 仓库不显示问题
|
3 years ago |
|
wangwei
|
50713a6108
|
修改新增领用计划 显示创建人bug
|
3 years ago |
|
x_z
|
bd51920d7b
|
1.修复部门设备详情查询查询问题
|
3 years ago |
|
x_z
|
ef4b457199
|
1.修复盘点单bug
|
3 years ago |
|
anthonywj
|
39baff10bf
|
UDI管理系统定时上传，定时下载单据相关
|
3 years ago |
|
x_z
|
208440cc2d
|
1.完善生成维保单逻辑
|
3 years ago |
|
x_z
|
fd9aae06ce
|
1.调整科室设备明细，设备巡检设置接口
|
3 years ago |
|
郑明梁
|
ebf625ec09
|
资质证书页面修改
|
3 years ago |
|
anthonywj
|
bb8626eff5
|
新增同步设置相关功能界面
|
3 years ago |
|
x_z
|
098ada84c9
|
1.提交设备巡检，维保等接口代码
|
3 years ago |
|
anthonywj
|
71a1dbd019
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
fe27449cb7
|
单据复制功能,中继服务相关修改
|
3 years ago |
|
wangwei
|
beb5b55fd4
|
打包
|
3 years ago |
|
郑明梁
|
106909d8be
|
修改耗材领用bug
|
3 years ago |
|
anthonywj
|
44fa2c252e
|
单据复制功能
|
3 years ago |
|
x_z
|
f06dc47afb
|
1.提交设备巡检计划相关代码
|
3 years ago |
|
郑明梁
|
9d42a60f66
|
多级产品页面代码提交
|
3 years ago |
|
x_z
|
37b4be08b2
|
1.修改设备领用逻辑，审核通过后添加到部门设备明细
2.添加保修单，科室设备明细等相关表实体类
3.添加科室设备明细增删改查接口
|
3 years ago |
|
郑明梁
|
3651b54080
|
多级产品页面代码提交
|
3 years ago |
|
郑明梁
|
a89aba0977
|
多级产品页面代码提交
|
3 years ago |
|
anthonywj
|
3495384ef5
|
新增数据同步代码
|
3 years ago |
|
x_z
|
2f48a29839
|
1.初步完成出入库汇总逻辑
|
3 years ago |
|
wangwei
|
c1cfccbf87
|
同步代码
|
3 years ago |
|
anthonywj
|
0b746a5a09
|
单据流程相关迁移到UDI管理系统
|
3 years ago |
|
x_z
|
aca8b1b682
|
1.添加查询汇总记录详情接口
|
3 years ago |
|
x_z
|
9a9b292495
|
1.提交查询汇总记录列表接口
|
3 years ago |
|
郑明梁
|
7ccb108d02
|
计划查询代码提交
|
3 years ago |
|
郑明梁
|
6a20c521f8
|
申购查询代码提交
|
3 years ago |
|
x_z
|
340073ea81
|
1.添加物资出入库汇总数据生成代码
|
3 years ago |
|
郑明梁
|
3dd30519db
|
产品申购添加领用单引入
|
3 years ago |
|
郑明梁
|
176f808bca
|
产品申购添加领用单引入
|
3 years ago |
|
郑明梁
|
ac1839b825
|
耗材字典维护编辑添加院内分类
|
3 years ago |
|
郑明梁
|
261c0154be
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
f8a7c55c09
|
单据相关bug修改
|
3 years ago |
|
郑明梁
|
770405f62a
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java
|
3 years ago |
|
郑明梁
|
a1c70d91dc
|
同步自助代码
|
3 years ago |
|
x_z
|
ab39ecfcad
|
1.关闭jmx，修复测试环境下tomcat多服务无法成功启动问题
|
3 years ago |
|
x_z
|
44941fb089
|
1.完善资质预警代码
|
3 years ago |
|
anthonywj
|
3fd70cfdec
|
自助平台同步bug修改
|
3 years ago |
|
x_z
|
501454a868
|
1.添加资质预警相关代码
|
3 years ago |
|
郑明梁
|
a50c53339d
|
修改产品资质bug
|
3 years ago |
|
郑明梁
|
3f9968e9a3
|
产品添加预警设置
|
3 years ago |
|
x_z
|
66def2b763
|
1.修复部门用户查询错误问题
|
3 years ago |
|
anthonywj
|
e96b7424cf
|
无序列号验收，扫码暂时去除缓存查询
|
3 years ago |
|
x_z
|
cd3f09e887
|
1.修复库存养护，设备领用等功能的bug
|
3 years ago |
|
x_z
|
667a51a126
|
1.完善盘点转单逻辑
2.修复空库状态下添加部门失败问题
|
3 years ago |
|
wangwei
|
78dde4ca60
|
修改资产管理页面 及bug
|
3 years ago |
|
anthonywj
|
1cdfb36774
|
添加耗材字典对应集采信息，bug修改
|
3 years ago |
|
x_z
|
1bb83857a9
|
1.完成库存预警功能
|
3 years ago |
|
郑明梁
|
261f7212f4
|
新增耗材表relCode lowStockNum字段
|
3 years ago |
|
郑明梁
|
319e07d641
|
修改内部码bug
|
3 years ago |
|
郑明梁
|
095680513b
|
删除院内分类关联表代码
|
3 years ago |
|
x_z
|
90dd44579f
|
1.调整库存预警功能逻辑
|
3 years ago |
|
郑明梁
|
df0df7d7c1
|
修改院内分类功能代码
|
3 years ago |
|
wangwei
|
e6d60c1ba2
|
修改bug
|
3 years ago |
|
x_z
|
811f721067
|
1.调整预警信息相关代码
|
3 years ago |
|
郑明梁
|
599ccc6a28
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
a5b125e2a4
|
库存查询语句修改
|
3 years ago |
|
wangwei
|
bc47d769be
|
修改bug
|
3 years ago |
|
郑明梁
|
3aead441db
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
46d09234fe
|
内部码打印bug修改
|
3 years ago |
|
wangwei
|
1a9bc3856c
|
修改bug
|
3 years ago |
|
wangwei
|
8c8291c5d8
|
修改仓库bug
|
3 years ago |
|
wangwei
|
6dc5bb55ee
|
修改bug
|
3 years ago |
|
wangwei
|
73caacae13
|
修改实体类 新增设备领用bug
|
3 years ago |
|
郑明梁
|
72e08edcce
|
修改业务新增bug
|
3 years ago |
|
x_z
|
2e63c41c13
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
76a73d95f8
|
1.添加库存产品名称列表接口
|
3 years ago |
|
anthonywj
|
731976a40c
|
新增条码完整性校验缓存表，关联关系等
|
3 years ago |
|
郑明梁
|
4b7640bd51
|
采购订单管理功能代码提交
|
3 years ago |
|
x_z
|
f0f4b215c0
|
1.完善库存预警消息提醒，添加测试环境配置文件
|
3 years ago |
|
wangwei
|
deefec3fa6
|
修改bug
|
3 years ago |
|
x_z
|
17798d6057
|
1.添加采购单据实体类，修改预警消息生成逻辑
|
3 years ago |
|
anthonywj
|
cb435dabe3
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
fb786e3271
|
bug修改
|
3 years ago |
|
x_z
|
dcbc6712eb
|
1.添加库存预警相关的实体类和接口
|
3 years ago |
|
郑明梁
|
d74a95f05f
|
耗材字典院内分类功能代码提交
|
3 years ago |
|
x_z
|
735076879a
|
1.修复耗材字典查询bug，添加新表的实体类
|
3 years ago |
|
x_z
|
2ffcc5103a
|
1.生成表对应实体类
|
3 years ago |
|
anthonywj
|
2e99d05ae9
|
新增库存提醒功能
|
3 years ago |
|
郑明梁
|
1a7df25952
|
预验收数据bug修复
|
3 years ago |
|
郑明梁
|
0ec54ddd64
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
cc794ea107
|
修改单据编辑bug
|
3 years ago |
|
wangwei
|
e72352d7f0
|
修改仓库bug
|
3 years ago |
|
x_z
|
5e915fd4f0
|
1.修复库存查询功能的bug
|
3 years ago |
|
anthonywj
|
a7b199f6bd
|
新增患者使用溯源功能
|
3 years ago |
|
郑明梁
|
82dbbc2129
|
修改耗材单据bug
|
3 years ago |
|
x_z
|
c6ce533caf
|
1.添加单据上传接收日志查询，删除接口
|
3 years ago |
|
郑明梁
|
70b4ccef64
|
修改耗材单据bug
|
3 years ago |
|
x_z
|
b772499867
|
1.添加提交单据相关接口
|
3 years ago |
|
anthonywj
|
dfd5e936cb
|
业务单据，库存相关bug修改
|
3 years ago |
|
郑明梁
|
b911d27085
|
申购计划审核生成业务单据bug修改
|
3 years ago |
|
郑明梁
|
3bfb013a2c
|
单据打印功能代码提交
|
3 years ago |
|
anthonywj
|
8a41703215
|
单据类型，仓库，新增寄售功能，关联库存，寄售库存，以及其他联动
|
3 years ago |
|
anthonywj
|
cec198ff66
|
业务异常单据校验
|
3 years ago |
|
wangwei
|
f60570502e
|
修改bug
|
3 years ago |
|
anthonywj
|
a493526502
|
模板单据问题修改
|
3 years ago |
|
anthonywj
|
a380f67945
|
单据相关bug修改，单据撤回，单据编辑
|
3 years ago |
|
wangwei
|
2a6f601792
|
修改bug
|
3 years ago |
|
郑明梁
|
25e5fbe0b6
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
4079cb0d0d
|
业务单据内部码打印功能代码提交
|
3 years ago |
|
anthonywj
|
0b46d88e47
|
单据相关bug修改
|
3 years ago |
|
wangwei
|
3e53996498
|
修改操作日志bug
|
3 years ago |
|
anthonywj
|
f68b2e4597
|
单据相关bug修改
|
3 years ago |
|
anthonywj
|
7e9452d7de
|
第三方单据选入相关修改
|
3 years ago |
|
郑明梁
|
b1ddfaa2d8
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
37be575f8e
|
内部码打印功能代码提交
|
3 years ago |
|
anthonywj
|
a643f5388f
|
仓库Dao修改
|
3 years ago |
|
anthonywj
|
113a178779
|
第三方单据修整，模板上传bug
|
3 years ago |
|
wangwei
|
c3c648eeb9
|
修改操作日志bug
|
3 years ago |
|
wangwei
|
d5afa86ad0
|
修改操作日志bug
|
3 years ago |
|
x_z
|
ee41bab71a
|
1.添加inv_inner_order_pdf_temp表对应实体类文件
|
3 years ago |
|
x_z
|
0fcd4afa4b
|
1.提交inv_inner_order_print表生成实体类和dao文件
|
3 years ago |
|
郑明梁
|
001a7d2065
|
耗材领用单据状态查询修改
|
3 years ago |
|
anthonywj
|
043e87dc35
|
去掉
|
3 years ago |
|
anthonywj
|
699974a05e
|
第三方单据类型关联修改，
|
3 years ago |
|
anthonywj
|
d6abb99481
|
第三方单据类型，领用单据徐选入
|
3 years ago |
|
郑明梁
|
8faadb6066
|
内部码打印代码提交
|
3 years ago |
|
郑明梁
|
913dca5ebc
|
耗材领用管理代码提交
|
3 years ago |
|
anthonywj
|
44afbdd651
|
单据相关bug修改
|
3 years ago |
|
anthonywj
|
c5dab991d3
|
预验收功能
|
3 years ago |
|
anthonywj
|
528deba44f
|
预验收相关功能
|
3 years ago |
|
x_z
|
5f6ee6ff6a
|
1.添加单据编辑码详情查询接口
|
3 years ago |
|
anthonywj
|
8742683103
|
单据相关bug修改
|
3 years ago |
|
x_z
|
1173860b09
|
1.添加单据编辑查询和修改时间接口
|
3 years ago |
|
anthonywj
|
6f7cb9124e
|
修改bug，修改Integer 为int
|
3 years ago |
|
wangwei
|
cccfe44098
|
修改仓库信息bug
|
3 years ago |
|
x_z
|
d8da9f5c71
|
1.修复单据相关的bug
|
3 years ago |
|
wangwei
|
239ca19545
|
修改bug
|
3 years ago |
|
anthonywj
|
96d811e8da
|
手持终端流向查询，库存查询 ，验收等
|
3 years ago |
|
x_z
|
45c5a209c2
|
1.库存查询添加分组
|
3 years ago |
|
anthonywj
|
9de2e3881c
|
插入库存无批次号问题，手持终端扫码验收
|
3 years ago |
|
x_z
|
a91cb4e194
|
1.修复单据相关的问题
|
3 years ago |
|
wangwei
|
982568f600
|
修改bug
|
3 years ago |
|
x_z
|
b0b5476d75
|
1.添加盘点单据查询库存详情列表接口
|
3 years ago |
|
anthonywj
|
ac32ef672d
|
补单问题，pda单据提交
|
3 years ago |
|
x_z
|
c2c18bb715
|
1.补充盘点转单代码
|
3 years ago |
|
x_z
|
e57b30d9fc
|
1.添加盘点单据相关实体类和接口
|
3 years ago |
|
anthonywj
|
c1a5abea65
|
单据
|
3 years ago |
|
wangwei
|
8216e6fcbd
|
修改bug
|
3 years ago |
|
wangwei
|
2db5497a93
|
修改bug
|
3 years ago |
|
x_z
|
7adf992a61
|
1.提交设备领用表实体类
|
3 years ago |
|
x_z
|
9e6b381738
|
1.添加设备领用养护接口
|
3 years ago |
|
anthonywj
|
db961a82f4
|
单据流程相关修改
|
3 years ago |
|
x_z
|
8d88121854
|
1.修改设备领用养护接口参数
|
3 years ago |
|
x_z
|
5e2ff3cdc2
|
1.添加设备领用和养护实体类及dao接口和xml文件
|
3 years ago |
|
x_z
|
f1e9becf45
|
1.调整库存养护功能接口
|
3 years ago |
|
anthonywj
|
e963f74448
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
a6c0d34522
|
1.添加库存养护功能接口
|
3 years ago |
|
anthonywj
|
38c5001097
|
单据流程梳理
|
3 years ago |
|
郑明梁
|
2958725a39
|
修改页面显示问题
|
3 years ago |
|
anthonywj
|
bd98eaa7e2
|
单据领用
|
3 years ago |
|
x_z
|
e6153fa85b
|
1.添加库存养护功能实体类和相关接口代码
|
3 years ago |
|
郑明梁
|
fae35d058a
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
f7d3031ef0
|
采购计划代码提交
|
3 years ago |
|
x_z
|
e0b1296f0c
|
1.添加库存摆放功能接口
|
3 years ago |
|
x_z
|
69e0f65b61
|
1.添加库存统计接口
|
3 years ago |
|
x_z
|
4a79b317fa
|
1.完善部分查询接口逻辑，添加重复添加校验
|
3 years ago |
|
郑明梁
|
cb4d5a52ba
|
采购计划代码提交
|
3 years ago |
|
x_z
|
61415aa489
|
1.修复单据生成等接口的bug
|
3 years ago |
|
wangwei
|
03c5f5c16f
|
修改bug
|
3 years ago |
|
x_z
|
db7c6405e3
|
1.添加删除寄售库存接口
|
3 years ago |
|
x_z
|
3c9a46b7fe
|
1.添加寄售库存实体类和查询接口
|
3 years ago |
|
wangwei
|
5d26e2372e
|
修改bug
|
3 years ago |
|
郑明梁
|
8d6ae5b67b
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
a7873d3831
|
申购代码提交
|
3 years ago |
|
x_z
|
709f0abf12
|
1.调整单据查询逻辑，修改单据状态值参数
|
3 years ago |
|
anthonywj
|
d526c615c5
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
6014dd7640
|
单据类型，委托验收相关功能
|
3 years ago |
|
x_z
|
6892a86ce7
|
1.调整仓库列表查询接口
|
3 years ago |
|
wangwei
|
f49fb06de3
|
修改bug
|
3 years ago |
|
x_z
|
9e42e8ee52
|
1.修改单据列表查询接口，修改参数标识
|
3 years ago |
|
x_z
|
d2dcf47003
|
1.删除库存详情原始码字段
|
3 years ago |
|
anthonywj
|
01d818b715
|
新增单据->库存流程走通
|
3 years ago |
|
wangwei
|
ae12da06a5
|
修改bug
|
3 years ago |
|
anthonywj
|
2bffc13f85
|
仓库用户相关问题修改
|
3 years ago |
|
anthonywj
|
86b7e95a1d
|
单据流程->可生成库存
|
3 years ago |
|
x_z
|
acb39129e9
|
1.添加库存查询相关接口
|
3 years ago |
|
wangwei
|
5d20f2ec30
|
Merge branch 'ww'
|
3 years ago |
|
郑明梁
|
0ac6508f6a
|
修改第三方业务单据bug
|
3 years ago |
|
wangwei
|
ec4719e21d
|
修改bug
|
3 years ago |
|
郑明梁
|
987f6070f0
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
01d3a73c1c
|
扫码单据删除，生成库存后单据流转
|
3 years ago |
|
x_z
|
3892f53aac
|
1.修改单据查询代码
|
3 years ago |
|
郑明梁
|
8a7acda25d
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
98ece52110
|
首营资质 资质新增代码提交
|
3 years ago |
|
wangwei
|
70ca0e5697
|
修改bug
|
3 years ago |
|
wangwei
|
f9f64870a7
|
修改bug
|
3 years ago |
|
anthonywj
|
8fe7d604e0
|
单据流程->库存
|
3 years ago |
|
x_z
|
1abb492345
|
1.提交单据扫码明细等基础代码
|
3 years ago |
|
x_z
|
24a1236685
|
1.添加单据，码表相关的查询接口
|
3 years ago |
|
wangwei
|
7b89981fa3
|
修改bug
|
3 years ago |
|
郑明梁
|
4775da6533
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
4fd3f08bf1
|
耗材字典导入导出代码提交
|
3 years ago |
|
anthonywj
|
c2472cb5e6
|
仓库部门，单据类型相关修改
|
3 years ago |
|
x_z
|
0ccebc0721
|
1.添加正式码表查询接口文件
|
3 years ago |
|
wangwei
|
85794c2162
|
修改bug
|
3 years ago |
|
wangwei
|
a9b5f7d4d3
|
Merge branch 'ww'
|
3 years ago |
|
wangwei
|
97c96219d2
|
修改bug
|
3 years ago |
|
x_z
|
ce4ad58370
|
1.修复单据类型的bug
2.合并第三方单据查询参数类
3.添加单据的查询参数，修复其他bug
|
3 years ago |
|
x_z
|
e55b64da99
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
4777dbfb4d
|
1.修复单据类型字段前后端不统一问题
2.修复查询候选单据无数问题
3.新增，编辑单据类型添加重名校验
|
3 years ago |
|
郑明梁
|
59959b9ef7
|
修改基础数据往来单位类名字
|
3 years ago |
|
wangwei
|
8ebbc94f00
|
Merge branch 'ww'
|
3 years ago |
|
wangwei
|
a07e72141a
|
修改bug
|
3 years ago |
|
郑明梁
|
8a4c97aa56
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
ce92c21b3d
|
删除基础数据往来单位导入详情表
|
3 years ago |
|
anthonywj
|
fa28d577e7
|
订单详情类，耗材字典bug修改，扫码添加
|
3 years ago |
|
wangwei
|
c396310a26
|
修改bug
|
3 years ago |
|
anthonywj
|
02e236724a
|
用户修改，单据类型修改，往来单位修改，单据管理
|
3 years ago |
|
x_z
|
a2e2e31e6d
|
1.修复系统管理和基础数据的bug
|
3 years ago |
|
anthonywj
|
58bf32ddf5
|
供应商耗材字典管理，单据管理
|
3 years ago |
|
x_z
|
b5f30ce1c4
|
1.调整单据流转接口
|
3 years ago |
|
郑明梁
|
5fd7c291d0
|
基础信息往来信息代码提交
|
3 years ago |
|
x_z
|
35ada6f5ef
|
1.提交单据生成功能（原耗材领用设置）接口代码
|
3 years ago |
|
x_z
|
25c1e6e0b1
|
1.调整单据类型接口
|
3 years ago |
|
anthonywj
|
7f5c21cc64
|
仓库关联单据类型修改
|
3 years ago |
|
x_z
|
05aaaee797
|
1.调整补单设置实体类字段
2.补全补单设置部分接口代码
|
3 years ago |
|
郑明梁
|
9b2c6851ef
|
往来单位信息代码提交
|
3 years ago |
|
x_z
|
f15f5e6eaf
|
1.添加第三方系统单据类型关联查询接口
2.生成往来单位字典表实体类及对应的mapper文件和接口
|
3 years ago |
|
anthonywj
|
bc15c42c82
|
第三方仓库，仓库信息修改
|
3 years ago |
|
x_z
|
83ef10e32f
|
1.完成添加编辑单据类型接口
|
3 years ago |
|
郑明梁
|
9ebf416b75
|
必填字段插入
|
3 years ago |
|
郑明梁
|
d5aab2f18c
|
修改往来单位实体类名字
|
3 years ago |
|
郑明梁
|
9f5c9687b1
|
第三方单据代码提交
|
3 years ago |
|
anthonywj
|
5da45aea70
|
解决mybatisplus问题，新增mybatis基类
|
3 years ago |
|
anthonywj
|
0a025cf733
|
耗材字典新增，修改完善
|
3 years ago |
|
anthonywj
|
9d0876b452
|
耗材字典新增包装单位字段
|
3 years ago |
|
anthonywj
|
be75d33c1a
|
耗材字典新增包装单位字段
|
3 years ago |
|
anthonywj
|
d4dac4091c
|
1.系统管理相关问题修复，重命名；
2.耗材字典相关代码提交
|
3 years ago |
|
郑明梁
|
647e84b5c2
|
第三方库存信息代码提交
|
3 years ago |
|
郑明梁
|
c05c55d808
|
第三方产品信息导入导出代码提交
|
3 years ago |
|
郑明梁
|
a25f2c8e57
|
第三方产品信息导入导出代码提交
|
3 years ago |
|
x_z
|
af87625995
|
1.补充补单设置相关接口
|
3 years ago |
|
x_z
|
d179dbbf49
|
1.添加获取用户ID字符串工具方法
|
3 years ago |
|
x_z
|
2826e138c0
|
1.添加单据类型接口代码
2.添加第三方产品导入导出实体类
|
3 years ago |
|
郑明梁
|
461c42ed70
|
产品信息增加实体类参数
|
3 years ago |
|
郑明梁
|
4b7de1e2f7
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/http/ErpBasicClient.java
|
3 years ago |
|
郑明梁
|
0f1f64439b
|
产品信息代码提交
|
3 years ago |
|
x_z
|
96a020c6bc
|
1.添加第三方单据类型相关接口
|
3 years ago |
|
x_z
|
4df9ca7662
|
1.添加sql性能分析插件，调整测试环境配置文件，添加单据类型相关接口
|
3 years ago |
|
anthonywj
|
b1b6a1b849
|
新增第三系统设置以及接口相关代码
|
3 years ago |
|
x_z
|
023651133f
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
1ed8f561a9
|
1.添加单据类型查询接口
|
3 years ago |
|
anthonywj
|
d3ce0449b6
|
bug修改，新增设备，模板等模块
|
3 years ago |
|
x_z
|
6a79144a39
|
1.添加单据类型，补单单据类型，第三方单据类型，转单设置相关实体类和接口代码
|
3 years ago |
|
anthonywj
|
cb205b0361
|
日志管理，角色菜单树形列表无法展示问题
|
3 years ago |
|
anthonywj
|
64ae05af65
|
仓库-用户
|
3 years ago |
|
anthonywj
|
3b8455ebe6
|
删除非必要权限相关代码类，更改数据库命名相关代码修改
|
3 years ago |
|
anthonywj
|
08fb8afc63
|
删除非必要权限相关代码类，更改数据库命名相关代码修改
|
3 years ago |
|
anthonywj
|
839b9bebff
|
仓库与货位相关代码
|
3 years ago |
|
anthonywj
|
d9a5d78b7b
|
first commit
|
3 years ago |
