Commit Graph

1341 Commits (1b56dc65f159da73a73f1e3b2be2121699952ee4)

Author SHA1 Message Date
anthonywj 3f0bffd21a 收费明细多个供应商问题 12 months ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 12 months ago
anthonywj eaa0c50011 无批次号出库默认赋予批次号 12 months ago
anthonywj 147c9f3fa9 拆零相关修改 12 months ago
wangwei dfd2e2bfce Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
12 months ago
wangwei 7b0a9dd058 7/27 1.1 12 months ago
anthonywj 878f571a3b 新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等 12 months ago
anthonywj de0987058c Merge branch 'dev_fifo' into dev_fifo_z 12 months ago
wangwei 8a614fd0bc 1.1 12 months ago
anthonywj 7fd4b216aa 第三方收费明细修改 12 months ago
anthonywj 4ad90672fa 平潭收费相关修改 12 months ago
anthonywj 9f4c6fa539 平台收费出入库明细修改 12 months ago
anthonywj c064fa3629 患者信息修改, 1 year ago
anthonywj f16521fbbb 平潭修改患者信息下载 1 year ago
anthonywj 92592beb48 南靖收费退费修改 1 year ago
anthonywj 184b3c8139 南靖接口调用查库存修改 1 year ago
anthonywj 3a879c604e 单据校验耗材问题 1 year ago
chenhc 8f13173a7c feat: 扫码校验功能 1 year ago
anthonywj 024f027f6b 高值耗材扫码实时出库 1 year ago
chenhc 6ce53c5bea feat: 0702-扫码校验功能 1 year ago
chenhc fc1dbe0c6e feat: 0701-是否需要扫码前判断单据是否为空 1 year ago
chenhc e33e19ec99 feat: 0701-是否需要扫码前判断单据是否为空 1 year ago
wangwei bcbe3745b5 6/21 同步优化 1 year ago
chenhc 52ff3ecd4a feat: 0606注释掉是否需要扫码 1 year ago
chenhc bb7cdfa80b feat: 0604增加是否需要扫码字段 1 year ago
chenhc 8bf33df981 feat: 0531增加是否需要扫码字段 1 year ago
chenhc ddb0a24f8d feat: 0531科室出库 1 year ago
anthonywj b86c064232 评价相关操作类 1 year ago
anthonywj 362d1fa353 评价体系重命名 1 year ago
anthonywj 571a992848 新增供应商评价相关类 1 year ago
anthonywj 3f649b0abf Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
anthonywj 87d3b9486f 新增耗材类别校验 1 year ago
chenhc a15afd2f5a feat: 0527开发论证功能 1 year ago
chenhc b70f4136cf feat: 0523开发论证功能 1 year ago
chenhc 0d9fc95ce0 feat: 0523开发询价模块 1 year ago
chenhc e4faa404e0 feat: 0523开发询价模块 1 year ago
chenhc 65e6bdf631 feat: 0521 优化 1 year ago
wangwei fd7dc88243 5-20 提交保养相关接口 1 year ago
wangwei a5ddecac51 5/17 保养计划优化 前端 巡检/维修/保养 记录 暂时没按钮 1 year ago
chenhc a411503f78 feat: sql优化 1 year ago
chenhc b27ec0f73a feat: 0517优化 1 year ago
chenhc fc6daa33f2 feat: 0517优化 1 year ago
anthonywj 0b257f3087 新增发票确认时间 1 year ago
chenhc 325f6d6961 feat: 0516优化 1 year ago
wangwei ed8ca33559 Merge branch 'dev_fifo1.0' into dev_fifo
# Conflicts:
#	src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailEntity.java
#	src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java
#	src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java
#	src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
wangwei 67955cae03 增加 保养计划 1 year ago
chenhc 560af1ae62 feat: 设备管理优化-0514-设备卡片 1 year ago
anthonywj 163e8c8b4d Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj 2a5c095915 设备巡检任务处理 1 year ago
chenhc eaf83b2ca3 feat: 设备管理优化-0514-合同管理 1 year ago
chenhc 5e393ab5ab feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理 1 year ago
chenhc b096280db6 feat: 设备管理优化-0513-合同管理复制 1 year ago
chenhc 770caa552c feat: 设备管理优化-0512-增加移除设备的审批流程 1 year ago
wangwei f9b273fcb6 5-10 数据同步 1 year ago
chenhc 958aa625ad feat: 设备管理优化-0510 1 year ago
chenhc 58ace1f05d feat: 设备管理优化 1 year ago
chenhc 5f9b6437da feat: 设备管理优化 1 year ago
chenhc b6ac849ce5 feat: 优化 1 year ago
chenhc 46ae4e7141 feat: 本部门保修单、报修单大厅、我的报修单、我的维修单 1 year ago
anthonywj 308f817e82 设备巡检任务处理 1 year ago
anthonywj 9815904b31 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj 3cb3fcfdec 设备巡检管理 1 year ago
chenhc ec00d0d605 feat: 设备入库-信息保存-医保编码 1 year ago
chenhc f81d29c601 feat: 设备入库、变更、报废 1 year ago
chenhc c6bdd36a42 feat: 设备登记、设备入库 1 year ago
anthonywj 8fa91cee91 新增下载收费项目字典 1 year ago
anthonywj 40d97991e8 高耗出库明细校验采购类型,高耗自动生成校验单据是否异常 1 year ago
chenhc 20699097fe feat: 明细列表增加术式模板id 1 year ago
chenhc baff72c8ef feat: 术式名称修改 1 year ago
chenhc 449de7adb4 feat: 术士套包、定数包功能开发优化 1 year ago
chenhc 9c6b03fb1b feat: 术士套包、定数包功能开发 1 year ago
chenhc 50490a88dc feat: 术士套包、定数包功能开发 1 year ago
anthonywj 5cc8365472 科室出库修改 1 year ago
chenhc d4a5f6d67f feat: 定数包项目 1 year ago
anthonywj 56ee67d92e 业务单生成扫码单数量不匹配问题 1 year ago
anthonywj e795be4b02 业务单生成扫码单数量不匹配问题 1 year ago
chenhc 11270c57dc feat: 第三方明细下载增加字段 1 year ago
chenhc fda7209233 feat: 科室医保分类功能 1 year ago
chenhc 26ae4069bc feat: 科室医保分类功能 1 year ago
anthonywj 543c7c0f6d 收费出库问题 1 year ago
chenhc 879b532494 dev_ksck → origin/dev_ksck 1 year ago
anthonywj f4bcdbb267 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj a58e9e6229 盘点修改,审核重复提交问题 1 year ago
chenhc a273cbce06 feat: 部门与医保耗材信息分类接口开发 1 year ago
chenhc 961bd20bbc feat: 部门与医保耗材信息分类关联关系初始化 1 year ago
anthonywj ae36a483fe 盘点修改 1 year ago
anthonywj 600dc8edf8 盘点问题,service类生成 1 year ago
anthonywj e7ae556f8d 新增配送产品,申请与审核,创建后回填 1 year ago
anthonywj 5e62af17e7 平潭收费生成单据问题 1 year ago
chenhc 2983a32c3e feat: 医保耗材信息增加字段 1 year ago
chenhc 4b5be8fb3b feat: 增加定时扫描三方的明细表-生成单据 1 year ago
chenhc d1743d12b4 feat: 增加定时扫描三方的明细表-生成单据 1 year ago
chenhc 371c37c35f feat: 设备管理-卡片开发 1 year ago
anthonywj 8fa0556e89 长泰高值耗材下载后自动生成出入库单据 1 year ago
anthonywj a60ac30187 科室出库补单问题 1 year ago
anthonywj 9cd21f4c54 科室出库补单问题 1 year ago
chenhc 255b6f1826 feat: 设备管理开发 1 year ago
chenhc 07be51ee6f feat: 审核开关-业务页面修改 1 year ago
chenhc 9acdef9af4 feat: 审核开关 1 year ago
chenhc db533938c8 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
1 year ago
chenhc 1cde4618ad feat: 供三方调用接口开发 1 year ago
anthonywj 9c6f7e9e4d Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj 34a728e6cb 平潭出库明细调整 1 year ago
chenhc 6dc6e5ab3b feat: 审核流程配置功能 1 year ago
chenhc 45b7fad953 feat: 审核流程配置功能-sql删除 1 year ago
anthonywj 57c1d8b144 新增下载单据后自动生成出入库单据 1 year ago
anthonywj 1a50e8a480 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 1 year ago
anthonywj c9d87c8070 收费出库明细生成单据bug修改 1 year ago
chenhc 54d3d3244a feat: 审核流程配置功能 1 year ago
chenhc 79314bbe8c Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo 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 ef16874927 平潭出入库明细更新 1 year ago
anthonywj 70caeaf21f 普耗收费出入库明细单据生成后自动流转 1 year ago
anthonywj 75b29b956e 业务单生成扫码单双重校验 1 year ago
anthonywj bc4c32eb51 平潭科室收费出库为往来单位时问题 1 year ago
anthonywj fba3db5d38 新增收费出库是否过滤高值耗材 1 year ago
anthonywj 778258acec 第三方出库明细 1 year ago
anthonywj 506c61bf64 库存检验问题 1 year ago
anthonywj 53585f97a6 新增耗材分类 1 year ago
anthonywj d812b5c41f 业务单生成扫码单执行先进先出原则 1 year ago
anthonywj 04cbe6afc8 业务单生成扫码单执行先进先出原则 1 year ago
anthonywj 692c07d961 出入库明细下载 1 year ago
anthonywj 8c150bdd3b 出入库明细下载问题 1 year ago
chenhc c347996bf2 feat: 提交 1 year ago
chenhc dd6e057554 feat: 提交 1 year ago
chenhc fa55bd5ab8 feat: 提交 1 year ago
chenhc 79c5ac8ef4 feat: 代码保存 1 year ago
anthonywj 17c2f222e5 高值出库明细生成库存校验等 1 year ago
anthonywj 38257800c0 高值出库明细生成单据优化 1 year ago
anthonywj 13ac0d742f 普耗,收费出库生成单据优化 1 year ago
anthonywj e685fb17dc 往来类型为患者,根据患者进行拆单 1 year ago
anthonywj ddb5a981a4 收费明细添加供应商ID 1 year ago
anthonywj 207f3324d4 项目组套新增供应商ID 1 year ago
anthonywj a706fd8952 添加供应商是否关联校验 1 year ago
chenhc 394ee7e585 feat: 高耗码校验 代码todo 1 year ago
chenhc ab3f8f57c6 feat: 高耗生成码校验 代码todo 1 year ago
chenhc 9e75867541 feat: 三方出入库明细功能 1 year ago
chenhc 1f116efd92 feat: 三方出入库明细功能 1 year ago
chenhc 8c0e5a73ba feat: 三方出入库明细功能 1 year ago
chenhc 96dba85918 feat: 三方出入库明细功能 1 year ago
chenhc d4ac5e9fcf feat: 增加产品-产品属性字段 1 year ago
chenhc 9b652cd815 feat: 保存代码 1 year ago
chenhc 4db974d0df 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
chenhc da429ea7dc feat: 产品新增 1 year ago
anthonywj a0b6eb4b27 新增产品字典字段补齐 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
anthonywj 1aa81fe5de 科室出库,集采拆单 1 year ago
chenhc 85c9db2ae5 feat: 项目组套和三方出入库明细 1 year ago
chenhc 2de35f3091 feat: 项目组套和三方出入库明细 1 year ago
anthonywj 34ac7603bd Merge branch '20231126-yw' into dev_ksck 1 year ago
anthonywj e3fc4cd3dc 第三方出入库明细 1 year ago
chenhc a20becfb13 feat: 耗材字典新增功能 1 year ago
anthonywj 584bbcaed6 临床使用出库修改,新增采购类型,使用出库拆单补单等 1 year ago
chenhc a83523fe58 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 1 year ago
chenhc 87600e2b3e Merge remote-tracking branch 'origin/dev_price' into dev_price 1 year ago
chenhc 6c859a9470 fix: 修复临床出库过滤库存数0的供应商 1 year ago
yuanwei 7a74235bcd Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 1 year ago
anthonywj 04f790caf8 单据重复上传问题,东山第三方产品信息新增库房代码 1 year ago
anthonywj 6b22bfb862 第三方产品信息过滤问题 1 year ago
yuanwei 7ffe727deb Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
# Conflicts:
#	src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java
1 year ago
anthonywj 805c82e972 新增生产企业字典维护 1 year ago
anthonywj 1ed3360997 新增第三方生产企业 1 year ago
anthonywj 3f06c5a1dd 审核人问题 1 year ago
anthonywj 0a0155a967 1:东山nginx转发问题(头部参数修改);
2:再次领用;再次申购问题;
3.生成内部码是否以最小使用单元问题
1 year ago
anthonywj c065ed3a6d 集采拆单问题 1 year ago
anthonywj d970162fca 库存对比修改 1 year ago
anthonywj 640e3ed137 校验后处方结果保存 1 year ago
anthonywj bc4b627077 患者信息远程下载,提供中医院设备查询界面 1 year ago
anthonywj b73e4a3826 预验收补单多个供应商带入不同产品 2 years ago
anthonywj 3ff1367628 协调平台查询出入库新增序列号查询 2 years ago
anthonywj 77525665e9 设备入库,变更,销毁等修改,自定义汇总统修改 2 years ago
anthonywj 5fad9e2835 新增自定义库存明细汇总 2 years ago
anthonywj f6ecc65386 患者处方相关修改优化 2 years ago
anthonywj d345794cdb 患者处方相关修改 2 years ago
anthonywj c73e2bf1f2 第三方接口修改,第三接口容错处理,患者信息相关修改,单据类型患者相关修改,临床出库患者信息选择,是否对照处方等相关配置 2 years ago
anthonywj 5f110bea39 患者处方相关修改 2 years ago
wj 1df50657b0 设备相关 2 years ago
anthonywj 33676f7c2f Merge remote-tracking branch 'origin/dev_price' into dev_price 2 years ago
anthonywj 27cc68ff98 新增库存出库模式,总库库存,上级库存,当前库存 2 years ago
wj 45bd2c8e1e 调整 2 years ago
yuanwei b5108288a5 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
anthonywj be1475a5da 新增库存出库模式,总库库存,上级库存,当前库存 2 years ago
yuanwei 508e93bb91 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
yuanwei 9b4ac353f7 单据管理 2 years ago
anthonywj f79458bb45 长泰新增配送产品,物资分类问题 2 years ago
anthonywj e7cdbf7140 第三方产品信息上传 2 years ago
anthonywj 81a57129f8 价格问题 2 years ago
anthonywj 7ef66921cf 切换分支备份 2 years ago
yuanwei 600a688072 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
wj 08d4462530 调整 2 years ago
yuanwei 1eab520dfd 初始化动态配置 2 years ago
anthonywj 677f368635 退货补单,多级仓库补单修改,新增灭菌批号,灭菌日期 2 years ago
anthonywj 32bd31903d 每日汇总统计等 2 years ago
anthonywj 7de61eb509 预验收入库单区分带回与不带回 2 years ago
anthonywj 8bde8b365c selectByRelId 2 years ago
anthonywj a277bc0ba2 项目组套相关更新 2 years ago
anthonywj 15e7286003 患者信息,处方信息下载 2 years ago
anthonywj 5085b66a7f 新增物价类别 2 years ago
anthonywj d7109caf5a 物资分类添加仓库与部门 2 years ago
anthonywj f23c0136dd 新增退货补单流程,诏安两个分库问题,单据明细打印问题 2 years ago
anthonywj 6d5e0228d9 单据复制校验库存,申购加到货仓库 2 years ago
anthonywj 30813b31bd 新增库存过滤方式,新增内网版本更新 2 years ago
anthonywj ed4dc216bb Merge remote-tracking branch 'origin/dev_price' into dev_price 2 years ago
anthonywj cd25fab565 UDI物资流向查询未查询到数据问题 2 years ago
wj b34ad7e181 调整 2 years ago
wj 41babe7e64 库存对比相关--未完结 2 years ago
anthonywj c20dcbd4a5 患者信息,患者处方等相关接口新增 2 years ago
anthonywj 4b0d54ba71 添加患者相关操作类,打印问题修改,项目、定数包相关修改 2 years ago
anthonywj 450dcbf2a2 申购修改 2 years ago
anthonywj 4f35b8365f 库存仓库领用等修改 2 years ago
anthonywj 974f1aca65 第三方服务修改 2 years ago
anthonywj 5da495fbaf 价格修改 2 years ago
anthonywj 2702e27fa0 价格问题 2 years ago
anthonywj 8f3f7abf94 平潭普耗相关修改,汇总统计修改 2 years ago
anthonywj fd31e5a224 平潭普耗相关修改,汇总统计修改 2 years ago
anthonywj 463ddaa3c3 Merge remote-tracking branch 'origin/dev_price' into dev_price 2 years ago
anthonywj e319a9888d 汇总统计 2 years ago
wj b65d72d1d5 调整/还原 2 years ago
anthonywj 4631e2dfcc PDA首页菜单问题 2 years ago
wj 9fd6e1a41b 调整 2 years ago
wj 006ada7ca6 调整 2 years ago
anthonywj b1a99cced7 盘点功能优化 2 years ago
anthonywj 0074c56c9d 盘点相关功能 2 years ago
anthonywj 474971fb2f 新增盘点功能代码 2 years ago
anthonywj 1b3c16482a 移除盘点相关功能 2 years ago
anthonywj 1b6eb549d8 设备管理相关代码整理 2 years ago
anthonywj 16e5b8de59 耗材字典多个DI问题 2 years ago
anthonywj 12f1851bba 业务单据打印等,出入库明细打印等 2 years ago
anthonywj 8677fb7fdc 业务单据打印相关 2 years ago
anthonywj ac4774981d 定量设置相关修改 2 years ago
anthonywj ea411c4102 价格单据审核相关修改 2 years ago
anthonywj c91f10609f 价格校验备份 2 years ago
anthonywj af02503996 定量设置相关调整 2 years ago
anthonywj 21a94967d8 业务单直接生成扫码单 2 years ago
anthonywj 1c202156b4 价格相关修改,新增库存定量设置 2 years ago
anthonywj d9d4ca1771 新增价格相关处理 2 years ago
anthonywj 5f3aca56b2 超时修改密码 2 years ago
anthonywj 1a30e1b923 手持终端下载供应商问题 2 years ago
anthonywj 5ab0fa6296 单据关联相关修改 2 years ago
anthonywj 44baefc855 系统升级相关修改 2 years ago
anthonywj 9c55e09932 添加校验库存日志 2 years ago
anthonywj b4fdb1a165 替换 BeanUtil.copyProperties 2 years ago
anthonywj 23bbe2166c pda单据复制问题 2 years ago
anthonywj c621ac9e0f 单据维护减一问题 2 years ago
anthonywj 84feefd4c8 手持终端提交单据校验库存/物资字典对照问题 2 years ago
anthonywj d160138cb7 切换分支备份 2 years ago
anthonywj 9320dfe462 pda待审核相关修改 2 years ago
anthonywj d8a88547fe pda带配/拣货单据修改 2 years ago
郑明梁 52e1ffd273 设备代码提交 2 years ago
郑明梁 06ebf55ed0 Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
郑明梁 af21cfdf13 设备代码提交 2 years ago
anthonywj 90f7f1f927 PDA手持终端相关接口 2 years ago
anthonywj 5b15f6ff45 诊断第三方产品信息定时选入时,自动添加到耗材字典 2 years ago
anthonywj c62383ff51 自定义头部参数代码备份 2 years ago
郑明梁 70483edee8 设备代码提交 2 years ago
anthonywj 4a8fb12b43 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
anthonywj dec79c047d 新增已执行次数字段;
自定义前端表头字段相关操作类
2 years ago
黄泽腾 3e43f5f1c4 设备管理-设备资质 2 years ago
黄泽腾 ceb2ac74a8 设备管理-设备资质 2 years ago
anthonywj a77d2ca199 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
anthonywj e16a34bc39 巡检计划定时任务补充(未完成) 2 years ago
郑明梁 48431be244 设备领用审核代码提交 2 years ago
anthonywj ba5731260b 设备管理设备位置字典表 2 years ago
anthonywj 795cd78540 生产企业字典相关代码 2 years ago
anthonywj 98951a39f0 设备使用记录相关操作类 2 years ago
anthonywj 024431999a Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
anthonywj d31eee08c3 设备相关人员操作类 2 years ago
郑明梁 8375447cc4 设备领用代码提交 2 years ago
郑明梁 671131105a 设备领用代码提交 2 years ago
anthonywj 14254daeb7 设备资质相关操作类 2 years ago
anthonywj 4d6f807791 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
anthonywj cdffd6e6f8 更换BeanUtils.copyProperties 2 years ago
黄泽腾 e91a030744 bug修复 2 years ago
郑明梁 5c5f667cf5 设备代码提交 2 years ago
anthonywj 319484c145 1:手持终端相关接口补充
2:待校验以校验结果提交,未生成单据详情问题
2 years ago
郑明梁 e5d967895b 设备bug修复 2 years ago
郑明梁 b853ee66a5 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
郑明梁 eec65dea6c 设备bug修复 2 years ago
anthonywj 113457a42a 设备任务相互同步 2 years ago
anthonywj c3a8c5da54 删除任务同步相关调整(后续还需调整) 2 years ago
anthonywj 1931ece8a3 修改设备任务ID为雪花ID(自增同步会有问题) 2 years ago
anthonywj d28b4f1699 同步任务备份 2 years ago
郑明梁 a7725c066c Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
郑明梁 1b271cab9d Merge remote-tracking branch 'origin/dev' into dev2.0 2 years ago
anthonywj 2ac43431a4 第三方业务单据下载重复问题 2 years ago
wangwei b400a08d83 同步删除基础数据 2 years ago
anthonywj 8cb095693c 第三方单据下载异常回滚问题 2 years ago
anthonywj df219f13c4 切换分支代码备份 2 years ago
郑明梁 a88db37eb6 Merge remote-tracking branch 'origin/dev' into dev2.0 2 years ago
郑明梁 0990597b59 设备bug修改提交 2 years ago
郑明梁 e3dae86c72 Merge remote-tracking branch 'origin/dev' into dev2.0 2 years ago
郑明梁 a268df2cdb 设备bug修改提交 2 years ago
anthonywj 249edf57b8 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
anthonywj 422f9e788c 新增单据核对接口 2 years ago
黄泽腾 0d85313688 Merge branch 'dev' into dev2.0 2 years ago
郑明梁 4ffe2f71c8 库存代码提交 2 years ago
郑明梁 1514065484 库存代码提交 2 years ago
anthonywj 40f8701bc2 新增同步操作日志相关方法 2 years ago
anthonywj cc2cd0b511 新增同步操作日志相关方法 2 years ago
anthonywj 79033ac6b1 切换分支备份 2 years ago
薛宇 5367acb349 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 13ada50cc3 Merge branch 'dev' into ywj_dev
# Conflicts:
#	src/main/resources/application-dev.yml
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
anthonywj c0a9d39535 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
anthonywj 8cf48f17d2 新增控制是否只校验批次号 2 years ago
郑明梁 a8ad971567 设备报修代码提交 2 years ago
薛宇 48904a0239 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 e5d28786dd 设备报修代码提交 2 years ago
wangwei cffb595319 报修详情接口 2 years ago
wangwei 21294acab7 详情接口 2 years ago
wangwei 6d8e7bdf87 报修详情接口 2 years ago
anthonywj f7cbc4f69d socket链接问题 2 years ago
郑明梁 f6f9b599a5 设备保修详情代码提交 2 years ago
郑明梁 32c2798027 设备巡检任务代码提交 2 years ago
郑明梁 c67e86556f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 d66303b2fb 设备巡检任务代码提交 2 years ago
anthonywj 5d8e8861b9 Merge branch 'dev' into ywj_dev
# Conflicts:
#	src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
#	src/main/resources/application-dev.yml
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
薛宇 5c788f950c Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj d086c63ab2 根据全局设置项,不校验生产日期和失效日期 2 years ago
anthonywj c57b6a645f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj cda668a04b 第三方单据下载问题 2 years ago
wangwei 1a87f29e4d 我的巡检任务 2 years ago
anthonywj 8e102c1659 第三方产品信息异常问题(回滚) 2 years ago
anthonywj ad2a95e94c 诊断单据产品下载问题 2 years ago
anthonywj 6d1f77967a 打包后消息同步问题 2 years ago
郑明梁 7588e50521 设备巡检计划代码提交 2 years ago
郑明梁 6c66ec37ca 设备代码提交 2 years ago
anthonywj 5a22d137d8 预验收选入时增加过滤条件 2 years ago
wangwei b27758f8db 报修单 维保设备清单 2 years ago
黄泽腾 f69b85697c 物资资质新增--新增配送产品资质信息 2 years ago
薛宇 f189d0b6a3 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 6a3d9113f6 新增发票确认实时同步 2 years ago
anthonywj 1476a0f894 新增websocket通信(中继服务同步相关) 2 years ago
郑明梁 eeb03f7226 单据上传状态 2 years ago
anthonywj 3da6898176 自助平台确认状态同步问题 2 years ago
wangwei 3585dde191 新增领用过滤零库存和负库存 保存时判断库存 2 years ago
anthonywj d9371c48f5 新增设备管理相关实体类与字段 2 years ago
anthonywj fdd3351a13 单据维护删除系统繁忙问题 2 years ago
郑明梁 8e269ac3b5 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 334523f8c9 单据查询问题修改 2 years ago
anthonywj 1846ce85dc 发票相关以orderresult表为准 2 years ago
anthonywj de7412b096 库存无批次号系统繁忙问题 2 years ago
薛宇 8303e81597 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 73c14e4e01 预验收库存不足问题修复 2 years ago
薛宇 c43873fafd Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 0b613af049 bug修改,物资字典boolean ->Boolean 2 years ago
薛宇 a1e607223a 养护记录提示 2 years ago
anthonywj c5f47f8139 bug修改,新增单据验收补单校验 2 years ago
wangwei d69f9449e7 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wangwei 18c83f4318 修改 产品di未绑定多个产品id 扫入条码弹指定产品的弹窗 问题 2 years ago
郑明梁 88552a28d9 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
2 years ago
郑明梁 3b0d22d0e0 单据bug修改 2 years ago
wangwei 7f6f78f776 修改 编辑出入库单据流转设置中 无法切换 审核状态问题 2 years ago
黄泽腾 6daef0a567 字段更正 2 years ago
郑明梁 ba0cfd96c9 维护出入库增加状态控制 2 years ago
wangwei 9bb86c7929 修改 核对送货单 撤回单据至带校验 再次以扫码结果提交 继续核对时核对页面 物资重复显示问题 2 years ago
anthonywj 4498670058 诊断第三方单据详情重复下载问题 2 years ago
anthonywj 721730166b 单据上传轮询遍历问题 2 years ago
anthonywj 4988e314fb 同步单据审核时间不一致问题 2 years ago
anthonywj 177c600112 代码备份 2 years ago
黄泽腾 a9f1ff3932 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 b2fafe27ef 内部码打印更新代码 2 years ago
wangwei acd37c413a 修改 维护出入库执行减一 扫码数量未变化问题 2 years ago
郑明梁 80c5d58787 单据上传(回传自助单据号) 2 years ago
郑明梁 cdce81ecb1 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 eda6292cf0 库存明细打印 2 years ago
薛宇 d95fa8811c Merge remote-tracking branch 'origin/dev' into dev 2 years ago
薛宇 1995a0c9ec 建议在“同步设置”页面,添加扫码单据类型功能模块:新增一个 搜索框功能 2 years ago
郑明梁 cece855d6b 三期出现重复序列号问题 2 years ago
wangwei f5bd541e24 修改 新增单据明细重复问题 2 years ago
wangwei 16a7a61a73 发票打印 2 years ago
anthonywj 447526f19c 误删登记状态 2 years ago
wangwei f98133e100 修改 用内部码进行调拨出库 提示库存不足问题 2 years ago
黄泽腾 4fd3c726f0 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 60952f6168 新增往来单位搜索备份 2 years ago
anthonywj a9d68d3048 单据自动提交至第三方系统问题修改 2 years ago
黄泽腾 0dec5c2ed0 生成不了多级的内部码,会自动变成一级的内部码(片仔癀诊断和管理系统都有这个问题) 2 years ago
anthonywj ce5ff68e76 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 4f25b9ee57 新增备注字段查询时查备注或病人信息 2 years ago
薛宇 e7392620b6 单据类型未启用,仍然可以做单(片仔癀诊断和管理系统都有这个问题) 2 years ago
anthonywj d53c9e87ab 新增第三方单据自动下载与配置,日志生成等 2 years ago
anthonywj 660d748cfa Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 5810d14716 修改诊断现存量查询,库存实时查询 2 years ago
郑明梁 35594d91a2 单据查询问题修复(带校验) 2 years ago
郑明梁 50edb4e747 单据查询问题修复(带校验) 2 years ago
anthonywj 30dcdfd553 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 40fe92d304 发票代码提交 2 years ago
anthonywj 89732532fa Merge branch 'dev_ywj' into dev 2 years ago
郑明梁 e01ec88f65 内部码打印问题修复 2 years ago
1178634255 de6f13ec27 修改密码代码备份 2 years ago
anthonywj 1beea3a254 合并dev修改 2 years ago
anthonywj 8d377e8839 Merge branch 'dev' into dev_ywj
# Conflicts:
#	src/main/java/com/glxp/api/constant/Constant.java
#	src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
#	src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
#	src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java
#	src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java
#	src/main/java/com/glxp/api/service/sync/HeartService.java
#	src/main/java/com/glxp/api/task/SyncHeartTask.java
#	src/main/java/com/glxp/api/task/SyncThirdSysTask.java
#	src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java
#	src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
2 years ago
郑明梁 883084f4c5 定数包代码提交 2 years ago
anthonywj bec91b93ca 新增协调平台追溯查询 2 years ago
anthonywj 1946e4dfef Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 375ff7aa5d 新增第三方单据上传过滤 2 years ago
郑明梁 de55970ff8 定数包加工代码初始化 2 years ago
郑明梁 70c4f26511 定数包设置代码提交 2 years ago
郑明梁 3445442cbb Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 dad49893d3 定数包设置代码提交 2 years ago
anthonywj 0acfe9785f 单据上传至第三方相关调整,bug修改调整 2 years ago
anthonywj dae7656fff 单据上传至第三方相关调整,bug修改调整 2 years ago
anthonywj b3b935c0fe 根据单据类型查询问题 2 years ago
anthonywj 6ce3adb1f4 待配货,待校验提交修改 2 years ago
anthonywj 3e28f48933 待校验,等相关修改, 2 years ago
anthonywj ce801cd27c 单据带校验比对逻辑修改 2 years ago
anthonywj 2faa905bfb 第三方单据上传bug,发票重复bug 2 years ago
anthonywj ae4ff7d291 单据校验备份 2 years ago
郑明梁 e3bb14f114 定数包实体初始化 2 years ago
anthonywj 6c2e5b7f14 备份 2 years ago
郑明梁 9eb3dfa675 单据上传功能代码提交 2 years ago
anthonywj 562cbd5ac2 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj f66705d82b 采购计划,采购订单等相关修改 2 years ago
郑明梁 134762db9e 单据上传功能代码提交 2 years ago
anthonywj 950301315d 更新审核人,核对人,供应商编辑信息bug 2 years ago
anthonywj 86f084836e 选入第三方业务单据修改 2 years ago
郑明梁 dcb4cad964 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 4730d6fe78 单据上传功能代码提交 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
郑明梁 2576df6d2b Merge remote-tracking branch 'origin/zmlDev' into zmlDev 2 years ago
郑明梁 31d1c52a30 单据上传功能代码提交 2 years ago
wangwei 607414c4a1 物资类别bug修改 2 years ago
郑明梁 c5b7ba7db5 客户管理功能代码提交 2 years ago
anthonywj a09eb7c2da 多级产品出库问题,申购新增备注字段搜索 2 years ago
wangwei 5e3901e040 物资类别功能 2 years ago
anthonywj 53aa0b11a8 界面标题等logo修改 2 years ago
郑明梁 2127c2f170 物资类别功能代码初始化 2 years ago
郑明梁 a7982e80dd 汇总修改汇总日期 2 years ago
郑明梁 11be2ef830 修改货位上架按当前仓库筛选,和汇总导出加上仓库字段 2 years ago
anthonywj 0149230284 预验收,寄售有序列号库存不足问题 2 years ago
郑明梁 ce2aa13b5f 修改单据bug 2 years ago
郑明梁 22b3ee6974 汇总统计bug修复 2 years ago
anthonywj dd1f68f103 发票相关问题修改 2 years ago
anthonywj 84b7aae6dc 发票修改同步 2 years ago
郑明梁 02a17df71a 多次出库bug修改 2 years ago
wangwei 7893940cc6 修改第三方数据 单据类型新增 编辑问题 2 years ago
wangwei 68fd6641ba 同步代码 发票优化 2 years ago
anthonywj 374f8261f8 相关bug修改 2 years ago
wangwei 320b8f0487 单据排序 2 years ago
郑明梁 bfbb85eb57 统计汇总代码提交 2 years ago
anthonywj ea3c82f475 出入库扫码相关bug修改 2 years ago
wangwei 690d415779 新增申购 调整产品录入多选 2 years ago
郑明梁 e38a4dad81 产品名称转拼音首字母 2 years ago
郑明梁 d1eb441bca Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 90f1b6c334 产品名称转拼音首字母 2 years ago
anthonywj 1a015238d6 采购计划提交系统繁忙问题,物资字典选入系统繁忙,生产企业查询系统繁忙 2 years ago