Commit Graph

1221 Commits (aafe6c1cbbf16cb27bd69491265fce5811da9e37)

Author SHA1 Message Date
wangwei 223af215f0 12/17 扫码单类型 4 months ago
wangwei 7b56a8565a 12/16 器械选入的规格型号 4 months ago
yewj 16445b63a6 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 4 months ago
yewj 16e7e8179c 选入阿里单据,重复扫码 4 months ago
chenhc 057a57300d feat: 阿里采购送货单的业务对接 4 months ago
chenhc e412a73854 feat: 阿里采购送货单的业务对接 4 months ago
yewj 72eca2dcbc Merge remote-tracking branch 'origin/dev_drug' into dev_drug 4 months ago
yewj c69a08bac7 选入阿里单据 4 months ago
qiuyt 1610a0657f 1、查询码信息更改 4 months ago
qiuyt 5acbb896c6 1、查询码信息更改 4 months ago
chenhc e7a5145063 feat: 阿里采购送货单的业务对接 4 months ago
yewj b3da30fdc4 提交todo 4 months ago
yewj 72d4d04a8d 提交todo 4 months ago
qiuyt 72d9611ccc 1、编辑药品选入产品标识重新建个请求写逻辑
2、药品编辑维护选入查询阿里逻辑
4 months ago
chenhc 3e1de294b0 feat: 阿里采购送货单的业务对接 4 months ago
chenhc 3e00e28df1 feat: 阿里采购送货单的业务对接 4 months ago
chenhc d4dce20a19 feat: 阿里采购送货单的业务对接 4 months ago
qiuyt f518c41472 1、阿里获取单据加上往来单位查询 4 months ago
chenhc 5cf64403df feat: 阿里采购送货单的业务对接 4 months ago
qiuyt 315436f4be 1、阿里获取单据 4 months ago
qiuyt caddab8ce4 1、阿里获取单据 4 months ago
qiuyt b0d5378f43 1、阿里获取单据 4 months ago
chenhc c95a5cf291 feat: 阿里采购送货单的业务对接 4 months ago
qiuyt 0c5d88c1db 1、扫码补齐阿里的批次号 等信息
2、解决扫码扫码详情出不来的bug
4 months ago
chenhc dd9be6e8fe feat: 阿里采购送货单的业务对接 4 months ago
yewj 4a92d3d323 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 4 months ago
yewj fb8bbb8b4f 修改带校验,库存等 4 months ago
qiuyt 4221c7f8fb 1、阿里一些对象先上传 初始化一些访问接口方法
2、杰哥改的东西上传
3、循环导入药品没加类型查的问题
4 months ago
qiuyt ec747944bf 1、阿里一些对象先上传 初始化一些访问接口方法
2、杰哥改的东西上传
3、循环导入药品没加类型查的问题
4 months ago
yewj f2ebe1872b 单据提交按照业务单提交 4 months ago
wangwei c92d07bdcf 12/9 药品选入价格问题1.0 订单主标识一样根据产品uuid分组 4 months ago
qiuyt d2c006cf43 1、阿里单据拉取参数(还差一些对照)
2、产品选入问题
4 months ago
yewj 38f66bc445 产品查询查询全部问题 4 months ago
yewj e8d558bbf3 产品查询查询全部问题 4 months ago
qiuyt 42785d87a5 1、选入药品调用国家库或者阿里接口进行拉取药品码段数据插入我们的表
2、医保接口也没有的时候也调用接口
3、key使用阿里用户表获取
4 months ago
qiuyt a240f24839 选入药品逻辑更改 4 months ago
yewj f1a16d24b7 最小数量修改 4 months ago
qiuyt 2409d88b58 选入药品问题 并且查不到阿里也会新增一条 查不到医保库也同理 4 months ago
qiuyt b3b8376d9a 选入药品阿里不能抛出异常 4 months ago
qiuyt 94fff63ebb 选入药品阿里字段问题 4 months ago
qiuyt 9a7f359524 选入药品阿里字段问题 4 months ago
qiuyt 99b53dfa1c 1、扫码自动获取关联关系对象属性变化
2、生产企业通过时间段批量查询入出库单信息阿里接口
4 months ago
qiuyt 85512b32b7 1、 4 months ago
qiuyt 610408ac5c 增加调用阿里查询药品码段信息
选入药品之后判断国家库有没有有就获取 没有就去调用阿里接口(厂家ID获取有问题先写死)
4 months ago
qiuyt 864ec46a6e 增加调用阿里查询药品码段信息
选入药品之后判断国家库有没有有就获取 没有就去调用阿里接口
4 months ago
wangwei 9d0c16cb86 11/28 优化 4 months ago
chenhc 559d6e5197 fix: 增加药品单据的一个判断是否全部维护关联关系 4 months ago
chenhc 9dd6b11940 fix: 增加药品单据的一个判断是否全部维护关联关系 4 months ago
chenhc cdd570723c fix: 修复 4 months ago
chenhc 7c3e12ab04 fix: 修复 4 months ago
wangwei 47c22da4ac 11/22 单据扫码详情表设置药品包装规格 5 months ago
wangwei db8e7651c0 11/22 查询字段优化1.0 5 months ago
qiuyt 5be468c250 增加关联关系获取接口用于关联系统用
阿里调用接口逻辑变更
5 months ago
yewj 135981aca1 耗材字典审核 5 months ago
wangwei 4e1353f1c0 11/19 查询优化 5 months ago
yewj c396226dd4 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 5 months ago
yewj cabf9eeb5f 关联关系同步问题 5 months ago
wangwei 16342e510d 11/19 药品基础数据明细分类同步 5 months ago
wangwei 8a674aca2e 11/19 供应商耗材选入优化 5 months ago
yewj da5b51268c 关联关系修改,扫码补齐修改,bug修改 5 months ago
qiuyt ebecb976e1 Merge branch 'dev_drug' of http://116.204.71.86:3000/UDI/udi-spms-java into dev_drug 5 months ago
qiuyt b1b91af660 扫码的时候如果没查到码关联关系数据去调用阿里接口进行插入 5 months ago
wangwei 9ac558a038 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 5 months ago
wangwei 78034bb355 供应商选入 耗材 修改 5 months ago
qiuyt a970e840be 扫码的时候如果没查到码关联关系数据去调用阿里接口进行插入 5 months ago
yewj efce84554c 代码备份 5 months ago
wangwei 8af8506be2 11/18 界面查询优化1.0 5 months ago
wangwei 03782d19f3 11/18 关联关系查询字段 5 months ago
chenhc 1200db9be9 fix: 修复 5 months ago
wangwei 14af1e3b8e Merge remote-tracking branch 'origin/dev_drug' into dev_drug 5 months ago
wangwei 15b676dbef 10/15 界面优化1.0 5 months ago
qiuyt 5cc35709ed 提供一个方法新增这个供应商的code阿里健康关联的所有关联关系存储(三级码的关系不知道阿里返回的什么结构的无法测试 可能要改代码) 5 months ago
qiuyt 634775a6c8 1、封装阿里健康入参和返回 设计成通用方式后面再加个新接口比较方便
2、供应商增加码上放心企业信息增加阿里健康需要的信息
3、提供一个方法新增这个供应商的code阿里健康关联的所有关联关系存储
5 months ago
wangwei 6188451289 11/15 供应商新增入院药品优化1.0 5 months ago
wangwei a5504c85de 11/15 供应商选入药品优化1.0 5 months ago
wangwei 32570637c9 11/15 供应商药品库存查询 5 months ago
wangwei 87140090dc 11/14 供应商药品维护高级查询 5 months ago
wangwei 5d1b1f894e 11/14 增加是否查用字段 供应商选入药品增加模糊搜索 测试高级搜索 5 months ago
chenhc ce6d2d2b58 fix: 修复 5 months ago
yewj 90e09f8bff 代码备份 5 months ago
yewj 4db47217c4 关联关系问题 5 months ago
chenhc 3a4d5fffc0 fix: 修复药品关联关系失败不再次上传 5 months ago
chenhc 14baf9e1d5 fix: 修复 5 months ago
yewj 7204aac90e 产品信息维护问题 5 months ago
qiuyt 07d2029e96 Merge remote-tracking branch 'origin/dev_drug' into dev_drug
# Conflicts:
#	src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
5 months ago
chenhc 3f1deed064 fix: 修复 5 months ago
yewj 5f11772edb 选入产品带入层级 5 months ago
yewj 37f7a7ea76 bug修改,层级,阿里产品等 5 months ago
qiuyt d7c499a342 供应商和基础管理的药品字典维护 增加明细分类逻辑 增加药品层级逻辑更改 选入增加明细分类 增加耗材字典表字段 5 months ago
chenhc 389679926d fix: 修复 5 months ago
wangwei 2a735e688c 11/12 选入药品层级带入批准文号 5 months ago
yewj 33147dbece Merge remote-tracking branch 'origin/dev_drug' into dev_drug
# Conflicts:
#	src/main/resources/mybatis/mapper/thrsys/ThirdAliDrugMapper.xml
5 months ago
yewj 404f436e7f 药品字典修改 5 months ago
chenhc 4f2bcd3095 fix: 修复 5 months ago
chenhc 3eee851ec1 fix: 修复 5 months ago
chenhc 011d559cfa fix: 修复 5 months ago
chenhc 9206192dd8 fix: 修复 5 months ago
chenhc 6632322541 feat: 阿里药品加批准文号 5 months ago
chenhc 47efbae8e6 feat: 药品关联关系查重功能 5 months ago
wangwei f1862398e4 11/12 供应商选入药品增加查询条件 包装规格 制剂规格 5 months ago
chenhc 4977273cd0 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 5 months ago
chenhc 66ffa6bf98 fix:阿里药品关系维护 5 months ago
yewj 95c6d9ef47 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 5 months ago
yewj f7843f2739 关联关系校验 5 months ago
wangwei 142929f131 11/11 药品送货发票登记 5 months ago
yewj 2e3df99740 获取扫码关联关系批次号等 5 months ago
yewj 9143281b2e 获取扫码关联关系批次号等 5 months ago
yewj ab094e6611 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 5 months ago
yewj de4621f59d 扫码关联关系问题 5 months ago
chenhc 4cf197f3ae fix:阿里药品关系维护 5 months ago
wangwei e75234fc27 11/7 页面优化1.0 5 months ago
chenhc cbcc5cd994 fix:阿里药品关系维护 5 months ago
wangwei 952171b068 11/7 供应商添加药品信息优化1.0 5 months ago
chenhc eee367a1f1 fix:优化关联关系 5 months ago
chenhc 1f04f07f84 fix:优化关联关系 5 months ago
wangwei 8728cfb94b 11/7 同步更改时间 5 months ago
chenhc 2920d23b7b fix:修复 5 months ago
yewj 3bb20f08f9 新增阿里药品信息目录 5 months ago
yewj 6ce5cdc9c1 扫码修改 5 months ago
chenhc f31b78522c feat: 码明细到国家同步库 5 months ago
chenhc 359b0fb636 feat: 多码融合 5 months ago
chenhc eda1d2232e feat: 多码融合 5 months ago
chenhc e4350529f1 feat: 多码融合 5 months ago
chenhc bfa841ffa7 feat: 多码融合 5 months ago
chenhc 3d7422ecd4 feat: 多码融合 5 months ago
chenhc c693fbc24a feat: 多码融合 6 months ago
chenhc 5a395d84f7 feat: 多码融合 6 months ago
qyt bbf9d799c1 仓库逻辑改变仓库详情的逻辑都改成仓库表(第一次更新) 6 months ago
wangwei c96d76d1b3 10/15 同步优化1.0 6 months ago
yewj 70ce57e267 修改流通时,使用时数量计算 6 months ago
yewj ab34a60b64 查询采购订单,处理采购订单 6 months ago
wangwei f2f90af9f0 10/21 优化1 6 months ago
chenhc e3603c4e42 feat: 药品关联关系是否存在 6 months ago
chenhc 998879daff feat: 药品关联关系是否存在 6 months ago
chenhc e2ba897fc3 feat: 药品关联关系是否存在 6 months ago
chenhc 4f1258572d feat: 药品关联信息上下传输功能 6 months ago
yewj 96c9a354ce 器械层级修改 6 months ago
wangwei 11a52f4fd3 10/17 单据增加单据类型 6 months ago
yewj b4586848b6 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 6 months ago
yewj 10ca47d409 药品采购订单修改 6 months ago
chenhc 11b1c70394 feat: 药品关联关系功能 6 months ago
chenhc bb10befc0f feat: 手工关联、拼箱关联数据同步 6 months ago
qyt 69e256dd37 1、移植耗材管理编辑功能的所有相关
2、sql增加字段
6 months ago
wangwei f4c9afc4f5 Merge remote-tracking branch 'origin/dev_drug' into dev_drug 6 months ago
wangwei 036048bddd 10/14 yaopin 6 months ago
chenhc 7ed2265dec feat: 手工关联、拼箱关联数据同步 6 months ago
chenhc 3d3855af70 feat: 手工关联、拼箱关联 6 months ago
wangwei 9b9b478364 10/14 药品基础数据优化 6 months ago
wangwei 4316419c00 8/12 药品字段 8 months ago
anthonywj 15b093a2df 药品扫码流程修改 8 months ago