郑明梁
|
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 |
|
anthonywj
|
8a8965e1e7
|
新增单据详情，发票、确认状态，同步更新，
|
3 years ago |
|
anthonywj
|
1003d2ec8f
|
业务单据详情改成雪花ID
|
3 years ago |
|
wangwei
|
36a62ff67b
|
修改查询发票方法
|
3 years ago |
|
wangwei
|
89e467a764
|
修改寄售 预验收库存查询
|
3 years ago |
|
anthonywj
|
23dacbc0d7
|
bug修改
|
3 years ago |
|
wangwei
|
972ed90e40
|
同步 优化发票代码
|
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 |
|
wangwei
|
f45d18ec7f
|
同步发票代码
|
3 years ago |
|
郑明梁
|
fa09ca7078
|
物质摆放功能代码提交
(cherry picked from commit e880330e7c)
|
3 years ago |
|
wj
|
943cea1816
|
Merge branch 'master' into dev
|
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 |
