Commit Graph

323 Commits (5d7506360bea166ecad703a05fd32431036f606d)

Author SHA1 Message Date
chenhc 449de7adb4 feat: 术士套包、定数包功能开发优化 1 year ago
chenhc 50490a88dc feat: 术士套包、定数包功能开发 1 year ago
anthonywj 5cc8365472 科室出库修改 1 year ago
chenhc 85d9561d65 feat: 新增业务单据加上单据类型过滤物资录入 1 year ago
chenhc ad57946821 feat: 产品增加采购类型校验 1 year ago
chenhc d4a5f6d67f feat: 定数包项目 1 year ago
chenhc 879b532494 dev_ksck → origin/dev_ksck 1 year ago
anthonywj 44ba28c823 权限问题。耗材字典下载问题 1 year ago
chenhc fc91a02cf4 feat: 医保耗材信息增加字段 1 year ago
chenhc b50b981c65 feat: 增加页面的医保耗材信息调用功能 1 year ago
chenhc 255b6f1826 feat: 设备管理开发 1 year ago
anthonywj e6b51b0637 收费项目添加价格与计量单位 1 year ago
anthonywj 778f4424ac xm包名问题 1 year ago
chenhc 54d3d3244a feat: 审核流程配置功能 1 year ago
chenhc 79496895ad Merge remote-tracking branch 'origin/dev_20240306' into dev_fifo
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
anthonywj bc4c32eb51 平潭科室收费出库为往来单位时问题 1 year ago
anthonywj 778258acec 第三方出库明细 1 year ago
anthonywj 53585f97a6 新增耗材分类 1 year ago
chenhc 79c5ac8ef4 feat: 代码保存 1 year ago
anthonywj 13ac0d742f 普耗,收费出库生成单据优化 1 year ago
anthonywj 207f3324d4 项目组套新增供应商ID 1 year ago
chenhc 1f116efd92 feat: 三方出入库明细功能 1 year ago
chenhc 96dba85918 feat: 三方出入库明细功能 1 year ago
chenhc eb02f7b4cc Merge branch '20231126-yw' into dev_ksck
# Conflicts:
#	src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
#	src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java
#	src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java
1 year ago
chenhc 8a1f122230 feat: 代码提交 1 year ago
anthonywj 9e79e7cda9 Merge branch '20231126-yw' into dev_ksck
# Conflicts:
#	src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java
#	src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java
#	src/main/java/com/glxp/api/service/thrsys/ThrInvOrderDetailService.java
#	src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java
#	src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml
#	src/main/resources/mybatis/mapper/thrsys/ThrInvOrderMapper.xml
1 year ago
chenhc 2de35f3091 feat: 项目组套和三方出入库明细 1 year ago
anthonywj 34ac7603bd Merge branch '20231126-yw' into dev_ksck 1 year ago
chenhc a20becfb13 feat: 耗材字典新增功能 1 year ago
anthonywj be5ce3104b 新增产品属性 1 year ago
anthonywj 584bbcaed6 临床使用出库修改,新增采购类型,使用出库拆单补单等 1 year ago
anthonywj 805c82e972 新增生产企业字典维护 1 year ago
anthonywj 0a0155a967 1:东山nginx转发问题(头部参数修改);
2:再次领用;再次申购问题;
3.生成内部码是否以最小使用单元问题
1 year ago
anthonywj d970162fca 库存对比修改 1 year ago
anthonywj f6ecc65386 患者处方相关修改优化 2 years ago
anthonywj d345794cdb 患者处方相关修改 2 years ago
anthonywj c73e2bf1f2 第三方接口修改,第三接口容错处理,患者信息相关修改,单据类型患者相关修改,临床出库患者信息选择,是否对照处方等相关配置 2 years ago
anthonywj 5f110bea39 患者处方相关修改 2 years ago
anthonywj 81a57129f8 价格问题 2 years ago
anthonywj 7ef66921cf 切换分支备份 2 years ago
anthonywj 5085b66a7f 新增物价类别 2 years ago
anthonywj d7109caf5a 物资分类添加仓库与部门 2 years ago
anthonywj 6d5e0228d9 单据复制校验库存,申购加到货仓库 2 years ago
anthonywj 9904fff69f 按部门获取仓单据类型 2 years ago
wj b34ad7e181 调整 2 years ago
anthonywj c20dcbd4a5 患者信息,患者处方等相关接口新增 2 years ago
anthonywj 4b0d54ba71 添加患者相关操作类,打印问题修改,项目、定数包相关修改 2 years ago
wj feccc47758 调整 2 years ago
anthonywj 0074c56c9d 盘点相关功能 2 years ago
anthonywj 474971fb2f 新增盘点功能代码 2 years ago
anthonywj 16e5b8de59 耗材字典多个DI问题 2 years ago
anthonywj 1a30e1b923 手持终端下载供应商问题 2 years ago
anthonywj 5ab0fa6296 单据关联相关修改 2 years ago
anthonywj 54c7b550a2 单据类型添加编辑类型 2 years ago
anthonywj 44baefc855 系统升级相关修改 2 years ago
anthonywj 84feefd4c8 手持终端提交单据校验库存/物资字典对照问题 2 years ago
anthonywj 490df6ea57 s手持终端库存校验问题 2 years ago
anthonywj e16a34bc39 巡检计划定时任务补充(未完成) 2 years ago
anthonywj 795cd78540 生产企业字典相关代码 2 years ago
郑明梁 8375447cc4 设备领用代码提交 2 years ago
郑明梁 671131105a 设备领用代码提交 2 years ago
郑明梁 5c5f667cf5 设备代码提交 2 years ago
黄泽腾 5c0818cabc 内部码打印,选入单据后,点击 打印--生成内部码 时 报系统繁忙 2 years ago
黄泽腾 6daef0a567 字段更正 2 years ago
郑明梁 c386367832 bug修复 2 years ago
wangwei f98133e100 修改 用内部码进行调拨出库 提示库存不足问题 2 years ago
黄泽腾 60952f6168 新增往来单位搜索备份 2 years ago
黄泽腾 0dec5c2ed0 生成不了多级的内部码,会自动变成一级的内部码(片仔癀诊断和管理系统都有这个问题) 2 years ago
wangwei 596a46130e 去除废弃字段 2 years ago
薛宇 e7392620b6 单据类型未启用,仍然可以做单(片仔癀诊断和管理系统都有这个问题) 2 years ago
1178634255 c95b52a538 新增采购订单-产品录入:生产企业、注册/备案证号搜索框无法查询 2 years ago
郑明梁 ec39ea48d1 修改往来单位查询问题 2 years ago
郑明梁 dbbf5a8811 定数包去掉无用代码 2 years ago
wangwei b86501eb88 新增出入库单 di绑定多个产品 产品重复问题 2 years ago
schry 5fe7fb4067 页面优化 2 years ago
郑明梁 1f260cb9de 单据上传拉取客户修改outType类型 2 years ago
郑明梁 883084f4c5 定数包代码提交 2 years ago
郑明梁 86bd9ebc9c 往来单位是客户的客户类型为患者 2 years ago
郑明梁 dad49893d3 定数包设置代码提交 2 years ago
anthonywj 2faa905bfb 第三方单据上传bug,发票重复bug 2 years ago
郑明梁 c50bd49100 多次出库bug修复 2 years ago
郑明梁 e3bb14f114 定数包实体初始化 2 years ago
anthonywj c1d4d1b1df 分类第三方产品信息问题 2 years ago
郑明梁 32be3ec3e8 新增申购单选入申购新增物资类别搜索 2 years ago
anthonywj 069069e32b bug修改 2 years ago
anthonywj aa17be0b83 bug修改 2 years ago
anthonywj 86f084836e 选入第三方业务单据修改 2 years ago
wangwei 77256a1516 bug修改 2 years ago
郑明梁 dcb4cad964 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 4730d6fe78 单据上传功能代码提交 2 years ago
wangwei 054804cf7c Merge remote-tracking branch 'origin/zmlDev' into dev 2 years ago
wangwei 628066d7c6 bug修改 2 years ago
wangwei b7ecf98f9e Merge remote-tracking branch 'origin/zmlDev' into dev 2 years ago
wangwei 73057d3570 物资类别bug修改 2 years ago
anthonywj 5c0a78e70c 基础信息相关修改 2 years ago
郑明梁 17a0e0b99c Merge branch 'zmlDev' into dev 2 years ago
wangwei 607414c4a1 物资类别bug修改 2 years ago
郑明梁 c5b7ba7db5 客户管理功能代码提交 2 years ago
anthonywj a09eb7c2da 多级产品出库问题,申购新增备注字段搜索 2 years ago
wangwei 5e3901e040 物资类别功能 2 years ago
郑明梁 2127c2f170 物资类别功能代码初始化 2 years ago
郑明梁 02a17df71a 多次出库bug修改 2 years ago
anthonywj 374f8261f8 相关bug修改 2 years ago
wangwei d4e0107b91 新增出入库 物资录入查询问题 2 years ago
郑明梁 d1eb441bca Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 90f1b6c334 产品名称转拼音首字母 2 years ago
anthonywj 9249249182 申购产品生产企业对不上问题 2 years ago
anthonywj 1a015238d6 采购计划提交系统繁忙问题,物资字典选入系统繁忙,生产企业查询系统繁忙 2 years ago
anthonywj d2cd3f803d 申购单据产品查询修改,提交采购订单修改 2 years ago
wangwei 545905a5f3 新增申购产品录入多选问题 2 years ago
郑明梁 d4119a70a8 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 66d890ab18 业务单据功能修改 2 years ago
anthonywj 70c0784584 申购,相关查询修改 2 years ago
郑明梁 6b004099d3 业务单据功能优化 2 years ago
郑明梁 ba9711c467 库存预警bug修复 2 years ago
郑明梁 269ddea831 物资查询按照isDisable字段查询 2 years ago
郑明梁 4099c75d05 物资去掉放回id提交 2 years ago
anthonywj 5619aa362c 代码备份 2 years ago
郑明梁 4a6f792398 多次使用出库新增功能代码提交 2 years ago
郑明梁 d0a507981f 物资新增多次出库设置 2 years ago
schry c669d89eb4 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
schry 68782d1619 业务单自动补单的单据类型名称不支持模糊查询 230519 2 years ago
郑明梁 d72625c5cd Merge remote-tracking branch 'origin/zmlDev' into dev 2 years ago
郑明梁 3a26eafb7d 多次使用出库新增功能代码提交 2 years ago
anthonywj be6abd2063 bug修改 2 years ago
郑明梁 92e2a0fe89 inv_user_product,inv_user_product_detail表初始化代码提交 2 years ago
anthonywj 23dacbc0d7 bug修改 2 years ago
wj 624aee5f1e id映射问题 2 years ago
anthonywj 75077b05a4 同步相关问题修改。用户选入物资字典相关修改 2 years ago
anthonywj 3cae7526bc 摆货相关修改,添加货位查询,预验收,寄售等相关库存摆货 2 years ago
wangwei dbaa3cf85e 修改 维护往来id问题 2 years ago
郑明梁 ac199432c9 物资添加id问题 2 years ago
anthonywj 3360b7e2bd bug修改代码备份 2 years ago
anthonywj 37af4d2462 合并同步 分支 2 years ago
anthonywj e62c88dfbe 合并git 分支 2 years ago
wj 0499617822 系统设置同步 2 years ago
anthonywj 54dc7cd0eb 同步数据修改为雪花ID 2 years ago
anthonywj 9e25fc5036 bug修改代码备份 2 years ago
anthonywj 4278cf047e bug修改 2 years ago
anthonywj 9f65dda33c 物资分类带代码迁移 2 years ago
anthonywj 1e82f37f7f 物资字典参数设置,单据类型修改 2 years ago
wangwei 1524185bc6 同步 内部码 2 years ago
郑明梁 b0543b862a 资质代码同步 2 years ago
anthonywj bd7fd9691a 物资字典代码迁移,新增国家库同步到外网查询 2 years ago
wangwei a2944efa3e 修改bug 2 years ago
anthonywj a8504f276e 代码迁移备份,预验收退回修改 2 years ago
郑明梁 57898a6731 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java
#	src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java
#	src/main/java/com/glxp/api/task/AsyncUdiTask.java
#	src/main/resources/schemas/schema_v2.1.sql
2 years ago
郑明梁 35704f2221 单据类型设置代码提交(同步) 2 years ago
anthonywj 76994ae9f5 领用单据审核bug修改,自动生成业务单,扫码单等修改迁移 2 years ago
anthonywj e3c6399aa5 单据流转相关修改 2 years ago