anthonywj
|
e954b9b4c2
|
异常单据显示问题
|
2 years ago |
郑明梁
|
269ddea831
|
物资查询按照isDisable字段查询
|
2 years ago |
|
郑明梁
|
8e35509a93
|
业务管理按时间排序
|
2 years ago |
|
郑明梁
|
78deeae108
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
ecc358f41b
|
增加查询用户接口
|
2 years ago |
|
anthonywj
|
111f196415
|
规格型号显示问题
|
2 years ago |
|
anthonywj
|
723c863bb2
|
定时下载任务重复下载问题
|
2 years ago |
|
anthonywj
|
3c98777e20
|
第三方接口调试
|
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 |
wj
|
7b3cf5a9d1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
6111d7c580
|
insertIgnoreBatch/replaceBatch改造
|
2 years ago |
|
anthonywj
|
f7d09c1ec4
|
第三方接口相关修改
|
2 years ago |
|
wj
|
39f3fbf14d
|
Merge branch 'dev' into test
|
2 years ago |
|
wj
|
1bed2cf9fd
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
598b58d8d4
|
下载第三方产品信息
|
2 years ago |
|
郑明梁
|
7b2f82c151
|
耗材批量导入问题修复
|
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 |
|
anthonywj
|
e1bf9bad81
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java
|
2 years ago |
|
anthonywj
|
6e6b56085c
|
代码备份
|
2 years ago |
|
wj
|
64fcfe9c22
|
bug修复
|
2 years ago |
|
郑明梁
|
bec086ca4c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
83baf6d325
|
打印代码提交
|
2 years ago |
1178634255
|
46d5cb0181
|
内部码标签打印
|
2 years ago |
|
1178634255
|
c5182c1965
|
修复查询采购计划删除报错
|
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 |
|
郑明梁
|
bd15235a99
|
单据报表打印代码提交
|
2 years ago |
|
郑明梁
|
fe4b0082e3
|
单据报表打印代码提交
|
2 years ago |
|
1178634255
|
56aa7faa57
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
1178634255
|
ed08449b2c
|
修复审核申购单报错
|
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
|
排序相关修改
|
2 years ago |
|
anthonywj
|
de758b0fce
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
b0d1ddda6c
|
采购订单修改
|
2 years ago |
|
schry
|
f75b8fdd86
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
schry
|
a6a68cb35f
|
解决不显示计量单位
|
2 years ago |
|
郑明梁
|
14c4bd0248
|
多次使用出库新增功能代码提交
|
2 years ago |
|
anthonywj
|
f2968bf275
|
单据复制，单据流转带业务单信息，采购订单新增价格
|
2 years ago |
|
anthonywj
|
be6abd2063
|
bug修改
|
2 years ago |
|
wj
|
21ee80cd17
|
Merge branch 'dev' into test
|
2 years ago |
|
wj
|
4ef46ec1b0
|
增加表名
|
2 years ago |
|
郑明梁
|
32ff539034
|
多次使用出库设置功能代码提交
|
2 years ago |
|
anthonywj
|
85d73a0ee4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
c3d9c20bc6
|
新增多次使用出库功能
|
2 years ago |
|
郑明梁
|
52393b786c
|
货位变更bug修改
|
2 years ago |
|
schry
|
ac3a97d284
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
schry
|
ccbeadfe68
|
目标出入库单显示出入库类型单据
|
2 years ago |
|
郑明梁
|
d24a412535
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
a1b4542df6
|
库存查询bug修改
|
2 years ago |
|
anthonywj
|
aaff1b1d7f
|
发票系统繁忙问题
|
2 years ago |
wangwei
|
4b917f22fd
|
冷链报告
|
3 years ago |
|
anthonywj
|
d166dd09d7
|
采购订单按供应商创建
|
3 years ago |
|
郑明梁
|
b517963a08
|
内部码报表打印代码提交
|
3 years ago |
|
wj
|
fd5aca89d9
|
调整
|
3 years ago |
|
wj
|
4f9a9e2126
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
0c3aa052fb
|
调整
|
3 years ago |
|
郑明梁
|
1fa5263492
|
库存明细打印代码提交
|
3 years ago |
|
anthonywj
|
385b9075ac
|
bug修改
|
3 years ago |
|
郑明梁
|
7b3f63f85d
|
用户库存代码提交
|
3 years ago |
|
郑明梁
|
75f346c7a7
|
用户库存代码提交
|
3 years ago |
|
郑明梁
|
cc736af286
|
inv_user_product,inv_user_product_detail表初始化代码提交
|
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 |
|
anthonywj
|
db3e3bd2ca
|
相关界面调整修改
|
3 years ago |
|
郑明梁
|
7a19bbe32f
|
物资摆放下架bug修改
|
3 years ago |
|
1178634255
|
6abd1137a8
|
1、业务流转设置了‘产品申购’自动生成‘采购计划’，无这个问题
申购单据审核提示‘系统繁忙’，可能是数据库多加了几条一样的数据
|
3 years ago |
|
wangwei
|
f9080d08b8
|
打印设置分页问题
|
3 years ago |
|
wangwei
|
f1374f50f8
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wangwei
|
e25899a6ae
|
内部码
|
3 years ago |
|
anthonywj
|
be5f16b38d
|
库存货位查询
|
3 years ago |
|
wangwei
|
e1c80c5360
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wangwei
|
8837b12fd4
|
内部码
|
3 years ago |
|
郑明梁
|
8ec5a59d85
|
资质打印代码提交
|
3 years ago |
|
wangwei
|
a7f3caefe9
|
资质打印
|
3 years ago |
|
anthonywj
|
23d385fa7a
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
anthonywj
|
38f2e7b1a6
|
修改文件统一路径
|
3 years ago |
|
郑明梁
|
f78f9d7e8b
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
郑明梁
|
790c0d09ba
|
物资摆放修改
|
3 years ago |
|
anthonywj
|
59a0078a84
|
新增按货位出库功能
|
3 years ago |
|
wj
|
58e035ad03
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
fa79cbf280
|
自定义Iservice和ServiceImpl
|
3 years ago |
|
郑明梁
|
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 |
|
wangwei
|
293aea8aa5
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wangwei
|
4ddca65ad5
|
修改bug
|
3 years ago |
|
郑明梁
|
4472ad0490
|
库存查询新增货架查询
|
3 years ago |
|
wangwei
|
d83efd3e94
|
新增领用单 审核领用单 查询领用单 无法根据往来信息查询问题
|
3 years ago |
|
wj
|
508caa86e0
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
eb470c4c55
|
优化
|
3 years ago |
|
郑明梁
|
a198add3af
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
郑明梁
|
851232e270
|
库存查询新增货架查询
|
3 years ago |
|
anthonywj
|
0d3c032660
|
库存查询修改，内网单据确认同步到外网
|
3 years ago |
|
郑明梁
|
17e1cdc144
|
库存查询新增货架查询
|
3 years ago |
|
郑明梁
|
4ed43cda03
|
库存查询新增货架查询
|
3 years ago |
|
郑明梁
|
2eccbe7c8a
|
物资摆放下架代码提交
|
3 years ago |
|
郑明梁
|
3b29b7f804
|
物资摆放下架代码提交
|
3 years ago |
|
wangwei
|
d55358b8cd
|
修改查询发票方法
|
3 years ago |
|
anthonywj
|
b4a00f5c51
|
发票，单据修改
|
3 years ago |
|
wj
|
a77c5bd33d
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
62367e9acf
|
同步文件调整
|
3 years ago |
|
wj
|
07147868f3
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
9019c8b6cc
|
去除方法Resource注解
|
3 years ago |
|
wj
|
837ca78dd4
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
d3497f0536
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
b8a97dd2e6
|
文件下载调整
|
3 years ago |
|
anthonywj
|
5f5b4d1bbe
|
单据流转后价格小数点问题
|
3 years ago |
|
wj
|
8386fd0b7d
|
Merge branch 'dev' into test
|
3 years ago |
|
anthonywj
|
8a8965e1e7
|
新增单据详情，发票、确认状态，同步更新，
|
3 years ago |
|
anthonywj
|
1003d2ec8f
|
业务单据详情改成雪花ID
|
3 years ago |
|
wangwei
|
36a62ff67b
|
修改查询发票方法
|
3 years ago |
|
郑明梁
|
075ebad24a
|
订单管理id问题修改
|
3 years ago |
|
郑明梁
|
82e46675a9
|
订单管理id问题修改
|
3 years ago |
|
wj
|
1ea8e7c2d4
|
文件下载调整
|
3 years ago |
|
wj
|
e3759f4c49
|
文件下载调整
|
3 years ago |
|
wj
|
8828718651
|
文件下载调整
|
3 years ago |
|
wj
|
95826f44e1
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
0bc9b927ce
|
bug修复
|
3 years ago |
|
wangwei
|
f563478aa2
|
修改bug
|
3 years ago |
|
wangwei
|
89e467a764
|
修改寄售 预验收库存查询
|
3 years ago |
|
郑明梁
|
1379389f80
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
郑明梁
|
e61285dd5b
|
产品选入按国家库查询
|
3 years ago |
|
wj
|
407fb4009d
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
f4d9f19a6b
|
idtype auto改为input
|
3 years ago |
|
wj
|
188bd442b2
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
da57675d60
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
dded9d696b
|
时间判断调整
|
3 years ago |
|
anthonywj
|
23dacbc0d7
|
bug修改
|
3 years ago |
|
wangwei
|
972ed90e40
|
同步 优化发票代码
|
3 years ago |
|
wj
|
7704bf0aa4
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
0c348c43ac
|
判断调整
|
3 years ago |
|
wj
|
fb711df3ec
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
4507e41043
|
判断调整
|
3 years ago |
|
wj
|
d7636825ff
|
Merge branch 'dev' into test
|
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 |
|
wj
|
3c3c96e927
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
4a35a538ae
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
wj
|
7a3e8b72cb
|
文件下载问题
|
3 years ago |
|
wangwei
|
f45d18ec7f
|
同步发票代码
|
3 years ago |
|
郑明梁
|
f11e0fbb10
|
物质摆放变更功能代码提交
|
3 years ago |
|
wangwei
|
a4bf1e086c
|
发票刷新功能
|
3 years ago |
|
郑明梁
|
1071b496dd
|
物质摆放按单功能代码提交
|
3 years ago |
|
wangwei
|
1bf136848f
|
同步发票代码
|
3 years ago |
|
anthonywj
|
15c4a33fb4
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
anthonywj
|
b54308121b
|
绑定供应商无法选择问题
|
3 years ago |
|
wj
|
ef791d2671
|
Merge branch 'dev' into test
|
3 years ago |
|
郑明梁
|
fa09ca7078
|
物质摆放功能代码提交
(cherry picked from commit e880330e7c)
|
3 years ago |
|
wj
|
943cea1816
|
Merge branch 'master' into dev
|
3 years ago |
|
wj
|
0570ff2c52
|
设置默认test
|
3 years ago |
|
wj
|
07a5bc7a3c
|
Merge branch 'dev' into test
|
3 years ago |
|
wj
|
b125b3e76c
|
设置默认dev
|
3 years ago |
|
郑明梁
|
9ac295028b
|
物质摆放功能代码提交
|
3 years ago |
|
anthonywj
|
75077b05a4
|
同步相关问题修改。用户选入物资字典相关修改
|
3 years ago |
|
wj
|
79c64f15f1
|
测试地址调整
|
3 years ago |
|
wj
|
1e55b3ea97
|
测试地址调整
|
3 years ago |
|
wj
|
004dea3694
|
拉取数据增加特殊处理
|
3 years ago |
|
wj
|
5208a1aea2
|
拉取数据增加特殊处理
|
3 years ago |
|
wj
|
2311c643cc
|
设置默认dev环境
|
3 years ago |
|
wj
|
102cf093c2
|
增加replace,replaceBatch,insertIgnore,insertIgnoreBatch
|
3 years ago |
|
wj
|
a953328f1f
|
设置默认dev环境
|
3 years ago |
|
wj
|
46fe9a5e7d
|
测试环境调整
|
3 years ago |
|
anthonywj
|
1e77692313
|
发票ID改为long
|
3 years ago |
|
wangwei
|
5697692584
|
发票修改
|
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
|
6857e7d48c
|
Merge branch 'master' into test
|
3 years ago |
|
wj
|
e8cdafc14b
|
调整任务开始时间
|
3 years ago |
