anthonywj
|
5810d14716
|
修改诊断现存量查询，库存实时查询
|
2 years ago |
郑明梁
|
35594d91a2
|
单据查询问题修复（带校验）
|
2 years ago |
|
郑明梁
|
50edb4e747
|
单据查询问题修复（带校验）
|
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 |
|
郑明梁
|
e01ec88f65
|
内部码打印问题修复
|
2 years ago |
1178634255
|
de6f13ec27
|
修改密码代码备份
|
2 years ago |
|
anthonywj
|
1beea3a254
|
合并dev修改
|
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 |
|
郑明梁
|
883084f4c5
|
定数包代码提交
|
2 years ago |
|
anthonywj
|
bec91b93ca
|
新增协调平台追溯查询
|
2 years ago |
|
anthonywj
|
1946e4dfef
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
375ff7aa5d
|
新增第三方单据上传过滤
|
2 years ago |
|
郑明梁
|
de55970ff8
|
定数包加工代码初始化
|
2 years ago |
|
郑明梁
|
70c4f26511
|
定数包设置代码提交
|
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
|
b3b935c0fe
|
根据单据类型查询问题
|
2 years ago |
|
anthonywj
|
6ce3adb1f4
|
待配货，待校验提交修改
|
2 years ago |
|
anthonywj
|
3e28f48933
|
待校验，等相关修改，
|
2 years ago |
|
anthonywj
|
ce801cd27c
|
单据带校验比对逻辑修改
|
2 years ago |
|
anthonywj
|
2faa905bfb
|
第三方单据上传bug，发票重复bug
|
2 years ago |
|
anthonywj
|
ae4ff7d291
|
单据校验备份
|
2 years ago |
|
郑明梁
|
e3bb14f114
|
定数包实体初始化
|
2 years ago |
|
anthonywj
|
6c2e5b7f14
|
备份
|
2 years ago |
|
郑明梁
|
9eb3dfa675
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
562cbd5ac2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
f66705d82b
|
采购计划，采购订单等相关修改
|
2 years ago |
|
郑明梁
|
134762db9e
|
单据上传功能代码提交
|
2 years ago |
|
anthonywj
|
950301315d
|
更新审核人，核对人，供应商编辑信息bug
|
2 years ago |
|
anthonywj
|
86f084836e
|
选入第三方业务单据修改
|
2 years ago |
|
郑明梁
|
dcb4cad964
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
4730d6fe78
|
单据上传功能代码提交
|
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 |
|
郑明梁
|
2127c2f170
|
物资类别功能代码初始化
|
2 years ago |
|
郑明梁
|
a7982e80dd
|
汇总修改汇总日期
|
2 years ago |
|
郑明梁
|
11be2ef830
|
修改货位上架按当前仓库筛选,和汇总导出加上仓库字段
|
2 years ago |
|
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 |
