Commit Graph

302 Commits (64bba380a48d16479f952afcf68289a29fae3680)

Author SHA1 Message Date
anthonywj 48c0ce5269 资质证书预警等相关修改 1 year ago
anthonywj be9a844ebf 新增耗材分类 1 year ago
anthonywj 552367c4d3 供应商产品维护更新问题 1 year ago
anthonywj ef9f01c674 新增产品属性 1 year ago
anthonywj de3e184f9c 采购类型相关修改 1 year ago
chenhc 00899954ae fix: 帮助页面配置修改 1 year ago
yuanwei f44b5e9727 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 1 year ago
anthonywj b306c6a951 长泰集采问题修改 1 year ago
anthonywj 88848d671d 长泰集采非集采问题,产品关联;数据库升级问题 1 year ago
anthonywj 1eea81cef6 代码备份 1 year ago
anthonywj ee6a7a6775 耗材字典新增货号等字段,协调平台查询新增序列号查询 2 years ago
yuanwei 91be062416 页面修改 2 years ago
yuanwei 35c6557734 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
anthonywj 0fa3c04d98 第三方物资类别修改 2 years ago
yuanwei 2d83718b42 初始化动态配置 2 years ago
yuanwei 09151052c2 初始化动态配置 2 years ago
anthonywj 3aaefed829 单据新增灭菌日期灭菌批号 2 years ago
anthonywj 383d060283 预验收单据类型新增带回与不带回 2 years ago
anthonywj 871433c022 新增物价类别 2 years ago
anthonywj bbcdd1dbd2 Merge remote-tracking branch 'origin/dev2.0' into dev_price
# Conflicts:
#	src/main/java/com/glxp/api/dao/system/SysMsgTodoMapper.java
#	src/main/java/com/glxp/api/entity/system/SysMsgTodoEntity.java
#	src/main/java/com/glxp/api/service/system/SysMsgTodoService.java
#	src/main/resources/mybatis/mapper/system/SysMsgTodoMapper.xml
2 years ago
wj 4b0099fa2d sys_msg_todo相关 2 years ago
wj b5467f4dcf sys_msg_todo相关 2 years ago
anthonywj 8792e1e7ab 代办消息列表 2 years ago
anthonywj ffe583217d 库存发票相关 2 years ago
anthonywj 49bef11dd9 物资入院申请等相关修改 2 years ago
anthonywj 43e1d463b8 价格先进先出,耗材字典问题,确认单据人问题 2 years ago
anthonywj 1807df0e31 单据类型添加编辑类型 2 years ago
anthonywj 302e204781 物资字典对照问题 2 years ago
anthonywj 6dea372e6a 系统繁忙问题 2 years ago
anthonywj c83c5fd8d3 删除任务同步相关调整(后续还需调整) 2 years ago
anthonywj 5f0ed5705d 修改设备任务ID为雪花ID(自增同步会有问题),其他相关bug修改 2 years ago
郑明梁 eec47d10ce 设备任务代码提交 2 years ago
wangwei 131c6f297f 同步删除基础数据 2 years ago
anthonywj 6b0a8cf8cc 新增同步操作日志相关方法 2 years ago
anthonywj 7ed62f3b38 新增websocket通信(中继服务同步相关) 2 years ago
anthonywj d2cc2d992f bug修改 耗材字典字段修改 2 years ago
anthonywj b23d7397bb bug修改 2 years ago
黄泽腾 388d68b3ae 生成对应内部码 2 years ago
anthonywj 15e6b8d168 新增备注字段 2 years ago
anthonywj 3583d17057 国家库更新版本问题 2 years ago
anthonywj eb48e66a36 int型修改 2 years ago
anthonywj 5e9d092264 修改ms查询单据类型 2 years ago
wj 0b93501508 属性copy调整 2 years ago
anthonywj b78a5a35c3 单据业务详情丢失,单据未补单,使用出库多补退货单等问题 2 years ago
anthonywj d6f9e3f06a 临床使用出库单新增备注字段 2 years ago
anthonywj 3caf75626b bug修改,提供协调平台追溯查询接口 2 years ago
anthonywj ce0da2cd18 ,bug修改 2 years ago
anthonywj b4243db10c 更新审核人,核对人,供应商编辑信息bug 2 years ago
郑明梁 5236bfaf39 单据上传功能代码提交 2 years ago
郑明梁 dbcb7bbaf1 Merge remote-tracking branch 'origin/pro' into dev
# Conflicts:
#	src/main/java/com/glxp/api/controller/auth/LoginController.java
2 years ago
anthonywj 287b8e762a 基础信息相关修改 2 years ago
郑明梁 d14f2dbefd 单据上传功能代码提交 2 years ago
wangwei 035c05c4f5 修改 admin设置产品为可集采状态,供应商 入院物资没同步更新 2 years ago
wangwei 8733e63cd5 发票优化 2 years ago
郑明梁 42141422a1 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 24057e1458 新增扫码单据排序 2 years ago
anthonywj 5b2ad5b348 单据重复提交问题 2 years ago
wj e5406f64f4 最新代码提交 2 years ago
wj ed0793f0c2 bug修复 2 years ago
anthonywj 50d5996c65 物资字典编辑问题 2 years ago
wj 2169d3300d 增加平台验证接口 2 years ago
anthonywj 0083117df9 采购订单,单据流转等修改 2 years ago
wangwei aa8fee64d1 冷链报告 2 years ago
wangwei 133b778a99 bug修改 2 years ago
anthonywj e4864f67e4 单据详情改为雪花ID 2 years ago
wj 62b26214a6 id类型调整 2 years ago
wj 2d623577f1 id类型调整,异常打印 2 years ago
anthonywj 282459ca4e bug修改 2 years ago
wangwei 2832d8944c 发票 优化 2 years ago
anthonywj f155b6d580 货位,bug修改,单据同步修改 2 years ago
wangwei 83697b44bd 修改发票bug 添加金额 总金额 2 years ago
wangwei 298f3f3507 发票修改
(cherry picked from commit ff1f825b39)
2 years ago
anthonywj a371499265 同步相关问题修改。用户选入物资字典相关修改
(cherry picked from commit 2d3bd6fe09)
2 years ago
wangwei 1a56d8e7ad 发票修改 2 years ago
anthonywj c032003936 上线bug修改,同步修改,发票修改 2 years ago
wj 725142ff47 代码调整 2 years ago
wj 98c0b2ed30 增加执行信息 2 years ago
anthonywj 6d52ad21cf 同步bug修改 2 years ago
wangwei d252711651 修改新用户 审核问题 2 years ago
anthonywj 009d0f0a39 修复系统繁忙问题,新增预验收按货位退回 2 years ago
anthonywj b7c2690d56 bug修改 2 years ago
wj bffb2468c7 上传数据写入文件 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
anthonywj 292462151f 新增三期拣货,无三期拣货,为配货等页面 2 years ago
wj c6e75ba278 增加表名 2 years ago
anthonywj 0cda57721b 库存详情新增入库数量与出库数量,方便后续分组统计查询 2 years ago
wj 30fa6198b5 第三方数据同步 2 years ago
wj 3648bf21cd 用户数据同步 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
anthonywj 9f946d35c6 单据同步 2 years ago
wangwei 90473b8841 修改 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
郑明梁 18978adb95 内部码打印代码提交 2 years ago
wangwei b78f7d9b87 修改bug 2 years ago
anthonywj 3a0bf62f22 代码备份 2 years ago
wj bf4c254cd3 同步设置--其他数据 2 years ago
anthonywj 93e717be63 扫码相关bug修改 2 years ago
anthonywj 73720a298d 新增自动创建单模式 2 years ago
郑明梁 752ff7ce8f 单据类型界面修改 2 years ago
anthonywj 0e7b269e1e 单据类型添加序号,注释掉同步任务 2 years ago
anthonywj 263e5d0dac 寄售库存校验,仓库查询 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
郑明梁 74060f32d4 单据类型界面修改 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
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 60adcd3df3 部门信息 2 years ago
anthonywj 61f197c530 接收中继服务、UDI管理系统上传用户数据 2 years ago
anthonywj 0de4f1a2e4 同步设置相关修改 2 years ago
anthonywj 9c16967583 1.新增预验收库存产品信息,库存产品信息详情;
2.更改预验收出库扫码校验流程;
3.更改预验收生成库存流程;
4.新增预验收出库后生成退货单;
5.更改预验收出库后扣减数量流程
2 years ago
郑明梁 ac92524ae9 物资审核代码提交 2 years ago
anthonywj fd96be91ed 新增物资字典删除,禁用校验 2 years ago
anthonywj f8437f1c1a 新增单据类型删除时校验单据,用户,仓库是否存在,
新增页面单据类型关联仓库查询,新增单据核对人,更改核对时间
2 years ago
郑明梁 f686b5de3d 修改打印和内部码问题 2 years ago
anthonywj 94d847675a 仓库新增更新时间 2 years ago
anthonywj 9123c04905 新增物资分类,部门信息,优化要同步表 2 years ago
chengqf 7aff592868 同步任务-文件路径 2 years ago
chengqf 648d93c204 同步任务-文件路径 2 years ago
chengqf 23c36b4f05 同步任务-文件路径 2 years ago
chengqf 3af40df196 同步任务-文件路径 2 years ago
anthonywj fdb0a735b4 发票登记插入,查询修改 2 years ago
anthonywj 5ba858a8f4 相关bug修改 2 years ago
wangwei f4e7e2c4f4 修改用户管理 角色管理 2 years ago
郑明梁 07e40596d3 打印功能代码提交 2 years ago
x_z 97d0878e7c 1.生成数据库表和实体类 2 years ago
anthonywj 2cc58f2c01 切换部门,验收时间等问题 2 years ago
anthonywj 4236c930bf 数据同步, 2 years ago
wangwei 4785613797 调整检验报告 2 years ago
郑明梁 204db81828 生产产品企业资质新增代理商字段 2 years ago
anthonywj 7dd919b693 界面,查询,排序等相关问题修改 2 years ago
anthonywj cbd80dc157 单据校验相关修改 2 years ago
anthonywj 2ada57f5b5 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 790409f5d9 多级产品代码提交 2 years ago
anthonywj 9f21e6c4d8 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 986db0079d 打印模板代码提交 2 years ago
anthonywj b13e59285f 单据校验相关修改 2 years ago
anthonywj e5cb4011ee 单据类型修改 2 years ago