anthonywj
|
0149230284
|
预验收,寄售有序列号库存不足问题
|
2 years ago |
郑明梁
|
ce2aa13b5f
|
修改单据bug
|
2 years ago |
郑明梁
|
22b3ee6974
|
汇总统计bug修复
|
2 years ago |
anthonywj
|
dd1f68f103
|
发票相关问题修改
|
2 years ago |
anthonywj
|
84b7aae6dc
|
发票修改同步
|
2 years ago |
郑明梁
|
02a17df71a
|
多次出库bug修改
|
2 years ago |
wangwei
|
7893940cc6
|
修改第三方数据 单据类型新增 编辑问题
|
2 years ago |
wangwei
|
68fd6641ba
|
同步代码 发票优化
|
2 years ago |
anthonywj
|
374f8261f8
|
相关bug修改
|
2 years ago |
wangwei
|
320b8f0487
|
单据排序
|
2 years ago |
郑明梁
|
bfbb85eb57
|
统计汇总代码提交
|
2 years ago |
anthonywj
|
ea3c82f475
|
出入库扫码相关bug修改
|
2 years ago |
wangwei
|
690d415779
|
新增申购 调整产品录入多选
|
2 years ago |
郑明梁
|
e38a4dad81
|
产品名称转拼音首字母
|
2 years ago |
郑明梁
|
d1eb441bca
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
郑明梁
|
90f1b6c334
|
产品名称转拼音首字母
|
2 years ago |
anthonywj
|
1a015238d6
|
采购计划提交系统繁忙问题,物资字典选入系统繁忙,生产企业查询系统繁忙
|
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 |
郑明梁
|
c3e32fd7ad
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
郑明梁
|
1b0c8638b9
|
修改统计汇总代码
|
2 years ago |
anthonywj
|
f51054ea40
|
第三方单据上传类型修改
|
2 years ago |
郑明梁
|
47fabd4fca
|
bug修复
|
2 years ago |
郑明梁
|
ff449d6371
|
预警设置bug修复
|
2 years ago |
郑明梁
|
a6f82a7812
|
预警设置bug修复
|
2 years ago |
anthonywj
|
651a0ef658
|
内部码打印问题,启用使用单元数量问题,申购系统繁忙问题
|
2 years ago |
郑明梁
|
ba9711c467
|
库存预警bug修复
|
2 years ago |
郑明梁
|
17a7d9859f
|
物资拜放bug修复
|
2 years ago |
wangwei
|
9974b9ec89
|
修改 新增出入库自动补单bug
|
2 years ago |
郑明梁
|
f81471d4e6
|
新增扫码单据排序
|
2 years ago |
郑明梁
|
adb9428e36
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
郑明梁
|
847de9c01b
|
汇总代码提交
|
2 years ago |
anthonywj
|
4cd4d9b44c
|
单据重复提交问题
|
2 years ago |
anthonywj
|
5365852e1e
|
获取第三方产品规格型号问题
|
2 years ago |
anthonywj
|
d23ffecf3b
|
获取第三方产品规格型号问题
|
2 years ago |
anthonywj
|
e954b9b4c2
|
异常单据显示问题
|
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 |
郑明梁
|
7b2f82c151
|
耗材批量导入问题修复
|
2 years ago |
wj
|
21b81c5e40
|
bug修复
|
2 years ago |
wj
|
1496bb4bda
|
bug修复--改方法名
|
2 years ago |
wj
|
1f3ba38e22
|
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 |
wj
|
ab780d007f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
wj
|
dc0a842edf
|
ThrSystemDetailEntity增加表名,ThrProductsEntity增加字段[生产厂家编码,配送企业编码]
|
2 years ago |
anthonywj
|
5619aa362c
|
代码备份
|
2 years ago |
郑明梁
|
d72625c5cd
|
Merge remote-tracking branch 'origin/zmlDev' into dev
|
2 years ago |
郑明梁
|
3a26eafb7d
|
多次使用出库新增功能代码提交
|
2 years ago |
anthonywj
|
ee89548201
|
排序相关修改
|
2 years ago |
郑明梁
|
14c4bd0248
|
多次使用出库新增功能代码提交
|
2 years ago |
anthonywj
|
f2968bf275
|
单据复制,单据流转带业务单信息,采购订单新增价格
|
2 years ago |
anthonywj
|
be6abd2063
|
bug修改
|
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 |
anthonywj
|
385b9075ac
|
bug修改
|
2 years ago |
郑明梁
|
7b3f63f85d
|
用户库存代码提交
|
2 years ago |
郑明梁
|
75f346c7a7
|
用户库存代码提交
|
2 years ago |
郑明梁
|
cc736af286
|
inv_user_product,inv_user_product_detail表初始化代码提交
|
2 years ago |
郑明梁
|
92e2a0fe89
|
inv_user_product,inv_user_product_detail表初始化代码提交
|
2 years ago |
郑明梁
|
f22fc931f2
|
inv_user_product,inv_user_product_detail表初始化代码提交
|
2 years ago |
郑明梁
|
7a19bbe32f
|
物资摆放下架bug修改
|
2 years ago |
wangwei
|
f9080d08b8
|
打印设置分页问题
|
2 years ago |
anthonywj
|
be5f16b38d
|
库存货位查询
|
2 years ago |
郑明梁
|
f78f9d7e8b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
郑明梁
|
790c0d09ba
|
物资摆放修改
|
2 years ago |
anthonywj
|
59a0078a84
|
新增按货位出库功能
|
2 years ago |
wj
|
58e035ad03
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
wj
|
fa79cbf280
|
自定义Iservice和ServiceImpl
|
2 years ago |
wangwei
|
10ecccc021
|
如果角色存在用户关联 就不能是禁用状态
|
2 years ago |
wj
|
508caa86e0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
wj
|
eb470c4c55
|
优化
|
2 years ago |
郑明梁
|
a198add3af
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
郑明梁
|
851232e270
|
库存查询新增货架查询
|
2 years ago |
anthonywj
|
0d3c032660
|
库存查询修改,内网单据确认同步到外网
|
2 years ago |
郑明梁
|
4ed43cda03
|
库存查询新增货架查询
|
2 years ago |
郑明梁
|
2eccbe7c8a
|
物资摆放下架代码提交
|
2 years ago |
郑明梁
|
3b29b7f804
|
物资摆放下架代码提交
|
2 years ago |
wj
|
62367e9acf
|
同步文件调整
|
2 years ago |
wj
|
9019c8b6cc
|
去除方法Resource注解
|
2 years ago |
anthonywj
|
5f5b4d1bbe
|
单据流转后价格小数点问题
|
2 years ago |
anthonywj
|
8a8965e1e7
|
新增单据详情,发票、确认状态,同步更新,
|
2 years ago |
anthonywj
|
1003d2ec8f
|
业务单据详情改成雪花ID
|
2 years ago |
wj
|
1ea8e7c2d4
|
文件下载调整
|
2 years ago |
wj
|
0bc9b927ce
|
bug修复
|
2 years ago |
wj
|
da57675d60
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
wj
|
dded9d696b
|
时间判断调整
|
2 years ago |
anthonywj
|
23dacbc0d7
|
bug修改
|
2 years ago |
wangwei
|
972ed90e40
|
同步 优化发票代码
|
2 years ago |
wj
|
0c348c43ac
|
判断调整
|
2 years ago |
wj
|
4507e41043
|
判断调整
|
2 years ago |
郑明梁
|
40c9648762
|
物质摆放变更功能代码提交
|
2 years ago |
wj
|
4a35a538ae
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
wj
|
7a3e8b72cb
|
文件下载问题
|
2 years ago |
wangwei
|
f45d18ec7f
|
同步发票代码
|
2 years ago |
郑明梁
|
f11e0fbb10
|
物质摆放变更功能代码提交
|
2 years ago |
郑明梁
|
1071b496dd
|
物质摆放按单功能代码提交
|
2 years ago |
wangwei
|
1bf136848f
|
同步发票代码
|
2 years ago |
郑明梁
|
fa09ca7078
|
物质摆放功能代码提交
(cherry picked from commit e880330e7c )
|
2 years ago |
wj
|
943cea1816
|
Merge branch 'master' into dev
|
2 years ago |
郑明梁
|
9ac295028b
|
物质摆放功能代码提交
|
2 years ago |
anthonywj
|
75077b05a4
|
同步相关问题修改。用户选入物资字典相关修改
|
2 years ago |
wj
|
004dea3694
|
拉取数据增加特殊处理
|
2 years ago |
wj
|
5208a1aea2
|
拉取数据增加特殊处理
|
2 years ago |
wj
|
102cf093c2
|
增加replace,replaceBatch,insertIgnore,insertIgnoreBatch
|
2 years ago |
anthonywj
|
1e77692313
|
发票ID改为long
|
2 years ago |
wangwei
|
94118141b5
|
发票修改
|
2 years ago |
anthonywj
|
a7ef10a6d7
|
寄售出库问题,预验收入库问题,同步问题,领用单据问题
|
2 years ago |
anthonywj
|
cc248bab94
|
上线bug修改,同步修改,发票修改
|
2 years ago |
wj
|
e8cdafc14b
|
调整任务开始时间
|
2 years ago |
wj
|
3143e58c0b
|
代码调整
|
2 years ago |
wj
|
0214b2cf94
|
代码调整
|
2 years ago |
wj
|
7d39656d92
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
ef0c71b1e5
|
记录执行结果
|
2 years ago |
anthonywj
|
f658c2c4c9
|
bug修改,上架摆货修改
|
2 years ago |
anthonywj
|
4b08aa2a4e
|
bug修改,上架摆货修改
|
2 years ago |
anthonywj
|
6322a3bd03
|
修改预验收,寄售其他仓库用户可查看,修复修改角色bug,修复按单摆货bug
|
2 years ago |
anthonywj
|
3cae7526bc
|
摆货相关修改,添加货位查询,预验收,寄售等相关库存摆货
|
2 years ago |
anthonywj
|
a9fd3f2c2b
|
相关bug修改
|
2 years ago |
anthonywj
|
ba410331a5
|
同步功能修改
|
2 years ago |
anthonywj
|
75d388e121
|
同步功能修改
|
2 years ago |
郑明梁
|
0d878f1d64
|
修复id问题
|
2 years ago |
wangwei
|
dbaa3cf85e
|
修改 维护往来id问题
|
2 years ago |
郑明梁
|
ac199432c9
|
物资添加id问题
|
2 years ago |
anthonywj
|
a4838a4459
|
解决选入用户,移除用户系统繁忙问题
|
2 years ago |
anthonywj
|
fec801b31e
|
预验收按货位退货
|
2 years ago |
郑明梁
|
c573d485b6
|
修改测试
|
2 years ago |
郑明梁
|
bd77dc9bb5
|
修改测试
|
2 years ago |
anthonywj
|
14e43730de
|
ID相关修改
|
2 years ago |
anthonywj
|
3360b7e2bd
|
bug修改代码备份
|
2 years ago |
x_z
|
90340e2607
|
1.调整摆放功能代码,添加上架记录
|
2 years ago |
wj
|
c0aa3f4107
|
下载记录文件
|
2 years ago |
anthonywj
|
37af4d2462
|
合并同步 分支
|
2 years ago |
anthonywj
|
e62c88dfbe
|
合并git 分支
|
2 years ago |
wj
|
1c6ebe2899
|
调整
|
2 years ago |
anthonywj
|
73d6187176
|
合并master分支
|
2 years ago |
anthonywj
|
aa9d903fd7
|
bug修改
|
2 years ago |
anthonywj
|
164c76858c
|
文件上传修改,路径修改
|
2 years ago |
wj
|
c85d0f445d
|
上传及下载写入文件
|
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 |
郑明梁
|
9f3bed8cf0
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
郑明梁
|
e12f19f502
|
往来单位编辑提示重复
|
2 years ago |
anthonywj
|
6ba113593b
|
数据同步bug修改
|
2 years ago |
wangwei
|
db2b9bcafe
|
修复单据查询bug
|
2 years ago |
wj
|
56fcc52b2b
|
修改下载记录状态
(cherry picked from commit 07b6f3e9b0 )
|
2 years ago |
wj
|
07b6f3e9b0
|
修改下载记录状态
|
2 years ago |
anthonywj
|
54dc7cd0eb
|
同步数据修改为雪花ID
|
2 years ago |
anthonywj
|
9e25fc5036
|
bug修改代码备份
|
2 years ago |
x_z
|
fc2ab43807
|
1.调整摆放功能代码
|
2 years ago |
anthonywj
|
1f6a08e74c
|
新增三期拣货,无三期拣货,为配货等页面
|
2 years ago |
x_z
|
18719072d6
|
1.调整盘点代码
|
2 years ago |
wj
|
76630f303d
|
idDatas赋值调整
|
2 years ago |
郑明梁
|
b648cd1999
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
郑明梁
|
e0da5a4c12
|
院内分类代码提交(需同步)
|
2 years ago |
anthonywj
|
32a30b5fec
|
bug修改
|
2 years ago |
x_z
|
d0ce12b6d9
|
1.调整获取货位编码方法位置
|
2 years ago |
x_z
|
0eb427119c
|
1.调整添加货位逻辑
|
2 years ago |
anthonywj
|
5d1875ebb9
|
库存详情新增入库数量与出库数量,方便后续分组统计查询
|
2 years ago |
anthonywj
|
4278cf047e
|
bug修改
|
2 years ago |
wj
|
3f4c4511d6
|
第三方数据同步
|
2 years ago |
wj
|
943c02af52
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
1517d71b78
|
用户数据同步
|
2 years ago |
anthonywj
|
9f65dda33c
|
物资分类带代码迁移
|
2 years ago |
wangwei
|
4ca132aabe
|
同步 部门代码
|
2 years ago |
x_z
|
d86907486c
|
1.同步自助平台资质预警代码
|
2 years ago |
wj
|
a57b6a23a4
|
存储单据类型
|
2 years ago |
wj
|
d9026565f5
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
27e1d95b47
|
由内向外同步,文档增强
|
2 years ago |
anthonywj
|
1e82f37f7f
|
物资字典参数设置,单据类型修改
|
2 years ago |
anthonywj
|
f3f717cf17
|
新增委托验收
|
2 years ago |
wangwei
|
a1a8172dd1
|
修改 内部码bug
|
2 years ago |
wj
|
79f23bd511
|
由内向外同步
|
2 years ago |
wj
|
729badbb04
|
由内向外同步
|
2 years ago |
wj
|
2bfc6a0b75
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
a2cdc0bbfe
|
解决循环问题
|
2 years ago |
anthonywj
|
81cae64e57
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
anthonywj
|
2ca37b890a
|
预验收,寄售撤回bug
|
2 years ago |
wj
|
6c13eb05d4
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
cdfda6af2a
|
由内向外同步
|
2 years ago |
wangwei
|
1524185bc6
|
同步 内部码
|
2 years ago |
x_z
|
bbb845f1bc
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
x_z
|
02f1ce16c6
|
1.提交代码
|
2 years ago |
郑明梁
|
b0543b862a
|
资质代码同步
|
2 years ago |
anthonywj
|
bd7fd9691a
|
物资字典代码迁移,新增国家库同步到外网查询
|
2 years ago |
x_z
|
a0d6f3cc06
|
1.修复临时文件存储失败问题
2.修改下载第三方系统基础数据数据校验逻辑
|
2 years ago |
anthonywj
|
5bc3ce3115
|
业务单选入第三方单据bug
|
2 years ago |
anthonywj
|
8a9607f690
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
anthonywj
|
d730b5c084
|
数据同步修改
|
2 years ago |
x_z
|
2d98bd3651
|
1.添加下载第三方单据类型逻辑
|
2 years ago |
anthonywj
|
ec9c295e03
|
单据库存相关代码迁移
|
2 years ago |
x_z
|
9cc66f85da
|
1.添加第三方产品数据导入接口和逻辑
2.完善下载第三方系统数据逻辑
|
2 years ago |
anthonywj
|
ea93694923
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
anthonywj
|
a8504f276e
|
代码迁移备份,预验收退回修改
|
2 years ago |
wj
|
bc5891aa28
|
bug修复
|
2 years ago |
wj
|
9fc23761ac
|
去除多余代码
|
2 years ago |
wj
|
a1088a5170
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
e871f8a9a2
|
设置统一入口
|
2 years ago |
x_z
|
faf499a4c6
|
1.合并第三方接口请求
|
2 years ago |
wj
|
fc898119ed
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
98730beeaf
|
增加返回状态码判断
|
2 years ago |
wangwei
|
6ef9f8dc9c
|
同步 部门仓库代码
|
2 years ago |
wj
|
f544f22cc9
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
wj
|
dea175b4d7
|
下载同步数据--其他数据
|
2 years ago |
wangwei
|
c965db25d9
|
同步 部门信息 仓库信息 用户关系 角色管理
|
2 years ago |
x_z
|
e3c25b05b5
|
1.添加接口请求时间设置
|
2 years ago |
anthonywj
|
abe47786b5
|
领用单据审核bug修改,自动生成业务单,扫码单等修改迁移
|
2 years ago |
anthonywj
|
d395703a81
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java
|
2 years ago |
anthonywj
|
76994ae9f5
|
领用单据审核bug修改,自动生成业务单,扫码单等修改迁移
|
2 years ago |
wangwei
|
d175bf1e66
|
恢复代码
|
2 years ago |
anthonywj
|
e3c6399aa5
|
单据流转相关修改
|
2 years ago |
x_z
|
15848414a9
|
1.添加上传模板文件逻辑
|
2 years ago |
x_z
|
abbc13b2f5
|
1.合并自助平台库存预警设置的代码
|
2 years ago |
wj
|
d3e6df8623
|
bug修复
|
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 |
x_z
|
628d991efe
|
1.添加更新时间字段的更新逻辑
|
2 years ago |
anthonywj
|
3a13555c5c
|
by中继服务验收单据
|
2 years ago |
anthonywj
|
2bd885c398
|
同步国家库数据
|
2 years ago |
wangwei
|
1e57b7ca4f
|
汇总记录,导出excel
|
2 years ago |
x_z
|
c68cb845a0
|
1.添加第三方基础数据同步和系统设置同步代码
|
2 years ago |
wangwei
|
7d6341a9c2
|
导出excel
|
2 years ago |
郑明梁
|
303e1e7217
|
模板打印代码提交
|
2 years ago |
anthonywj
|
497764e61a
|
同步基础类
|
2 years ago |
anthonywj
|
5c09ceeb6e
|
同步设置页面重整,,基础数据上传,单据类型上传
|
2 years ago |
anthonywj
|
b9590dcd50
|
单据同步相关修改
|
2 years ago |
anthonywj
|
03097198f5
|
单据同步
|
2 years ago |
x_z
|
9bab80a61e
|
1.同步库存预警设置代码
|
2 years ago |
anthonywj
|
d47ff60dd6
|
迁移自助平台单据相关代码
|
2 years ago |