anthonywj
|
d160138cb7
|
切换分支备份
|
2 years ago |
郑明梁
|
60f9a148de
|
领用代码提交
|
2 years ago |
黄泽腾
|
0d85313688
|
Merge branch 'dev' into dev2.0
|
2 years ago |
黄泽腾
|
8af8962464
|
发票DI编码展示
|
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
|
5a22d137d8
|
预验收选入时增加过滤条件
|
2 years ago |
薛宇
|
f189d0b6a3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
anthonywj
|
1846ce85dc
|
发票相关以orderresult表为准
|
2 years ago |
薛宇
|
c43873fafd
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
anthonywj
|
0b613af049
|
bug修改,物资字典boolean ->Boolean
|
2 years ago |
郑明梁
|
72b367af15
|
发票bug修复
|
2 years ago |
薛宇
|
a14a6140bf
|
库存查询的注册/备案号显示多个
|
2 years ago |
郑明梁
|
3b0d22d0e0
|
单据bug修改
|
2 years ago |
郑明梁
|
ba0cfd96c9
|
维护出入库增加状态控制
|
2 years ago |
anthonywj
|
46f3da4e6e
|
单据备注问题
|
2 years ago |
黄泽腾
|
1516a5104f
|
往来单位查询
|
2 years ago |
黄泽腾
|
6b6280852f
|
往来单位查询
|
2 years ago |
黄泽腾
|
5c451346ea
|
供应商发票页面优化问题
|
2 years ago |
wangwei
|
f5bd541e24
|
修改 新增单据明细重复问题
|
2 years ago |
wangwei
|
16a7a61a73
|
发票打印
|
2 years ago |
郑明梁
|
010bcc3b2e
|
预验收单据新增备注查询
|
2 years ago |
anthonywj
|
4f25b9ee57
|
新增备注字段查询时查备注或病人信息
|
2 years ago |
anthonywj
|
30dcdfd553
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
郑明梁
|
40fe92d304
|
发票代码提交
|
2 years ago |
anthonywj
|
89732532fa
|
Merge branch 'dev_ywj' into dev
|
2 years ago |
郑明梁
|
dbbf5a8811
|
定数包去掉无用代码
|
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 |
郑明梁
|
b1fc3a50ef
|
修改bug
|
2 years ago |
郑明梁
|
883084f4c5
|
定数包代码提交
|
2 years ago |
anthonywj
|
bec91b93ca
|
新增协调平台追溯查询
|
2 years ago |
郑明梁
|
de55970ff8
|
定数包加工代码初始化
|
2 years ago |
anthonywj
|
0acfe9785f
|
单据上传至第三方相关调整,bug修改调整
|
2 years ago |
anthonywj
|
dae7656fff
|
单据上传至第三方相关调整,bug修改调整
|
2 years ago |
anthonywj
|
3e28f48933
|
待校验,等相关修改,
|
2 years ago |
郑明梁
|
5513726e0b
|
单据上传功能
|
2 years ago |
郑明梁
|
5a377fe206
|
客户管理bug修复
|
2 years ago |
郑明梁
|
4730d6fe78
|
单据上传功能代码提交
|
2 years ago |
郑明梁
|
17a0e0b99c
|
Merge branch 'zmlDev' into dev
|
2 years ago |
郑明梁
|
31d1c52a30
|
单据上传功能代码提交
|
2 years ago |
郑明梁
|
c5b7ba7db5
|
客户管理功能代码提交
|
2 years ago |
anthonywj
|
a09eb7c2da
|
多级产品出库问题,申购新增备注字段搜索
|
2 years ago |
wangwei
|
60b96aaec6
|
带票出入库明细 增加查询条件等
|
2 years ago |
郑明梁
|
11be2ef830
|
修改货位上架按当前仓库筛选,和汇总导出加上仓库字段
|
2 years ago |
郑明梁
|
ce2aa13b5f
|
修改单据bug
|
2 years ago |
anthonywj
|
84b7aae6dc
|
发票修改同步
|
2 years ago |
郑明梁
|
d8fe73595b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
郑明梁
|
487473f91c
|
多次出库bug修改
|
2 years ago |
wangwei
|
68fd6641ba
|
同步代码 发票优化
|
2 years ago |
wangwei
|
320b8f0487
|
单据排序
|
2 years ago |
郑明梁
|
bfbb85eb57
|
统计汇总代码提交
|
2 years ago |
郑明梁
|
d1fe07356c
|
多次出入库代码提交
|
2 years ago |
郑明梁
|
f81471d4e6
|
新增扫码单据排序
|
2 years ago |
郑明梁
|
847de9c01b
|
汇总代码提交
|
2 years ago |
郑明梁
|
e713e03a31
|
日和月统计代码提交
|
2 years ago |
schry
|
f0b8407c29
|
选入领用单据:“往来单位”查询框查询不到数据 230522
|
2 years ago |
郑明梁
|
7bbd253d1a
|
多次使用出库新增功能代码提交
|
2 years ago |
郑明梁
|
3a26eafb7d
|
多次使用出库新增功能代码提交
|
2 years ago |
郑明梁
|
14c4bd0248
|
多次使用出库新增功能代码提交
|
2 years ago |
郑明梁
|
32ff539034
|
多次使用出库设置功能代码提交
|
2 years ago |
anthonywj
|
c3d9c20bc6
|
新增多次使用出库功能
|
2 years ago |
anthonywj
|
aaff1b1d7f
|
发票系统繁忙问题
|
2 years ago |
郑明梁
|
92e2a0fe89
|
inv_user_product,inv_user_product_detail表初始化代码提交
|
2 years ago |
wangwei
|
d83efd3e94
|
新增领用单 审核领用单 查询领用单 无法根据往来信息查询问题
|
2 years ago |
wangwei
|
d55358b8cd
|
修改查询发票方法
|
2 years ago |
anthonywj
|
8a8965e1e7
|
新增单据详情,发票、确认状态,同步更新,
|
2 years ago |
wangwei
|
36a62ff67b
|
修改查询发票方法
|
2 years ago |
wangwei
|
972ed90e40
|
同步 优化发票代码
|
2 years ago |
wj
|
624aee5f1e
|
id映射问题
|
2 years ago |
wangwei
|
f45d18ec7f
|
同步发票代码
|
2 years ago |
wangwei
|
94118141b5
|
发票修改
|
2 years ago |
anthonywj
|
a7ef10a6d7
|
寄售出库问题,预验收入库问题,同步问题,领用单据问题
|
2 years ago |
anthonywj
|
cc248bab94
|
上线bug修改,同步修改,发票修改
|
2 years ago |
anthonywj
|
1f6a08e74c
|
新增三期拣货,无三期拣货,为配货等页面
|
2 years ago |
郑明梁
|
d6e68e11d2
|
出入库明细代码修改
|
2 years ago |
anthonywj
|
4278cf047e
|
bug修改
|
2 years ago |
郑明梁
|
140403de6d
|
耗材领用单据提交
|
2 years ago |
x_z
|
f6ca9ee95b
|
1.初步完成第三方系统接口定时任务
|
2 years ago |
x_z
|
02f1ce16c6
|
1.提交代码
|
2 years ago |
anthonywj
|
ec9c295e03
|
单据库存相关代码迁移
|
2 years ago |
anthonywj
|
a8504f276e
|
代码迁移备份,预验收退回修改
|
2 years ago |
anthonywj
|
76994ae9f5
|
领用单据审核bug修改,自动生成业务单,扫码单等修改迁移
|
2 years ago |
wangwei
|
1e57b7ca4f
|
汇总记录,导出excel
|
2 years ago |
wangwei
|
7d6341a9c2
|
导出excel
|
2 years ago |
x_z
|
2e2b7d0bda
|
1.修复无单据类型时查询单据表报错问题
|
2 years ago |
anthonywj
|
d47ff60dd6
|
迁移自助平台单据相关代码
|
2 years ago |
anthonywj
|
39baff10bf
|
UDI管理系统定时上传,定时下载单据相关
|
2 years ago |
郑明梁
|
106909d8be
|
修改耗材领用bug
|
2 years ago |
郑明梁
|
9d42a60f66
|
多级产品页面代码提交
|
2 years ago |
郑明梁
|
3651b54080
|
多级产品页面代码提交
|
2 years ago |
郑明梁
|
a89aba0977
|
多级产品页面代码提交
|
2 years ago |
x_z
|
2f48a29839
|
1.初步完成出入库汇总逻辑
|
2 years ago |
anthonywj
|
0b746a5a09
|
单据流程相关迁移到UDI管理系统
|
2 years ago |
x_z
|
aca8b1b682
|
1.添加查询汇总记录详情接口
|
2 years ago |
x_z
|
9a9b292495
|
1.提交查询汇总记录列表接口
|
2 years ago |
x_z
|
340073ea81
|
1.添加物资出入库汇总数据生成代码
|
2 years ago |
郑明梁
|
3dd30519db
|
产品申购添加领用单引入
|
2 years ago |
anthonywj
|
731976a40c
|
新增条码完整性校验缓存表,关联关系等
|
2 years ago |
郑明梁
|
0ec54ddd64
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |