Commit Graph

678 Commits (d2b628973392f2369bfc8eeeda570509c9f664a1)

Author SHA1 Message Date
wangwei 90473b8841 修改 UDI码补齐 2 years ago
wj ca3f878c34 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
2 years ago
wj f643343b2a bug修复 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
wangwei 9dd987af01 修改bug 2 years ago
wj b77913fd6f 提供一个统一下发数据接口 2 years ago
wj b3d64f0c7a 返回报文增加状态码 2 years ago
wangwei 39769ee3e2 修改 仓库删除问题 2 years ago
wj b718bd645c sql提交 2 years ago
wj 9bffff5f6f 同步设置--其他数据 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 5e59141826 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 93e717be63 扫码相关bug修改 2 years ago
chengqf ecb2ff7d2c 文件后台上传,下载方法 2 years ago
chengqf f515add8d0 Merge remote-tracking branch 'origin/master' 2 years ago
chengqf 91f25546f8 文件上传,下载后台方法 2 years ago
chengqf ade5b66aad 增加后台调用上传,下载文件方法 2 years ago
anthonywj 3564a9bd22 补单修改 2 years ago
anthonywj 73720a298d 新增自动创建单模式 2 years ago
anthonywj 1dc24a856c Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj d4749b7dc3 代码备份 2 years ago
郑明梁 752ff7ce8f 单据类型界面修改 2 years ago
chengqf 65daf0ce09 文件下载 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
wj 3cfc2887d4 增加判断是否初始化sql 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
chengqf 116c54aa77 文件下载 2 years ago
chengqf 0072ff4d58 文件下载 2 years ago
chengqf 0e55e105ca Merge remote-tracking branch 'origin/master' 2 years ago
chengqf a912650a2d 文件下载 2 years ago
wangwei 9695d72eb0 Merge remote-tracking branch 'origin/master' 2 years ago
wangwei 5d56f8f5b9 修改bug 2 years ago
wj f8da7ad4a6 Merge remote-tracking branch 'origin/master' 2 years ago
wj 6be487f117 bug修复 2 years ago
chengqf ce60afd9b2 文件下载 2 years ago
wangwei 033d84eb13 修改bug 2 years ago
wj df5402a48f Merge remote-tracking branch 'origin/master' 2 years ago
wj 98e0521a6d bug修复 2 years ago
anthonywj 2cc4a51a4a 预验收退货相关流程重整 2 years ago
wj 83dcc7bded 包名修正 2 years ago
wj c4ef650155 包名修正 2 years ago
wj 832f8ccf97 Merge remote-tracking branch 'origin/master' 2 years ago
chengqf 1019bbaf24 文件下载 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
chengqf ee3741a78d signleDownloadFile改public 2 years ago
chengqf 6ee9de07ed signleDownloadFile文件大于0返回成功 2 years ago
chengqf d58c433293 Merge remote-tracking branch 'origin/master' 2 years ago
chengqf 00c16bb2ea signleDownloadFile文件大于0返回成功 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
chengqf 940c3d2697 文件上传 2 years ago
chengqf 7b535ad68a 文件上传 2 years ago
chengqf c42819d9a3 增加单独文件上传 2 years ago
chengqf 74a1fa026d writeFile 2 years ago
chengqf ad34382bba Merge remote-tracking branch 'origin/master' 2 years ago
chengqf 35d33b6870 writeFile 2 years ago
anthonywj 60adcd3df3 部门信息 2 years ago
anthonywj 61f197c530 接收中继服务、UDI管理系统上传用户数据 2 years ago
anthonywj 0b7279d08b 接收中继服务、UDI管理系统数据 2 years ago
anthonywj 09196fc26f Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 8666566189 新增国家库数据同步 2 years ago
郑明梁 44c9481ccb Merge remote-tracking branch 'origin/master' 2 years ago
chengqf 6cc3d6585d 增加上传失败重新上传 2 years ago
chengqf 87febc48c5 status 2 years ago
anthonywj 5f504c17f1 sql修改 2 years ago
anthonywj 0de4f1a2e4 同步设置相关修改 2 years ago
anthonywj 9c16967583 1.新增预验收库存产品信息,库存产品信息详情;
2.更改预验收出库扫码校验流程;
3.更改预验收生成库存流程;
4.新增预验收出库后生成退货单;
5.更改预验收出库后扣减数量流程
2 years ago
anthonywj b337627cb6 数据同步相关修改,代码备份 2 years ago
chengqf d63bcbf598 增加数据删除同步 2 years ago
郑明梁 8b8e76c8a5 默认用户给一级部门 2 years ago
郑明梁 b19aa2581e 仓库修改寄售功能代码提交 2 years ago
chengqf 852dd4a41f 数据删除同步 2 years ago
chengqf 490c2530a4 数据删除同步 2 years ago
chengqf 1b0320d441 数据删除同步修改 2 years ago
chengqf 06abc56fbd 删除同步 2 years ago
chengqf 518546c5a6 数据删除同步 2 years ago
chengqf ae680d2ef5 增加条件参数0,1为空无需判断可同步 2 years ago
chengqf 8973ef8898 删除同步 2 years ago
chengqf ab7902a4db 数据删除同步接口 2 years ago
chengqf 7dbf8a73ca Merge remote-tracking branch 'origin/master' 2 years ago
chengqf 5154d18206 数据删除同步接口 2 years ago
anthonywj 74e9ab62f8 UDI管理系统获取验收单据 2 years ago
郑明梁 ac92524ae9 物资审核代码提交 2 years ago
郑明梁 1e11b9b5d3 物资审核代码提交 2 years ago
wangwei 71f7611d97 Merge remote-tracking branch 'origin/master' 2 years ago
wangwei eb1c432b94 增加字段 2 years ago
郑明梁 0267226891 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 bdd68fdca7 物资审核代码提交 2 years ago
x_z 81fbedcfba 1.修复bug 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
郑明梁 b93c1786d1 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 227627ccc8 供应商拉取部门问题修改" 2 years ago
chengqf e04341415c 路径问题 2 years ago
chengqf e290216060 Merge remote-tracking branch 'origin/master' 2 years ago
chengqf d73faea61f 路径问题 2 years ago
chengqf 46a81cf2fc 路径问题 2 years ago
郑明梁 8889a02c92 部门修改提示语 2 years ago
wangwei 2307c5f319 修改 供应商入院物资维护模块 产品解绑后 条件查询不完全 2 years ago
郑明梁 213cbdef11 仓库和部门功能修改 2 years ago
chengqf eaaf8d2324 连通检测 2 years ago
chengqf 15eada0200 连通检测 2 years ago
chengqf 2848a47242 修改同步数据时间条件到当前时间 2 years ago
chengqf ae72e6a14c 删除拉取0k文件 2 years ago
chengqf 8a72cf1572 Merge remote-tracking branch 'origin/master' 2 years ago
chengqf 63f7df01bd 删除拉取0k文件 2 years ago
anthonywj 51e8028ab0 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 9a85274237 单据撤回相关修改 2 years ago
wangwei 1817f88b4f 审核送货单 增加核对时间 2 years ago
chengqf 7ec3187957 connect check 2 years ago
chengqf 7ac684ac8f updateTime 2 years ago
anthonywj fd96be91ed 新增物资字典删除,禁用校验 2 years ago
anthonywj f8437f1c1a 新增单据类型删除时校验单据,用户,仓库是否存在,
新增页面单据类型关联仓库查询,新增单据核对人,更改核对时间
2 years ago
chengqf 8fc19cfeb0 outputStream.close() 2 years ago
chengqf 24a00ef933 out.close() 2 years ago
x_z 6278f2c554 1.修复做单扫码查询产品是否存在问题 2 years ago
wangwei 5d0076da4b 修改 物资字典中启用单元 科室多次使用出库 供应商中显示有误 2 years ago
郑明梁 76e64c60b2 Merge remote-tracking branch 'origin/master' 2 years ago
x_z 3ed574424e 1.查询用户修改模糊查询 2 years ago
郑明梁 90181f8df1 物资申请没有耗材备注字段 2 years ago
wj 5ae0c76f29 RedisUtil.java新增setIfAbsent方法 2 years ago
wangwei 09f6182b88 修改bug 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
郑明梁 2ca3366c5e 物资维护没有显示分类字段 2 years ago
anthonywj ac09b84ff3 扫码单据同步 2 years ago
郑明梁 cd9d0bed0a 院内分类搜索问题修改 2 years ago
郑明梁 9c6721d544 院内分类名字重复修复 2 years ago
郑明梁 6d18d09817 设置自动生成业务单名字不显示bug修改 2 years ago
x_z a474d8437d 1.调整库存预警设置查询接口 2 years ago
chengqf 58a48d0768 优化 2 years ago
chengqf 7053465cb9 Merge remote-tracking branch 'origin/master' 2 years ago
chengqf 9f52defd0b 优化 2 years ago
chengqf 5d0834095e 优化 2 years ago
wangwei 862e3e2ff7 修改发票分页bug 2 years ago
郑明梁 c3bfed438e 资质产品选入修改 2 years ago
郑明梁 05e7fa3ba6 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 c21e7431af 资质产品选入修改 2 years ago
wangwei 74729eb59d 调整库存预警 2 years ago
wangwei a59e4d5cb7 修改资质bug 2 years ago
郑明梁 db34619228 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 f5be9675a4 修改审核拉取角色问题 2 years ago
chengqf f9c8953255 列名加反引号,防止关键字报错 2 years ago
chengqf c58a077033 Merge remote-tracking branch 'origin/master' 2 years ago
chengqf 435a35468c 列名加反引号,防止关键字报错 2 years ago
郑明梁 5c95fd1c5f 修改资质bug 2 years ago
anthonywj c09497b01b 单据同步问题 2 years ago
chengqf cfd81deb8b 增加单独生成方法,接口 2 years ago
chengqf ff78a8de34 Merge remote-tracking branch 'origin/master' 2 years ago
chengqf fad7225704 增加独立发送方法,接口 2 years ago
郑明梁 78f73e4832 先回复资质可以选择一样证书的代码 2 years ago
wangwei c1d02f9b9f 修改 新用户审核分配角色bug 2 years ago
chengqf 70739fddf7 Merge remote-tracking branch 'origin/master' 2 years ago
chengqf e31ebff9ea Merge remote-tracking branch 'origin/master' 2 years ago
chengqf 84001ac6b3 tabs 2 years ago
chengqf 6e1f5fb2f9 tab 2 years ago
wangwei 91cd71e7e2 修改 用户管理新增用户会绑定超管角色 2 years ago
chengqf 67eb92e7ab 增加同步表未设置的也上传 2 years ago
chengqf 9e882d0158 Merge remote-tracking branch 'origin/master' 2 years ago
chengqf 544796a5b1 增加同步表未设置的也上传 2 years ago
郑明梁 7fea4c187c 内部码打印已经物资改序列号失败问题 2 years ago
chengqf 8da4034019 split,null 2 years ago
chengqf 4fc45430bc 子表被执行bug 2 years ago
chengqf 6028bb64f3 Merge remote-tracking branch 'origin/master' 2 years ago