anthonywj
|
89732532fa
|
Merge branch 'dev_ywj' into dev
|
2 years ago |
郑明梁
|
ec39ea48d1
|
修改往来单位查询问题
|
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 |
|
anthonywj
|
375ff7aa5d
|
新增第三方单据上传过滤
|
2 years ago |
|
anthonywj
|
b3b935c0fe
|
根据单据类型查询问题
|
2 years ago |
|
anthonywj
|
6c2e5b7f14
|
备份
|
2 years ago |
|
anthonywj
|
428ed71f4e
|
申购单据，采购订单等相关修改
|
2 years ago |
|
anthonywj
|
4cd4d9b44c
|
单据重复提交问题
|
2 years ago |
|
郑明梁
|
3a26eafb7d
|
多次使用出库新增功能代码提交
|
2 years ago |
|
anthonywj
|
38f2e7b1a6
|
修改文件统一路径
|
2 years ago |
|
anthonywj
|
59a0078a84
|
新增按货位出库功能
|
2 years ago |
|
anthonywj
|
75077b05a4
|
同步相关问题修改。用户选入物资字典相关修改
|
2 years ago |
wj
|
46fe9a5e7d
|
测试环境调整
|
2 years ago |
|
anthonywj
|
a7ef10a6d7
|
寄售出库问题，预验收入库问题，同步问题，领用单据问题
|
2 years ago |
|
wj
|
09915f0e66
|
手动上传数据
|
2 years ago |
|
anthonywj
|
3cae7526bc
|
摆货相关修改，添加货位查询，预验收，寄售等相关库存摆货
|
2 years ago |
|
anthonywj
|
eec7d4f87a
|
带配货功能修改
|
2 years ago |
x_z
|
90340e2607
|
1.调整摆放功能代码，添加上架记录
|
2 years ago |
|
anthonywj
|
37af4d2462
|
合并同步 分支
|
2 years ago |
|
wj
|
1c6ebe2899
|
调整
|
2 years ago |
|
anthonywj
|
aa9d903fd7
|
bug修改
|
2 years ago |
|
anthonywj
|
655ecb508c
|
bug修复
|
2 years ago |
|
anthonywj
|
4318495bac
|
同步数据bug相关修复
|
2 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
|
2 years ago |
|
wj
|
0499617822
|
系统设置同步
|
2 years ago |
|
anthonywj
|
4ea1efaa92
|
同步数据bug相关修复
|
2 years ago |
|
anthonywj
|
1f6a08e74c
|
新增三期拣货，无三期拣货，为配货等页面
|
2 years ago |
|
wj
|
3f4c4511d6
|
第三方数据同步
|
2 years ago |
|
wj
|
1517d71b78
|
用户数据同步
|
2 years ago |
|
anthonywj
|
1e82f37f7f
|
物资字典参数设置，单据类型修改
|
2 years ago |
|
wj
|
729badbb04
|
由内向外同步
|
2 years ago |
|
wj
|
6c13eb05d4
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
cdfda6af2a
|
由内向外同步
|
2 years ago |
wangwei
|
1524185bc6
|
同步 内部码
|
2 years ago |
|
anthonywj
|
a8504f276e
|
代码迁移备份，预验收退回修改
|
2 years ago |
|
wj
|
e871f8a9a2
|
设置统一入口
|
2 years ago |
|
wj
|
dea175b4d7
|
下载同步数据--其他数据
|
2 years ago |
|
wj
|
4d26d59cd2
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
61bbeeda53
|
拉取基础数据 插入数据库
|
2 years ago |
|
anthonywj
|
7b96cfab4e
|
1.单据类型修改，
2。预验收退回，
3.预验收库存
|
2 years ago |
|
anthonywj
|
2bd885c398
|
同步国家库数据
|
2 years ago |
|
x_z
|
c68cb845a0
|
1.添加第三方基础数据同步和系统设置同步代码
|
2 years ago |
|
anthonywj
|
5c09ceeb6e
|
同步设置页面重整，，基础数据上传，单据类型上传
|
2 years ago |
|
anthonywj
|
b9590dcd50
|
单据同步相关修改
|
2 years ago |
|
anthonywj
|
d14cba051e
|
单据类型迁移，内部码打印迁移
|
2 years ago |
|
anthonywj
|
78efd5b5eb
|
页面展示，同步相关修改
|
2 years ago |
|
anthonywj
|
adc2bae64b
|
新增业务单据同步
|
2 years ago |
|
anthonywj
|
1569560f5f
|
代码备份
|
2 years ago |
|
anthonywj
|
39baff10bf
|
UDI管理系统定时上传，定时下载单据相关
|
2 years ago |
|
x_z
|
e2fbaf9443
|
1.调整巡检计划相关代码
|
2 years ago |
|
x_z
|
37b4be08b2
|
1.修改设备领用逻辑，审核通过后添加到部门设备明细
2.添加保修单，科室设备明细等相关表实体类
3.添加科室设备明细增删改查接口
|
2 years ago |
|
anthonywj
|
b2779284f0
|
bug相关修改，业务单据修改
|
2 years ago |
|
anthonywj
|
0b746a5a09
|
单据流程相关迁移到UDI管理系统
|
2 years ago |
|
x_z
|
9868ebd8d0
|
1.添加生成单日出入库汇总数据逻辑
|
2 years ago |
|
郑明梁
|
4b7640bd51
|
采购订单管理功能代码提交
|
2 years ago |
|
anthonywj
|
dfd5e936cb
|
业务单据，库存相关bug修改
|
2 years ago |
|
郑明梁
|
4079cb0d0d
|
业务单据内部码打印功能代码提交
|
2 years ago |
|
anthonywj
|
f68b2e4597
|
单据相关bug修改
|
2 years ago |
|
anthonywj
|
113a178779
|
第三方单据修整，模板上传bug
|
2 years ago |
|
anthonywj
|
96d811e8da
|
手持终端流向查询，库存查询 ，验收等
|
2 years ago |
|
x_z
|
9e6b381738
|
1.添加设备领用养护接口
|
2 years ago |
|
anthonywj
|
38c5001097
|
单据流程梳理
|
2 years ago |
|
anthonywj
|
bd98eaa7e2
|
单据领用
|
2 years ago |
|
郑明梁
|
f7d3031ef0
|
采购计划代码提交
|
2 years ago |
|
x_z
|
709f0abf12
|
1.调整单据查询逻辑，修改单据状态值参数
|
2 years ago |
|
x_z
|
6892a86ce7
|
1.调整仓库列表查询接口
|
2 years ago |
|
x_z
|
9e42e8ee52
|
1.修改单据列表查询接口，修改参数标识
|
2 years ago |
|
anthonywj
|
01d818b715
|
新增单据->库存流程走通
|
2 years ago |
|
anthonywj
|
86b7e95a1d
|
单据流程->可生成库存
|
2 years ago |
|
x_z
|
1177a02870
|
1.修改单据状态值
|
2 years ago |
|
anthonywj
|
0f3d83a854
|
单据校验相关修改
|
2 years ago |
|
anthonywj
|
58bf32ddf5
|
供应商耗材字典管理，单据管理
|
2 years ago |
|
anthonywj
|
d9a5d78b7b
|
first commit
|
3 years ago |
