郑明梁
|
cdce81ecb1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
eda6292cf0
|
库存明细打印
|
2 years ago |
薛宇
|
d95fa8811c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
1995a0c9ec
|
建议在“同步设置”页面，添加扫码单据类型功能模块：新增一个 搜索框功能
|
2 years ago |
黄泽腾
|
d1d99533ce
|
代码备份
|
2 years ago |
|
黄泽腾
|
5c451346ea
|
供应商发票页面优化问题
|
2 years ago |
wangwei
|
f5bd541e24
|
修改 新增单据明细重复问题
|
2 years ago |
|
wangwei
|
16a7a61a73
|
发票打印
|
2 years ago |
|
wangwei
|
f98133e100
|
修改 用内部码进行调拨出库 提示库存不足问题
|
2 years ago |
|
黄泽腾
|
4fd3c726f0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
60952f6168
|
新增往来单位搜索备份
|
2 years ago |
anthonywj
|
a9d68d3048
|
单据自动提交至第三方系统问题修改
|
2 years ago |
|
黄泽腾
|
0dec5c2ed0
|
生成不了多级的内部码，会自动变成一级的内部码（片仔癀诊断和管理系统都有这个问题）
|
2 years ago |
|
郑明梁
|
010bcc3b2e
|
预验收单据新增备注查询
|
2 years ago |
|
wangwei
|
596a46130e
|
去除废弃字段
|
2 years ago |
|
anthonywj
|
ce5ff68e76
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
4f25b9ee57
|
新增备注字段查询时查备注或病人信息
|
2 years ago |
|
薛宇
|
e7392620b6
|
单据类型未启用，仍然可以做单（片仔癀诊断和管理系统都有这个问题）
|
2 years ago |
|
anthonywj
|
d53c9e87ab
|
新增第三方单据自动下载与配置，日志生成等
|
2 years ago |
|
anthonywj
|
660d748cfa
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
5810d14716
|
修改诊断现存量查询，库存实时查询
|
2 years ago |
|
1178634255
|
c95b52a538
|
新增采购订单-产品录入：生产企业、注册/备案证号搜索框无法查询
|
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 |
|
郑明梁
|
ec39ea48d1
|
修改往来单位查询问题
|
2 years ago |
|
schry
|
390f69b215
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
schry
|
1abae0b4db
|
物资资质审核拒绝完，资质证书变成暂无数据
|
2 years ago |
|
anthonywj
|
f0788e4067
|
bug修改
|
2 years ago |
|
郑明梁
|
0617359bca
|
内部码打印bug修复
|
2 years ago |
|
郑明梁
|
dbbf5a8811
|
定数包去掉无用代码
|
2 years ago |
|
郑明梁
|
e01ec88f65
|
内部码打印问题修复
|
2 years ago |
|
wangwei
|
b86501eb88
|
新增出入库单 di绑定多个产品 产品重复问题
|
2 years ago |
|
郑明梁
|
fad888eeac
|
Merge branch 'dev' into test
|
2 years ago |
|
郑明梁
|
6b05a72d5b
|
yml
|
2 years ago |
|
1178634255
|
165b81a0b2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
1178634255
|
c241831d6d
|
代码更新
|
2 years ago |
|
anthonywj
|
3438e4e2fb
|
bug修改
|
2 years ago |
|
1178634255
|
de6f13ec27
|
修改密码代码备份
|
2 years ago |
|
schry
|
5fe7fb4067
|
页面优化
|
2 years ago |
|
1178634255
|
e20a65a00c
|
新增扫码单模块到待校验单据模块，备注会消失
|
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
|
485d563f47
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
f1245c8fc9
|
切换分支备份
|
2 years ago |
|
郑明梁
|
3081327066
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
b1fc3a50ef
|
修改bug
|
2 years ago |
|
anthonywj
|
1e29c762ce
|
第三方产品信息更新问题
|
2 years ago |
|
郑明梁
|
1f260cb9de
|
单据上传拉取客户修改outType类型
|
2 years ago |
|
郑明梁
|
23d7d1623f
|
定数包sql提交
|
2 years ago |
|
郑明梁
|
883084f4c5
|
定数包代码提交
|
2 years ago |
|
anthonywj
|
2e7d4c0999
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/resources/application-dev.yml
|
2 years ago |
|
anthonywj
|
bec91b93ca
|
新增协调平台追溯查询
|
2 years ago |
|
wangwei
|
b53b9a921f
|
Merge remote-tracking branch 'origin/dev' into test
|
2 years ago |
|
wangwei
|
ecf449e079
|
yml提交
|
2 years ago |
|
郑明梁
|
86bd9ebc9c
|
往来单位是客户的客户类型为患者
|
2 years ago |
wj
|
b94747dc7f
|
环境调整
|
2 years ago |
|
郑明梁
|
de55970ff8
|
定数包加工代码初始化
|
2 years ago |
|
郑明梁
|
3445442cbb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
dad49893d3
|
定数包设置代码提交
|
2 years ago |
|
anthonywj
|
0acfe9785f
|
单据上传至第三方相关调整，bug修改调整
|
2 years ago |
|
anthonywj
|
dae7656fff
|
单据上传至第三方相关调整，bug修改调整
|
2 years ago |
|
anthonywj
|
3e28f48933
|
待校验，等相关修改，
|
2 years ago |
|
郑明梁
|
29df3286de
|
申购单流转价格问题修复
|
2 years ago |
|
anthonywj
|
2faa905bfb
|
第三方单据上传bug，发票重复bug
|
2 years ago |
|
anthonywj
|
ae4ff7d291
|
单据校验备份
|
2 years ago |
|
郑明梁
|
c50bd49100
|
多次出库bug修复
|
2 years ago |
|
郑明梁
|
e3bb14f114
|
定数包实体初始化
|
2 years ago |
|
anthonywj
|
c1d4d1b1df
|
分类第三方产品信息问题
|
2 years ago |
|
郑明梁
|
32be3ec3e8
|
新增申购单选入申购新增物资类别搜索
|
2 years ago |
|
anthonywj
|
91ff79f125
|
第三方产品信息编辑bug
|
2 years ago |
|
郑明梁
|
5513726e0b
|
单据上传功能
|
2 years ago |
|
anthonywj
|
069069e32b
|
bug修改
|
2 years ago |
|
anthonywj
|
aa17be0b83
|
bug修改
|
2 years ago |
|
郑明梁
|
5a377fe206
|
客户管理bug修复
|
2 years ago |
|
anthonywj
|
fce5d7b7c6
|
申购单据，采购订单等相关修改
|
2 years ago |
|
anthonywj
|
f66705d82b
|
采购计划，采购订单等相关修改
|
2 years ago |
|
anthonywj
|
86f084836e
|
选入第三方业务单据修改
|
2 years ago |
|
wangwei
|
77256a1516
|
bug修改
|
2 years ago |
|
郑明梁
|
dcb4cad964
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
4730d6fe78
|
单据上传功能代码提交
|
2 years ago |
|
wangwei
|
054804cf7c
|
Merge remote-tracking branch 'origin/zmlDev' into dev
|
2 years ago |
|
wangwei
|
628066d7c6
|
bug修改
|
2 years ago |
|
wangwei
|
b7ecf98f9e
|
Merge remote-tracking branch 'origin/zmlDev' into dev
|
2 years ago |
|
wangwei
|
73057d3570
|
物资类别bug修改
|
2 years ago |
|
anthonywj
|
5c0a78e70c
|
基础信息相关修改
|
2 years ago |
|
郑明梁
|
17a0e0b99c
|
Merge branch 'zmlDev' into dev
|
2 years ago |
|
郑明梁
|
2576df6d2b
|
Merge remote-tracking branch 'origin/zmlDev' into zmlDev
|
2 years ago |
|
郑明梁
|
31d1c52a30
|
单据上传功能代码提交
|
2 years ago |
|
wangwei
|
607414c4a1
|
物资类别bug修改
|
2 years ago |
|
郑明梁
|
c5b7ba7db5
|
客户管理功能代码提交
|
2 years ago |
|
anthonywj
|
a09eb7c2da
|
多级产品出库问题，申购新增备注字段搜索
|
2 years ago |
|
wangwei
|
5e3901e040
|
物资类别功能
|
2 years ago |
|
anthonywj
|
53aa0b11a8
|
界面标题等logo修改
|
2 years ago |
|
wangwei
|
60b96aaec6
|
带票出入库明细 增加查询条件等
|
2 years ago |
|
郑明梁
|
2127c2f170
|
物资类别功能代码初始化
|
2 years ago |
|
郑明梁
|
ab2bdfafbd
|
Merge branch 'dev' into test
|
2 years ago |
|
郑明梁
|
11be2ef830
|
修改货位上架按当前仓库筛选,和汇总导出加上仓库字段
|
2 years ago |
|
郑明梁
|
c4eb74f73e
|
Merge branch 'pro' into test
|
2 years ago |
|
郑明梁
|
ce2aa13b5f
|
修改单据bug
|
2 years ago |
|
anthonywj
|
dd1f68f103
|
发票相关问题修改
|
2 years ago |
|
anthonywj
|
84b7aae6dc
|
发票修改同步
|
2 years ago |
|
郑明梁
|
02a17df71a
|
多次出库bug修改
|
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 |
|
anthonywj
|
374f8261f8
|
相关bug修改
|
2 years ago |
|
wangwei
|
320b8f0487
|
单据排序
|
2 years ago |
|
郑明梁
|
bfbb85eb57
|
统计汇总代码提交
|
2 years ago |
|
wangwei
|
d4e0107b91
|
新增出入库 物资录入查询问题
|
2 years ago |
|
郑明梁
|
d1fe07356c
|
多次出入库代码提交
|
2 years ago |
|
wangwei
|
2178f1ca37
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wangwei
|
690d415779
|
新增申购 调整产品录入多选
|
2 years ago |
|
郑明梁
|
ef0bdb8869
|
sql inv_place_order_detail 增加 topInvSpaceCode字段
|
2 years ago |
|
郑明梁
|
d1eb441bca
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
90f1b6c334
|
产品名称转拼音首字母
|
2 years ago |
|
anthonywj
|
9249249182
|
申购产品生产企业对不上问题
|
2 years ago |
|
anthonywj
|
1a015238d6
|
采购计划提交系统繁忙问题，物资字典选入系统繁忙，生产企业查询系统繁忙
|
2 years ago |
|
anthonywj
|
d2cd3f803d
|
申购单据产品查询修改，提交采购订单修改
|
2 years ago |
|
wangwei
|
545905a5f3
|
新增申购产品录入多选问题
|
2 years ago |
|
anthonywj
|
bb43c32a1e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
d3697401a2
|
单据上传重盖
|
2 years ago |
|
郑明梁
|
d4119a70a8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
66d890ab18
|
业务单据功能修改
|
2 years ago |
|
anthonywj
|
eb3f48ce04
|
代码合并
|
2 years ago |
|
1178634255
|
68586c23cb
|
上传设置备份
|
2 years ago |
|
anthonywj
|
70c0784584
|
申购，相关查询修改
|
2 years ago |
|
anthonywj
|
f51054ea40
|
第三方单据上传类型修改
|
2 years ago |
|
郑明梁
|
b895be051e
|
产品表新增拼音字段
|
2 years ago |
|
郑明梁
|
6b004099d3
|
业务单据功能优化
|
2 years ago |
|
anthonywj
|
e9dbef05a8
|
Merge branch 'dev' into test
|
2 years ago |
|
anthonywj
|
b8a5a9bc6c
|
Merge branch 'dev' into test
|
2 years ago |
|
wangwei
|
bd75cdeee8
|
修改bug
|
2 years ago |
|
郑明梁
|
673006306a
|
预验收库查询bug修复
|
2 years ago |
|
郑明梁
|
393172f736
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
ba9711c467
|
库存预警bug修复
|
2 years ago |
|
wangwei
|
e0dc1d264c
|
库存预警信息 重置之后数据错误问题
|
2 years ago |
|
郑明梁
|
17a7d9859f
|
物资拜放bug修复
|
2 years ago |
|
郑明梁
|
4b4d6beb7a
|
第三方bug修改
|
2 years ago |
|
郑明梁
|
f81471d4e6
|
新增扫码单据排序
|
2 years ago |
|
郑明梁
|
847de9c01b
|
汇总代码提交
|
2 years ago |
|
郑明梁
|
269ddea831
|
物资查询按照isDisable字段查询
|
2 years ago |
|
郑明梁
|
8e35509a93
|
业务管理按时间排序
|
2 years ago |
|
anthonywj
|
0f93175ce0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
17827ab959
|
第三方产品信息接口新增厂家编码，供应商编码
|
2 years ago |
|
郑明梁
|
de32494a78
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
e713e03a31
|
日和月统计代码提交
|
2 years ago |
|
anthonywj
|
3e53fea186
|
第三方接口下载bug修改
|
2 years ago |
|
anthonywj
|
f7d09c1ec4
|
第三方接口相关修改
|
2 years ago |
|
wj
|
39f3fbf14d
|
Merge branch 'dev' into test
|
2 years ago |
|
郑明梁
|
2d685b75d9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
4099c75d05
|
物资去掉放回id提交
|
2 years ago |
|
wj
|
21b81c5e40
|
bug修复
|
2 years ago |
|
wj
|
e3fdd85986
|
bug修复
|
2 years ago |
|
wj
|
1496bb4bda
|
bug修复--改方法名
|
2 years ago |
|
wj
|
1f3ba38e22
|
bug修复
|
2 years ago |
|
wj
|
8096c1933e
|
bug修复
|
2 years ago |
|
1178634255
|
46d5cb0181
|
内部码标签打印
|
2 years ago |
|
wj
|
d02dc617a8
|
sql记录
|
2 years ago |
|
wj
|
ab780d007f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
dc0a842edf
|
ThrSystemDetailEntity增加表名,ThrProductsEntity增加字段[生产厂家编码,配送企业编码]
|
2 years ago |
|
郑明梁
|
ddf0a1866f
|
内部码报表打印代码提交
|
2 years ago |
|
anthonywj
|
5619aa362c
|
代码备份
|
2 years ago |
|
郑明梁
|
fe4b0082e3
|
单据报表打印代码提交
|
2 years ago |
|
schry
|
301e5812fa
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
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
|
多次使用出库新增功能代码提交
|
2 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 |
