Commit Graph

492 Commits (71ed0bdf24f07363971f94aec5287c43ca88d11d)

Author SHA1 Message Date
wj 2169d3300d 增加平台验证接口 2 years ago
wj aeedcdd984 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj 97c84757da 增加平台验证接口 2 years ago
anthonywj 7998af918e 代码备份 2 years ago
anthonywj 0083117df9 采购订单,单据流转等修改 2 years ago
anthonywj d458e72c7e 资质证书同步修改,检验报告冷链报告支持多条,单据类型修改 2 years ago
schry cfc32f6bdc 解决本企业资质证书添加错误 2 years ago
schry 43571f316c 解决添加资质证书提示错误 2 years ago
郑明梁 0ee194313d 内部码和明细打印代码提交
(cherry picked from commit b493e80846)
2 years ago
anthonywj 6122a793b7 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 974e26a3e9 发票刷新系统繁忙问题 2 years ago
wangwei aa8fee64d1 冷链报告 2 years ago
郑明梁 b493e80846 内部码和明细打印代码提交 2 years ago
anthonywj f3b92944ae 采购订单问题 2 years ago
anthonywj bd23124565 bug修改 2 years ago
anthonywj c46eebd1f4 检验报告没更新问题 2 years ago
wangwei 6153bc7907 资质打印 2 years ago
wangwei f6d2ed3816 内部码 2 years ago
郑明梁 2c20566d39 单据打印修改打印地址 2 years ago
wj b44bbc53b0 向内同步国家库数据 2 years ago
wangwei b9738be229 如果角色存在用户关联 就不能禁用此角色 2 years ago
anthonywj fde36ac636 单据同步bug 2 years ago
anthonywj 6130e90770 模板单据预览修改 2 years ago
anthonywj 9f9ad88b16 库存查询 2 years ago
wangwei f8b7f78d64 修改发票查询方法 2 years ago
wangwei 316cafe9a0 角色修改问题 2 years ago
anthonywj 0f903962a3 发票刷新修改,更新同步问题 2 years ago
wj dc8930f2c3 提示文案调整 2 years ago
wangwei 18bf0924ec 修改排序 2 years ago
anthonywj 795b57b500 发票新增,或更新同步问题 2 years ago
anthonywj e4864f67e4 单据详情改为雪花ID 2 years ago
wj 22cf3f4687 手动同步调整 2 years ago
wj 9f436e8aa6 手动同步调整 2 years ago
wangwei 1ce939aacf 修改bug 2 years ago
wj f5397a245e 手动同步调整 2 years ago
郑明梁 c074b53599 物质摆放变更功能代码提交 2 years ago
wj 2d623577f1 id类型调整,异常打印 2 years ago
wj 7efba33fc0 数据上传接口调整 2 years ago
anthonywj 282459ca4e bug修改 2 years ago
wangwei 2832d8944c 发票 优化 2 years ago
wangwei 83697b44bd 修改发票bug 添加金额 总金额 2 years ago
anthonywj 7e6f38b274 Merge branch 'master' into dev 2 years ago
anthonywj 2a7fe6c1e9 供应商注册无更新时间,新增排序规则,倒序正序,仓库问题 2 years ago
wangwei 298f3f3507 发票修改
(cherry picked from commit ff1f825b39)
2 years ago
wangwei ff1f825b39 发票修改 2 years ago
wj 49eb0cfe9d Merge branch 'master' into dev 2 years ago
anthonywj 2d3bd6fe09 同步相关问题修改。用户选入物资字典相关修改 2 years ago
wj 5d248ac9e9 测试联通接口调整 2 years ago
wj 86487f966e 替换replaceBatch 2 years ago
wangwei 2f8d38c961 增加字段 2 years ago
wangwei 1a56d8e7ad 发票修改 2 years ago
anthonywj c032003936 上线bug修改,同步修改,发票修改 2 years ago
wj f170787fc5 异步同步 2 years ago
wj 42d931d688 增设枚举 2 years ago
wj 932bb96b2f 手动调用同步数据 2 years ago
wj 725142ff47 代码调整 2 years ago
wj 925a203e4e 增加执行信息 2 years ago
wj 74fc1dd6a8 Merge remote-tracking branch 'origin/master' 2 years ago
wj 98c0b2ed30 增加执行信息 2 years ago
郑明梁 0b093bed9a 用户修改角色失败修复 2 years ago
anthonywj 92030749fd bug修改 2 years ago
anthonywj 3c2812ee61 中继同步相关代码提交备份 2 years ago
anthonywj c615867b18 单据类型,仓库编辑修改 2 years ago
anthonywj 6d52ad21cf 同步bug修改 2 years ago
郑明梁 3bb024b549 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 cefbeb5af8 同步管理id问题 2 years ago
wangwei d252711651 修改新用户 审核问题 2 years ago
anthonywj 3d53838777 带配货相关修改 2 years ago
anthonywj b73b537d11 修改系统繁忙问题 2 years ago
anthonywj 009d0f0a39 修复系统繁忙问题,新增预验收按货位退回 2 years ago
anthonywj ed08f88bf5 单据类型保存问题 2 years ago
anthonywj 51f247d6a2 Merge remote-tracking branch 'origin/master' 2 years ago
wangwei 9f0fca9d73 同步 部门仓库问题 2 years ago
wj fe092c66a3 增加下载 2 years ago
anthonywj b7c2690d56 bug修改 2 years ago
wj bffb2468c7 上传数据写入文件 2 years ago
anthonywj 934b45e076 代码备份 2 years ago
anthonywj 186f65514c 数据同步bug修改 2 years ago
wj 40603c1736 系统设置同步 2 years ago
anthonywj cbfd4c0129 数据同步bug修改 2 years ago
anthonywj 963406dd91 同步数据修改为雪花ID 2 years ago
wj 0318f9fae6 bug修复 2 years ago
anthonywj 292462151f 新增三期拣货,无三期拣货,为配货等页面 2 years ago
wj c6e75ba278 增加表名 2 years ago
wangwei 975b7a183f 修改 部门 仓库问题 2 years ago
anthonywj 411499358d 禅道相关bug修改 2 years ago
wj 01cb478e4f 第三方数据同步 2 years ago
wj 3648bf21cd 用户数据同步 2 years ago
wangwei 79efda35d6 修改 bug 2 years ago
wangwei aaeb8af6df 修改 部门问题 和供应商账号信息问题 2 years ago
anthonywj fe31796d69 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 349608fa52 委托验收 2 years ago
wj 1996f5a762 Merge remote-tracking branch 'origin/master' 2 years ago
wj 93ce0d6898 由内向外同步 2 years ago
郑明梁 5b8278cec8 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 a0daf79e3d 资质代码优化 2 years ago
anthonywj 5486e43175 用户注册后生成随机ID,避免同步用户信息相互覆盖 2 years ago
wj 516bd76459 Merge remote-tracking branch 'origin/master' 2 years ago
wj 70481518ad 由内向外同步 2 years ago
anthonywj 2912d0164e UDI码过期禁止录入 2 years ago
x_z f65bcbe907 1.修复第三方产品信息查询报错问题,优化查询语句 2 years ago
anthonywj 878a10e35d 备份 2 years ago
anthonywj 9f946d35c6 单据同步 2 years ago
wj d8496e87e9 knife4J文档相关 2 years ago
郑明梁 76237bda24 物质分类代码提交 2 years ago
anthonywj bdc1e6fd6e UDI码缺失修改 2 years ago
anthonywj 4bd2455145 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj eb2de105f4 UDI码缺失修改 2 years ago
wangwei d241fa2041 修改bug 2 years ago
anthonywj 77b9104e71 预验收补单相关流程修改 2 years ago
wj 2e94266bea Merge remote-tracking branch 'origin/master' 2 years ago
wj 5ad3db0ed9 去除多余代码 2 years ago
郑明梁 18978adb95 内部码打印代码提交 2 years ago
wangwei b78f7d9b87 修改bug 2 years ago
wj 3c685f15b4 Merge remote-tracking branch 'origin/master' 2 years ago
wj bea7af1593 提供一个统一下发数据接口 2 years ago
anthonywj 1eea12e8a7 代码备份 2 years ago
anthonywj 3a0bf62f22 代码备份 2 years ago
anthonywj 156d3fe3bc 单据相关 2 years ago
wj b77913fd6f 提供一个统一下发数据接口 2 years ago
wj b3d64f0c7a 返回报文增加状态码 2 years ago
wangwei 39769ee3e2 修改 仓库删除问题 2 years ago
wj d946ab1b47 Merge remote-tracking branch 'origin/master' 2 years ago
wj bf4c254cd3 同步设置--其他数据 2 years ago
郑明梁 c86075bd66 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 1c4e84ff4d 内部码打印代码提交 2 years ago
anthonywj 93e717be63 扫码相关bug修改 2 years ago
anthonywj 1dc24a856c Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj d4749b7dc3 代码备份 2 years ago
郑明梁 752ff7ce8f 单据类型界面修改 2 years ago
anthonywj 0e7b269e1e 单据类型添加序号,注释掉同步任务 2 years ago
wj e9082b8e1c 获取类名调整 2 years ago
x_z 7e22e0190f 1.修复bug 2 years ago
anthonywj 263e5d0dac 寄售库存校验,仓库查询 2 years ago
郑明梁 10d93106ce Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/resources/schemas/schema_v2.1.sql
2 years ago
anthonywj a29f314692 数据库修改字段修改 2 years ago
wj 0aaa214d4f bug修复 2 years ago
郑明梁 8e46f0d862 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java
#	src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java
2 years ago
wangwei e8dedfb195 修改bug 2 years ago
郑明梁 74060f32d4 单据类型界面修改 2 years ago
wangwei 9695d72eb0 Merge remote-tracking branch 'origin/master' 2 years ago
wangwei 5d56f8f5b9 修改bug 2 years ago
wj 6be487f117 bug修复 2 years ago
anthonywj 2cc4a51a4a 预验收退货相关流程重整 2 years ago
wj 747e9c88f2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java
2 years ago
wj be4d89cc42 同步基础数据->管理平台 2 years ago
x_z 544d4b69b9 1.完善同步代码 2 years ago
wangwei 064c4441d3 调整仓库 2 years ago
anthonywj c901fbd91a 新增预验收单据字段,预验收库存查询接口 2 years ago
anthonywj 46e63eaf89 新增预验收单据字段,预验收库存查询接口 2 years ago
郑明梁 eff2a7957a 供应商发票确认功能提交 2 years ago
x_z 7dbd390ff4 1.添加同步代码 2 years ago
anthonywj 61f197c530 接收中继服务、UDI管理系统上传用户数据 2 years ago
anthonywj 0b7279d08b 接收中继服务、UDI管理系统数据 2 years ago
郑明梁 44c9481ccb Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 0de4f1a2e4 同步设置相关修改 2 years ago
anthonywj 9c16967583 1.新增预验收库存产品信息,库存产品信息详情;
2.更改预验收出库扫码校验流程;
3.更改预验收生成库存流程;
4.新增预验收出库后生成退货单;
5.更改预验收出库后扣减数量流程
2 years ago
郑明梁 8b8e76c8a5 默认用户给一级部门 2 years ago
郑明梁 b19aa2581e 仓库修改寄售功能代码提交 2 years ago
anthonywj 74e9ab62f8 UDI管理系统获取验收单据 2 years ago
郑明梁 ac92524ae9 物资审核代码提交 2 years ago
郑明梁 1e11b9b5d3 物资审核代码提交 2 years ago
郑明梁 bdd68fdca7 物资审核代码提交 2 years ago
郑明梁 5baaf61369 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 8ef2a2ef1c 用户拉取部门修复 2 years ago
anthonywj ffa453ab68 新增UDI管理系统直接验收外网单据相关接口 2 years ago
anthonywj d5153119f1 扫码空单问题 2 years ago
anthonywj e499c9db45 同步问题,单据撤回问题 2 years ago
郑明梁 42441fa449 供应商物质申请审核问题修复 2 years ago
郑明梁 88f8db9a69 供应商物质申请审核问题修复 2 years ago
郑明梁 227627ccc8 供应商拉取部门问题修改" 2 years ago
郑明梁 8889a02c92 部门修改提示语 2 years ago
郑明梁 213cbdef11 仓库和部门功能修改 2 years ago
anthonywj 9a85274237 单据撤回相关修改 2 years ago
anthonywj fd96be91ed 新增物资字典删除,禁用校验 2 years ago
anthonywj f8437f1c1a 新增单据类型删除时校验单据,用户,仓库是否存在,
新增页面单据类型关联仓库查询,新增单据核对人,更改核对时间
2 years ago
anthonywj b01d980a94 同步单据相关修改 2 years ago
x_z b07a87f4cc 1.修改导出文件格式为UDI 2 years ago
anthonywj fdb9944c3e 业务单据同步bug修复 2 years ago
x_z 569707b339 1.优化单据扫码接口性能 2 years ago
anthonywj ac09b84ff3 扫码单据同步 2 years ago
郑明梁 cd9d0bed0a 院内分类搜索问题修改 2 years ago
郑明梁 9c6721d544 院内分类名字重复修复 2 years ago
郑明梁 6d18d09817 设置自动生成业务单名字不显示bug修改 2 years ago
郑明梁 c3bfed438e 资质产品选入修改 2 years ago
郑明梁 c21e7431af 资质产品选入修改 2 years ago
wangwei a59e4d5cb7 修改资质bug 2 years ago
郑明梁 f5be9675a4 修改审核拉取角色问题 2 years ago
郑明梁 5c95fd1c5f 修改资质bug 2 years ago
郑明梁 78f73e4832 先回复资质可以选择一样证书的代码 2 years ago
wangwei 91cd71e7e2 修改 用户管理新增用户会绑定超管角色 2 years ago
郑明梁 7fea4c187c 内部码打印已经物资改序列号失败问题 2 years ago
郑明梁 12a08b61d2 资质日期比对 2 years ago
wangwei 43d85a6cdf 修改 部门下面还有子部门时无法删除 2 years ago
郑明梁 ad9b24d443 资质bug修改 2 years ago
x_z 1247359a05 1.修复日志打印问题 2 years ago
wangwei 35ba46370f 修改用户管理部门信息bug 2 years ago
x_z 8dcdb6d4b1 1.添加模糊查询
2.修复物资字典导出目录不存在报错的问题
2 years ago
wangwei 631827e941 修改bug 2 years ago
anthonywj dcb1b16049 部门删除修改,清除日志修改 2 years ago