薛宇
|
8ce12fb507
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
薛宇
|
b9252fa091
|
资质上传到本地
|
2 years ago |
黄泽腾
|
48905ddb6f
|
Merge branch 'dev' into dev2.0
# Conflicts:
# src/main/java/com/glxp/api/controller/purchase/SupProductController.java
|
2 years ago |
|
薛宇
|
9b3d6927d1
|
minion相关
|
2 years ago |
郑明梁
|
e1f4439413
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
9e2ccae13e
|
单据上传修改
|
2 years ago |
anthonywj
|
6b0a8cf8cc
|
新增同步操作日志相关方法
|
2 years ago |
|
anthonywj
|
bc7237177c
|
代码备份
|
2 years ago |
|
薛宇
|
625249dea0
|
根据注册证件备案号判断资质证书
|
2 years ago |
|
anthonywj
|
629dddb9f9
|
修改BeanUtil.copyProperties方法
|
2 years ago |
|
黄泽腾
|
99506e1f40
|
物资资质新增--新增配送产品资质信息
|
2 years ago |
|
anthonywj
|
2a790a07d7
|
新增发票确认实时同步
|
2 years ago |
|
anthonywj
|
7ed62f3b38
|
新增websocket通信（中继服务同步相关）
|
2 years ago |
|
anthonywj
|
24739fb392
|
单据维护删除系统繁忙问题
|
2 years ago |
|
anthonywj
|
5ca5575e96
|
协调平台时间格式问题
|
2 years ago |
|
郑明梁
|
025672466a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
9f9dab9a0c
|
单据上传修改
|
2 years ago |
|
anthonywj
|
4ddd90dda3
|
发票相关以orderresult表为准
|
2 years ago |
|
郑明梁
|
b8d3481155
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
b72f49a0c9
|
修改注释
|
2 years ago |
|
薛宇
|
b4689cf9b2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
21e014ad7d
|
资质预警信息
|
2 years ago |
|
anthonywj
|
532c75ac11
|
采购订单无法选择送货单问题
|
2 years ago |
|
anthonywj
|
1c32645b85
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
5194ab6afa
|
bug修改 耗材字典字段修改
|
2 years ago |
|
郑明梁
|
4fa156876a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
80225d5788
|
单据bug修改
|
2 years ago |
|
薛宇
|
e1625cf500
|
资质预警
|
2 years ago |
|
薛宇
|
da3ffff81b
|
业务管理---采购订单处理窗口选择不了入库单据类型
|
2 years ago |
|
薛宇
|
10b15fae56
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
d2cc2d992f
|
bug修改 耗材字典字段修改
|
2 years ago |
|
郑明梁
|
c09b475ec8
|
发票问题修复
|
2 years ago |
|
黄泽腾
|
284394a17f
|
内部码打印，选入单据后，点击 打印--生成内部码 时 报系统繁忙
|
2 years ago |
|
郑明梁
|
566733a841
|
单据上传问题修复
|
2 years ago |
|
anthonywj
|
b23d7397bb
|
bug修改
|
2 years ago |
|
anthonywj
|
d19f96d2ca
|
库存校验比对
|
2 years ago |
|
薛宇
|
86ed836dbf
|
新增业务单填写的备注信息，在待校验单据中无法修改成功
|
2 years ago |
|
薛宇
|
3b819eab23
|
新增业务单备注修改
|
2 years ago |
|
薛宇
|
72a1d3d4c1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
薛宇
|
cba234ce10
|
新增扫码单备注
|
2 years ago |
|
郑明梁
|
e1a160380e
|
修改资质打印问题
|
2 years ago |
|
黄泽腾
|
1e839762b0
|
字段更新
|
2 years ago |
|
郑明梁
|
49908c0db9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
1f28b106a4
|
单据上传
|
2 years ago |
|
黄泽腾
|
10293c4e99
|
多级码绑定产品后，数量会变成1
|
2 years ago |
|
anthonywj
|
13e9aa5793
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
9955a21ec1
|
同步单据审核时间不一致问题
|
2 years ago |
|
黄泽腾
|
9d492aac78
|
基础数据——内部码打印，未按照最新创建时间进行排序
|
2 years ago |
|
anthonywj
|
6c91a2e9e7
|
资质证书校验问题相关修改
|
2 years ago |
|
郑明梁
|
85a4d6a26e
|
单据上传
|
2 years ago |
|
郑明梁
|
2510734ae2
|
库存明细打印
|
2 years ago |
|
黄泽腾
|
388d68b3ae
|
生成对应内部码
|
2 years ago |
|
黄泽腾
|
d43833aad2
|
添加往来单位查询
|
2 years ago |
wangwei
|
d53659b272
|
发票打印
|
2 years ago |
|
anthonywj
|
6834adf0d5
|
发票重复提问题
|
2 years ago |
|
郑明梁
|
d63e309d3b
|
合并代码
|
2 years ago |
|
anthonywj
|
15e6b8d168
|
新增备注字段
|
2 years ago |
|
anthonywj
|
3583d17057
|
国家库更新版本问题
|
2 years ago |
|
1178634255
|
4924f0b723
|
发票-产品明细 页面，DI/物资编码没有显示
|
2 years ago |
|
anthonywj
|
cd1077c08f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
1fe4597caf
|
同步不补单问题
|
2 years ago |
|
schry
|
099632d85b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
schry
|
58bd268f47
|
供应商管理中的供应商账号 将供应商账号禁用后还能正常登录
|
2 years ago |
|
1178634255
|
256ea64d25
|
预验收库存查询 查询单据信息时提示有误
|
2 years ago |
|
anthonywj
|
52e7c14328
|
寄售实际入库单补单问题
|
2 years ago |
|
anthonywj
|
f06f280f39
|
解決內網时间不同步数据同步问题，去除多余GS1符号
|
2 years ago |
|
1178634255
|
0f1d57bcfa
|
代码更新
|
2 years ago |
|
anthonywj
|
22f96a53e9
|
UDI码追溯新增数量问题
|
2 years ago |
|
郑明梁
|
48d0bc8350
|
新增出入库单三期校验重复扫码问题修复
|
2 years ago |
|
anthonywj
|
eb48e66a36
|
int型修改
|
2 years ago |
|
郑明梁
|
b4997b7ec7
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
bd641b6063
|
内部码解析修改
|
2 years ago |
wj
|
b0421c0298
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
013a9a3178
|
代码调整
|
2 years ago |
|
anthonywj
|
8d0b2d27cf
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
5e9d092264
|
修改ms查询单据类型
|
2 years ago |
|
wj
|
43a067bc4b
|
代码调整
|
2 years ago |
|
郑明梁
|
bfb9746a97
|
发票bug修复
|
2 years ago |
|
wj
|
95e5787b1f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
56347b42d5
|
代码调整
|
2 years ago |
|
anthonywj
|
8c885991b3
|
过滤追溯查询单据
|
2 years ago |
|
wj
|
17e03fb9a3
|
代码调整
|
2 years ago |
|
wj
|
7594fa138e
|
ms上传调整
|
2 years ago |
|
wj
|
97628c8015
|
ms上传调整
|
2 years ago |
|
wj
|
170c39a53e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
0b93501508
|
属性copy调整
|
2 years ago |
|
1178634255
|
c5cb19cdda
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
1178634255
|
fd89a744c5
|
代码更新
|
2 years ago |
|
anthonywj
|
fcaabc888a
|
单据同步更新问题
|
2 years ago |
|
1178634255
|
853fe6e897
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
1178634255
|
c46575f8d2
|
代码更新
|
2 years ago |
|
wj
|
5a11fafa8e
|
还原
|
2 years ago |
|
郑明梁
|
0bd7c00292
|
发票代码提交
|
2 years ago |
|
1178634255
|
0ea118f03e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
1178634255
|
e735cab2e7
|
密码修改
|
2 years ago |
|
anthonywj
|
8e33768fb8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
b78a5a35c3
|
单据业务详情丢失，单据未补单，使用出库多补退货单等问题
|
2 years ago |
|
wj
|
7bdaf137b6
|
还原
|
2 years ago |
|
wj
|
1d2f030f67
|
别名调整
|
2 years ago |
|
wj
|
7816c44344
|
别名调整
|
2 years ago |
|
郑明梁
|
26865894d0
|
UDIMS平台验证接口提交
|
2 years ago |
|
anthonywj
|
dce2904b65
|
新增按发票登记相关接口
|
2 years ago |
|
anthonywj
|
654d32def0
|
关联DI必填字段不被覆盖
|
2 years ago |
|
anthonywj
|
fdbe829ef0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
d6f9e3f06a
|
临床使用出库单新增备注字段
|
2 years ago |
|
wj
|
d3802d7606
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
e47cc79388
|
ReplaceBatch.java调整
|
2 years ago |
|
anthonywj
|
f89170c3df
|
是否包含序列号
|
2 years ago |
|
anthonywj
|
3caf75626b
|
bug修改，提供协调平台追溯查询接口
|
2 years ago |
|
anthonywj
|
ce0da2cd18
|
，bug修改
|
2 years ago |
|
郑明梁
|
f85520eccf
|
创建仓库编码取最大值
|
2 years ago |
|
郑明梁
|
3fa40797e0
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
35c8440d5b
|
第三方产品信息编辑，bug修改
|
2 years ago |
|
郑明梁
|
33c4793870
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
dbc8030980
|
代码备份
|
2 years ago |
|
anthonywj
|
e322f91fda
|
第三方产品信息编辑，bug修改
|
2 years ago |
|
郑明梁
|
f02fbc16c2
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
3e67b15a4d
|
扫码单据资质证书校验
|
2 years ago |
|
郑明梁
|
472fc4f30c
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
5bac5e9dee
|
UDI管理系统与UDIMS同步过来数据不进行删除
|
2 years ago |
|
anthonywj
|
82d08be38d
|
代码备份
|
2 years ago |
|
anthonywj
|
b1d1b446d2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
694e560243
|
采购订单同步问题
|
2 years ago |
|
郑明梁
|
eac48ebe51
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
61ae73c856
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
b4243db10c
|
更新审核人，核对人，供应商编辑信息bug
|
2 years ago |
|
郑明梁
|
5236bfaf39
|
单据上传功能代码提交
|
2 years ago |
|
郑明梁
|
8f11acd645
|
单据上传功能代码提交
|
2 years ago |
|
郑明梁
|
dbcb7bbaf1
|
Merge remote-tracking branch 'origin/pro' into dev
# Conflicts:
# src/main/java/com/glxp/api/controller/auth/LoginController.java
|
2 years ago |
|
郑明梁
|
b4acc0a913
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
e39c57f68a
|
基础信息相关修改
|
2 years ago |
|
anthonywj
|
287b8e762a
|
基础信息相关修改
|
2 years ago |
|
郑明梁
|
d14f2dbefd
|
单据上传功能代码提交
|
2 years ago |
|
wangwei
|
b295e9e811
|
去除多余代码
|
2 years ago |
|
anthonywj
|
111a68c728
|
内部码查询问题
|
2 years ago |
|
郑明梁
|
a862ff7651
|
管理ms拉自助平台接口提交
|
2 years ago |
|
anthonywj
|
491ef762df
|
界面标题，logo修改
|
2 years ago |
|
anthonywj
|
17e69d34b5
|
排序问题
|
2 years ago |
|
郑明梁
|
1067aebdfe
|
Merge branch 'dev' into test
|
2 years ago |
|
anthonywj
|
4f0da29206
|
相关bug修改
|
2 years ago |
|
anthonywj
|
2fd1ca3559
|
单据验收，库存不足问题
|
2 years ago |
|
wangwei
|
b8fcfa9d0b
|
代码恢复 修改新增货位问题
|
2 years ago |
|
wangwei
|
a5db577785
|
修改 供应商字典导出id问题
|
2 years ago |
|
wangwei
|
035c05c4f5
|
修改 admin设置产品为可集采状态，供应商 入院物资没同步更新
|
2 years ago |
|
anthonywj
|
82c73f6eb3
|
发票修改优化
|
2 years ago |
|
anthonywj
|
c57e232dfb
|
发票问题代码备份
|
2 years ago |
|
wangwei
|
3ac25d320a
|
修改bug
|
2 years ago |
|
wangwei
|
f4771d3382
|
优化
|
2 years ago |
|
wangwei
|
d67ef1050c
|
发票价格不匹配时 状态是未登记
|
2 years ago |
|
anthonywj
|
8198a35458
|
发票问题
|
2 years ago |
|
anthonywj
|
005fff4671
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/glxp/api/controller/inout/IoOrderController.java
|
2 years ago |
|
wangwei
|
8733e63cd5
|
发票优化
|
2 years ago |
|
wangwei
|
82fadb3e7d
|
单据 添加排序
|
2 years ago |
|
郑明梁
|
79df891647
|
送货发票登记接口优化
|
2 years ago |
|
郑明梁
|
d52bb00a18
|
送货发票登记接口优化
|
2 years ago |
|
郑明梁
|
e7e5cac0bb
|
送货发票登记接口优化
|
2 years ago |
|
anthonywj
|
0a393fc1ae
|
根据实际数量计算金额
|
2 years ago |
|
anthonywj
|
f20c17083d
|
根据实际数量计算金额
|
2 years ago |
|
anthonywj
|
b9edabf126
|
序列号校验
|
2 years ago |
|
anthonywj
|
ae1be7bbf3
|
新增单据复制功能
|
2 years ago |
|
郑明梁
|
fc70a92213
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
e3ad9e47f6
|
新增单据bug修复
|
2 years ago |
|
wangwei
|
842fb00813
|
发票二维码解析
|
2 years ago |
|
anthonywj
|
69ea52be42
|
内部码打印问题，启用使用单元数量问题
|
2 years ago |
|
anthonywj
|
7f4f58c92e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
8e1bd4621c
|
单据审核UDI码后面加GS1符号
|
2 years ago |
|
郑明梁
|
42141422a1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
24057e1458
|
新增扫码单据排序
|
2 years ago |
|
anthonywj
|
5b2ad5b348
|
单据重复提交问题
|
2 years ago |
|
anthonywj
|
491173a242
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
e6cf46a50c
|
打印全部内部码问题
|
2 years ago |
|
wj
|
522cbb27b9
|
Merge branch 'dev' into test
|
2 years ago |
|
wj
|
9ad3ec4311
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
e5406f64f4
|
最新代码提交
|
2 years ago |
|
anthonywj
|
044313f22b
|
relId 去掉用雪花ID生成
|
2 years ago |
|
wj
|
169e50ac78
|
Merge branch 'dev' into test
|
2 years ago |
|
wj
|
b3eca1daaa
|
最新代码提交
|
2 years ago |
|
anthonywj
|
c6a74080d0
|
relId long型修改
|
2 years ago |
|
wj
|
d068fb6f73
|
insertIgnoreBatch/replaceBatch改造
|
2 years ago |
|
wj
|
aff2dadc3c
|
insertIgnoreBatch/replaceBatch改造
|
2 years ago |
|
wj
|
f88ac7da1c
|
Merge branch 'dev' into test
|
2 years ago |
|
wj
|
ed0793f0c2
|
bug修复
|
2 years ago |
|
wj
|
c9eb7079a2
|
Merge branch 'dev' into test
|
2 years ago |
|
wj
|
e4ed256783
|
平台验证接口增加返回单据类型
|
2 years ago |
|
wj
|
a3b551a2b0
|
Merge branch 'dev' into test
|
2 years ago |
|
wj
|
10472f7815
|
平台验证接口增加返回单据类型
|
2 years ago |
|
郑明梁
|
c7adf7bbb4
|
内部码和明细打印代码提交
|
2 years ago |
|
郑明梁
|
7670517b97
|
Merge branch 'master' into dev
# Conflicts:
# src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java
# src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java
# src/main/resources/schemas/schema_v2.1.sql
|
2 years ago |
|
郑明梁
|
be1c63e774
|
内部码和明细打印代码提交
|
2 years ago |
|
郑明梁
|
69c3c9e830
|
内部码和明细打印代码提交
|
2 years ago |
|
1178634255
|
cd9a944c0f
|
修复待校验单据模块中的‘编辑单据’窗口，功能按钮点击无反应
|
2 years ago |
|
anthonywj
|
50d5996c65
|
物资字典编辑问题
|
2 years ago |
|
anthonywj
|
7c6b5b1da3
|
内部码打印问题
|
2 years ago |
|
wj
|
ae06cb6f4c
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
c2c7b0b339
|
增加平台验证接口
|
3 years ago |
|
wj
|
86a14f88f5
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
2169d3300d
|
增加平台验证接口
|
3 years ago |
|
wj
|
493a30dd5d
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
aeedcdd984
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
97c84757da
|
增加平台验证接口
|
3 years ago |
|
anthonywj
|
7998af918e
|
代码备份
|
3 years ago |
|
anthonywj
|
0083117df9
|
采购订单，单据流转等修改
|
3 years ago |
|
anthonywj
|
d458e72c7e
|
资质证书同步修改，检验报告冷链报告支持多条，单据类型修改
|
3 years ago |
|
wj
|
03b98fceb6
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
d5bee1722d
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
2ed04f6c42
|
bug修复
|
3 years ago |
|
schry
|
36602ee0e6
|
入院物资维护模块选入页面字段名称不一致
|
3 years ago |
|
schry
|
cfc32f6bdc
|
解决本企业资质证书添加错误
|
3 years ago |
|
schry
|
43571f316c
|
解决添加资质证书提示错误
|
3 years ago |
|
郑明梁
|
0ee194313d
|
内部码和明细打印代码提交
(cherry picked from commit b493e80846)
|
3 years ago |
|
anthonywj
|
6122a793b7
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
anthonywj
|
974e26a3e9
|
发票刷新系统繁忙问题
|
3 years ago |
|
wangwei
|
aa8fee64d1
|
冷链报告
|
3 years ago |
|
郑明梁
|
b493e80846
|
内部码和明细打印代码提交
|
3 years ago |
|
anthonywj
|
f3b92944ae
|
采购订单问题
|
3 years ago |
|
wj
|
a90aed66fc
|
调整
|
3 years ago |
|
wj
|
82ce51f0a1
|
调整
|
3 years ago |
|
wangwei
|
e15f17b2db
|
bug修改
|
3 years ago |
|
anthonywj
|
bd23124565
|
bug修改
|
3 years ago |
|
wangwei
|
94a6af5fef
|
bug修改
|
3 years ago |
|
wangwei
|
213b1a6aee
|
bug修改
|
3 years ago |
|
wangwei
|
133b778a99
|
bug修改
|
3 years ago |
|
anthonywj
|
c46eebd1f4
|
检验报告没更新问题
|
3 years ago |
|
wangwei
|
016e323566
|
修改bug
|
3 years ago |
|
wangwei
|
6153bc7907
|
资质打印
|
3 years ago |
|
wangwei
|
f6d2ed3816
|
内部码
|
3 years ago |
|
郑明梁
|
2c20566d39
|
单据打印修改打印地址
|
3 years ago |
|
wj
|
b44bbc53b0
|
向内同步国家库数据
|
3 years ago |
|
wj
|
edb34d1f92
|
使用自定义Iservice和ServiceImpl
|
3 years ago |
|
wj
|
4a38f13d7b
|
自定义Iservice和ServiceImpl
|
3 years ago |
|
wangwei
|
b9738be229
|
如果角色存在用户关联 就不能禁用此角色
|
3 years ago |
|
anthonywj
|
fde36ac636
|
单据同步bug
|
3 years ago |
|
anthonywj
|
6130e90770
|
模板单据预览修改
|
3 years ago |
|
anthonywj
|
9f9ad88b16
|
库存查询
|
3 years ago |
|
wangwei
|
fbda76440c
|
修改bug
|
3 years ago |
|
wangwei
|
f8b7f78d64
|
修改发票查询方法
|
3 years ago |
|
wangwei
|
316cafe9a0
|
角色修改问题
|
3 years ago |
|
anthonywj
|
0f903962a3
|
发票刷新修改，更新同步问题
|
3 years ago |
|
wj
|
1f904a6263
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
d2b6289733
|
文件下载调整
|
3 years ago |
|
wj
|
dc8930f2c3
|
提示文案调整
|
3 years ago |
|
wangwei
|
18bf0924ec
|
修改排序
|
3 years ago |
|
anthonywj
|
795b57b500
|
发票新增，或更新同步问题
|
3 years ago |
|
wj
|
cd8cebda30
|
Merge branch 'dev' into test
|
3 years ago |
|
anthonywj
|
e4864f67e4
|
单据详情改为雪花ID
|
3 years ago |
|
wangwei
|
db77297df4
|
查询发票方法修改
|
3 years ago |
|
wj
|
84e31c8ae1
|
bug修复
|
3 years ago |
|
wj
|
b5656de6b6
|
bug修复
|
3 years ago |
|
wj
|
fcd744930f
|
文件下载调整
|
3 years ago |
|
wj
|
2a3dcb6564
|
文件下载调整
|
3 years ago |
|
wj
|
22cf3f4687
|
手动同步调整
|
3 years ago |
|
wj
|
9f436e8aa6
|
手动同步调整
|
3 years ago |
|
wj
|
907d19d0d1
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
21f46347ad
|
手动同步调整
|
3 years ago |
|
wangwei
|
1ce939aacf
|
修改bug
|
3 years ago |
|
wj
|
f5397a245e
|
手动同步调整
|
3 years ago |
|
wj
|
07d671975b
|
手动同步调整
|
3 years ago |
|
郑明梁
|
c074b53599
|
物质摆放变更功能代码提交
|
3 years ago |
|
wangwei
|
6e2d85ed76
|
修改bug 寄售 预验收 带票库存详情加排序
|
3 years ago |
|
wj
|
596f11a597
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
62b26214a6
|
id类型调整
|
3 years ago |
|
wj
|
2d623577f1
|
id类型调整，异常打印
|
3 years ago |
|
wj
|
7efba33fc0
|
数据上传接口调整
|
3 years ago |
|
wj
|
26473b3658
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
b0683426dc
|
数据同步调整
|
3 years ago |
|
anthonywj
|
282459ca4e
|
bug修改
|
3 years ago |
|
wj
|
7d0ad99a74
|
时间判断调整
|
3 years ago |
|
wj
|
56ac3bb262
|
判断调整
|
3 years ago |
|
wangwei
|
2832d8944c
|
发票 优化
|
3 years ago |
|
anthonywj
|
f5f69fb26b
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
anthonywj
|
f155b6d580
|
货位，bug修改，单据同步修改
|
3 years ago |
|
wj
|
a74ce2f9d5
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
f52cdb3844
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
2ed8b33180
|
id类型问题
|
3 years ago |
|
wangwei
|
83697b44bd
|
修改发票bug 添加金额 总金额
|
3 years ago |
|
anthonywj
|
7e6f38b274
|
Merge branch 'master' into dev
|
3 years ago |
|
anthonywj
|
54fefd81d9
|
获取最大货位
(cherry picked from commit 2a2397a7d1)
|
3 years ago |
|
anthonywj
|
2a2397a7d1
|
获取最大货位
|
3 years ago |
|
anthonywj
|
2a7fe6c1e9
|
供应商注册无更新时间，新增排序规则，倒序正序，仓库问题
|
3 years ago |
|
wj
|
3221cb8d73
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
45bb688407
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
19f3441991
|
修复bug-3283
|
3 years ago |
|
wangwei
|
298f3f3507
|
发票修改
(cherry picked from commit ff1f825b39)
|
3 years ago |
|
wangwei
|
ff1f825b39
|
发票修改
|
3 years ago |
|
wj
|
71a605718c
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
49eb0cfe9d
|
Merge branch 'master' into dev
|
3 years ago |
|
anthonywj
|
2d3bd6fe09
|
同步相关问题修改。用户选入物资字典相关修改
|
3 years ago |
|
wj
|
4df8848899
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
5d248ac9e9
|
测试联通接口调整
|
3 years ago |
|
wj
|
86487f966e
|
替换replaceBatch
|
3 years ago |
|
wj
|
c90077142f
|
增加自定义sql注入器
|
3 years ago |
|
wj
|
b8a9e47004
|
Merge branch 'master' into test
|
3 years ago |
|
wangwei
|
2f8d38c961
|
增加字段
|
3 years ago |
|
wangwei
|
1a56d8e7ad
|
发票修改
|
3 years ago |
|
anthonywj
|
cfa8a8c257
|
入账库存问题
|
3 years ago |
|
anthonywj
|
c032003936
|
上线bug修改，同步修改，发票修改
|
3 years ago |
|
wj
|
9ce5728647
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
f170787fc5
|
异步同步
|
3 years ago |
|
wj
|
42d931d688
|
增设枚举
|
3 years ago |
|
wj
|
932bb96b2f
|
手动调用同步数据
|
3 years ago |
|
wj
|
725142ff47
|
代码调整
|
3 years ago |
|
wj
|
2169de489e
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
925a203e4e
|
增加执行信息
|
3 years ago |
|
wj
|
74fc1dd6a8
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
98c0b2ed30
|
增加执行信息
|
3 years ago |
|
郑明梁
|
cfaacae0b6
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
0b093bed9a
|
用户修改角色失败修复
|
3 years ago |
|
anthonywj
|
9434f89b5c
|
同步设置系统繁忙问题
|
3 years ago |
|
wj
|
1062a3ebe3
|
切换默认环境为test
|
3 years ago |
|
anthonywj
|
92030749fd
|
bug修改
|
3 years ago |
|
anthonywj
|
355462683e
|
代码备份
|
3 years ago |
|
anthonywj
|
3c2812ee61
|
中继同步相关代码提交备份
|
3 years ago |
|
anthonywj
|
c615867b18
|
单据类型，仓库编辑修改
|
3 years ago |
|
anthonywj
|
6d52ad21cf
|
同步bug修改
|
3 years ago |
|
anthonywj
|
84860f6672
|
Merge remote-tracking branch 'origin/test' into test
|
3 years ago |
|
wj
|
13ab599031
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
5e26d76dcb
|
sql调整
|
3 years ago |
|
anthonywj
|
0b127cd836
|
Merge branch 'master' into test
|
3 years ago |
|
anthonywj
|
8e6bc465f6
|
带配货相关修改
|
3 years ago |
|
郑明梁
|
3bb024b549
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
cefbeb5af8
|
同步管理id问题
|
3 years ago |
|
wangwei
|
d252711651
|
修改新用户 审核问题
|
3 years ago |
|
anthonywj
|
03c4bba4ec
|
Merge branch 'master' into test
|
3 years ago |
|
anthonywj
|
3d53838777
|
带配货相关修改
|
3 years ago |
|
anthonywj
|
b73b537d11
|
修改系统繁忙问题
|
3 years ago |
|
wj
|
a24dd0f1d8
|
Merge branch 'master' into test
# Conflicts:
# src/main/resources/application-test.yml
|
3 years ago |
|
wj
|
39460ce3da
|
修改方法名
|
3 years ago |
|
anthonywj
|
009d0f0a39
|
修复系统繁忙问题，新增预验收按货位退回
|
3 years ago |
|
anthonywj
|
ed08f88bf5
|
单据类型保存问题
|
3 years ago |
|
anthonywj
|
51f247d6a2
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangwei
|
9f0fca9d73
|
同步 部门仓库问题
|
3 years ago |
|
anthonywj
|
fece4d7b8d
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
f54cfe91d5
|
备份
|
3 years ago |
|
wj
|
fe092c66a3
|
增加下载
|
3 years ago |
|
anthonywj
|
b7c2690d56
|
bug修改
|
3 years ago |
|
wj
|
5a52791816
|
修改默认为test
|
3 years ago |
|
wj
|
6657dd0507
|
修改默认为test
|
3 years ago |
|
wj
|
1eb3c65bba
|
增加test配置
|
3 years ago |
|
anthonywj
|
400937c133
|
文件同步路径问题，pdf与图片分开
|
3 years ago |
|
wj
|
67dd29c63d
|
上传数据写入文件
|
3 years ago |
|
wj
|
bffb2468c7
|
上传数据写入文件
|
3 years ago |
|
anthonywj
|
934b45e076
|
代码备份
|
3 years ago |
|
anthonywj
|
186f65514c
|
数据同步bug修改
|
3 years ago |
|
wj
|
40603c1736
|
系统设置同步
|
3 years ago |
|
anthonywj
|
cbfd4c0129
|
数据同步bug修改
|
3 years ago |
|
wangwei
|
8977d1b23e
|
修改 字典导入 查询问题
|
3 years ago |
|
wangwei
|
6b2aa0eff3
|
修改 资质预警搜索问题
|
3 years ago |
x_z
|
cee6945ed2
|
1.修复库存统计没有按照供应商ID分组导致数据被合并错误的问题
|
3 years ago |
|
anthonywj
|
963406dd91
|
同步数据修改为雪花ID
|
3 years ago |
|
wj
|
528585b467
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
