Commit Graph

224 Commits (d8a88547fef620b25a54b9902be618fa5421af77)

Author SHA1 Message Date
anthonywj d8a88547fe pda带配/拣货单据修改 2 years ago
anthonywj 90f7f1f927 PDA手持终端相关接口 2 years ago
anthonywj cdffd6e6f8 更换BeanUtils.copyProperties 2 years ago
anthonywj 319484c145 1:手持终端相关接口补充
2:待校验以校验结果提交,未生成单据详情问题
2 years ago
郑明梁 4ffe2f71c8 库存代码提交 2 years ago
郑明梁 1514065484 库存代码提交 2 years ago
anthonywj 79033ac6b1 切换分支备份 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 8cf48f17d2 新增控制是否只校验批次号 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
anthonywj d086c63ab2 根据全局设置项,不校验生产日期和失效日期 2 years ago
anthonywj cda668a04b 第三方单据下载问题 2 years ago
anthonywj 5a22d137d8 预验收选入时增加过滤条件 2 years ago
郑明梁 eeb03f7226 单据上传状态 2 years ago
anthonywj fdd3351a13 单据维护删除系统繁忙问题 2 years ago
anthonywj 1846ce85dc 发票相关以orderresult表为准 2 years ago
anthonywj 0b613af049 bug修改,物资字典boolean ->Boolean 2 years ago
anthonywj c5f47f8139 bug修改,新增单据验收补单校验 2 years ago
郑明梁 3b0d22d0e0 单据bug修改 2 years ago
郑明梁 ba0cfd96c9 维护出入库增加状态控制 2 years ago
wangwei 9bb86c7929 修改 核对送货单 撤回单据至带校验 再次以扫码结果提交 继续核对时核对页面 物资重复显示问题 2 years ago
anthonywj 721730166b 单据上传轮询遍历问题 2 years ago
anthonywj 4988e314fb 同步单据审核时间不一致问题 2 years ago
anthonywj 177c600112 代码备份 2 years ago
wangwei acd37c413a 修改 维护出入库执行减一 扫码数量未变化问题 2 years ago
郑明梁 80c5d58787 单据上传(回传自助单据号) 2 years ago
郑明梁 cece855d6b 三期出现重复序列号问题 2 years ago
wangwei 16a7a61a73 发票打印 2 years ago
anthonywj a9d68d3048 单据自动提交至第三方系统问题修改 2 years ago
anthonywj 4f25b9ee57 新增备注字段查询时查备注或病人信息 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
郑明梁 50edb4e747 单据查询问题修复(带校验) 2 years ago
anthonywj 30dcdfd553 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 40fe92d304 发票代码提交 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
郑明梁 de55970ff8 定数包加工代码初始化 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 ae4ff7d291 单据校验备份 2 years ago
郑明梁 9eb3dfa675 单据上传功能代码提交 2 years ago
郑明梁 134762db9e 单据上传功能代码提交 2 years ago