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 |
|
wj
|
0318f9fae6
|
bug修复
|
3 years ago |
|
anthonywj
|
48ee2c0615
|
自助平台日志目录修改
|
3 years ago |
|
anthonywj
|
292462151f
|
新增三期拣货，无三期拣货，为配货等页面
|
3 years ago |
|
wj
|
fbd8520229
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
c6e75ba278
|
增加表名
|
3 years ago |
|
anthonywj
|
1087757951
|
bug修改
|
3 years ago |
|
郑明梁
|
6e56284914
|
修改往来sql
|
3 years ago |
|
x_z
|
bee4498fa8
|
1.同步货位功能代码
|
3 years ago |
|
wangwei
|
f9e324b352
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangwei
|
975b7a183f
|
修改 部门 仓库问题
|
3 years ago |
|
anthonywj
|
53b4b70adb
|
新用户审核角色问题
|
3 years ago |
|
anthonywj
|
0cda57721b
|
库存详情新增入库数量与出库数量，方便后续分组统计查询
|
3 years ago |
|
anthonywj
|
411499358d
|
禅道相关bug修改
|
3 years ago |
|
wj
|
30fa6198b5
|
第三方数据同步
|
3 years ago |
|
wj
|
01cb478e4f
|
第三方数据同步
|
3 years ago |
|
wj
|
3648bf21cd
|
用户数据同步
|
3 years ago |
|
wangwei
|
79efda35d6
|
修改 bug
|
3 years ago |
|
wangwei
|
aaeb8af6df
|
修改 部门问题 和供应商账号信息问题
|
3 years ago |
|
x_z
|
9ca376c621
|
1.修复资质预警时间校验错误导致消息未生成的问题
|
3 years ago |
|
wj
|
7c0c9060cc
|
变量名调整
|
3 years ago |
|
wj
|
3398a556cd
|
优化+单据类型同步
|
3 years ago |
|
wj
|
a5f3a392bf
|
knife4j启用配置
|
3 years ago |
|
wj
|
9b158b024a
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
ca753df422
|
bug修复
|
3 years ago |
|
anthonywj
|
fe31796d69
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
349608fa52
|
委托验收
|
3 years ago |
|
wangwei
|
efc0e6d21f
|
修改 bug
|
3 years ago |
|
wangwei
|
eba5a792a3
|
修改 内部码问题
|
3 years ago |
|
wj
|
29ed419219
|
由内向外同步--方法名冲突解决
|
3 years ago |
|
wj
|
1996f5a762
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
93ce0d6898
|
由内向外同步
|
3 years ago |
|
郑明梁
|
5b8278cec8
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
a0daf79e3d
|
资质代码优化
|
3 years ago |
|
anthonywj
|
5486e43175
|
用户注册后生成随机ID，避免同步用户信息相互覆盖
|
3 years ago |
|
wj
|
6e3dcbf684
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
798cada0ef
|
循环依赖问题
|
3 years ago |
|
anthonywj
|
3ba187c846
|
预验收，寄售退回bug
|
3 years ago |
|
wj
|
516bd76459
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
70481518ad
|
由内向外同步
|
3 years ago |
|
anthonywj
|
2912d0164e
|
UDI码过期禁止录入
|
3 years ago |
|
wj
|
8469fa56e3
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
0b840c9de4
|
数据同步优化
|
3 years ago |
|
x_z
|
f65bcbe907
|
1.修复第三方产品信息查询报错问题，优化查询语句
|
3 years ago |
|
anthonywj
|
16539645de
|
代码备份
|
3 years ago |
|
anthonywj
|
878a10e35d
|
备份
|
3 years ago |
|
anthonywj
|
9f946d35c6
|
单据同步
|
3 years ago |
|
wj
|
8dc444be01
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
d8496e87e9
|
knife4J文档相关
|
3 years ago |
|
wangwei
|
7317777f5b
|
资质审核 角色过滤问题
|
3 years ago |
|
郑明梁
|
a6aa0f5dbf
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
76237bda24
|
物质分类代码提交
|
3 years ago |
|
wangwei
|
90473b8841
|
修改 UDI码补齐
|
3 years ago |
|
wj
|
ca3f878c34
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
|
3 years ago |
|
wj
|
f643343b2a
|
bug修复
|
3 years ago |
|
anthonywj
|
bdc1e6fd6e
|
UDI码缺失修改
|
3 years ago |
|
anthonywj
|
4bd2455145
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
eb2de105f4
|
UDI码缺失修改
|
3 years ago |
|
wangwei
|
d241fa2041
|
修改bug
|
3 years ago |
|
anthonywj
|
77b9104e71
|
预验收补单相关流程修改
|
3 years ago |
|
wj
|
2e94266bea
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
5ad3db0ed9
|
去除多余代码
|
3 years ago |
|
郑明梁
|
18978adb95
|
内部码打印代码提交
|
3 years ago |
|
wangwei
|
b78f7d9b87
|
修改bug
|
3 years ago |
|
wj
|
3c685f15b4
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
bea7af1593
|
提供一个统一下发数据接口
|
3 years ago |
|
anthonywj
|
1eea12e8a7
|
代码备份
|
3 years ago |
|
anthonywj
|
3a0bf62f22
|
代码备份
|
3 years ago |
|
anthonywj
|
156d3fe3bc
|
单据相关
|
3 years ago |
|
wangwei
|
9dd987af01
|
修改bug
|
3 years ago |
|
wj
|
b77913fd6f
|
提供一个统一下发数据接口
|
3 years ago |
|
wj
|
b3d64f0c7a
|
返回报文增加状态码
|
3 years ago |
|
wangwei
|
39769ee3e2
|
修改 仓库删除问题
|
3 years ago |
|
wj
|
b718bd645c
|
sql提交
|
3 years ago |
|
wj
|
9bffff5f6f
|
同步设置--其他数据
|
3 years ago |
|
wj
|
d946ab1b47
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wj
|
bf4c254cd3
|
同步设置--其他数据
|
3 years ago |
|
郑明梁
|
c86075bd66
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
郑明梁
|
1c4e84ff4d
|
内部码打印代码提交
|
3 years ago |
|
anthonywj
|
5e59141826
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
93e717be63
|
扫码相关bug修改
|
3 years ago |
chengqf
|
ecb2ff7d2c
|
文件后台上传，下载方法
|
3 years ago |
|
chengqf
|
f515add8d0
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
chengqf
|
91f25546f8
|
文件上传，下载后台方法
|
3 years ago |
|
chengqf
|
ade5b66aad
|
增加后台调用上传，下载文件方法
|
3 years ago |
|
anthonywj
|
3564a9bd22
|
补单修改
|
3 years ago |
|
anthonywj
|
73720a298d
|
新增自动创建单模式
|
3 years ago |
|
anthonywj
|
1dc24a856c
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
anthonywj
|
d4749b7dc3
|
代码备份
|
3 years ago |
|
郑明梁
|
752ff7ce8f
|
单据类型界面修改
|
3 years ago |
|
chengqf
|
65daf0ce09
|
文件下载
|
3 years ago |
|
anthonywj
|
0e7b269e1e
|
单据类型添加序号，注释掉同步任务
|
3 years ago |
|
wj
|
e9082b8e1c
|
获取类名调整
|
3 years ago |
|
x_z
|
7e22e0190f
|
1.修复bug
|
3 years ago |
|
anthonywj
|
263e5d0dac
|
寄售库存校验，仓库查询
|
3 years ago |
|
郑明梁
|
10d93106ce
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/resources/schemas/schema_v2.1.sql
|
3 years ago |
|
anthonywj
|
a29f314692
|
数据库修改字段修改
|
3 years ago |
