Commit Graph

129 Commits (54c7b550a2a4d6461e009288c63f8ed55f9389ea)

Author SHA1 Message Date
anthonywj 44baefc855 系统升级相关修改 2 years ago
anthonywj b7ac44591c 切换分支备份 2 years ago
anthonywj 4aa038d37d 手持终端预验收单据关键字查询 2 years ago
anthonywj d160138cb7 切换分支备份 2 years ago
郑明梁 60f9a148de 领用代码提交 2 years ago
黄泽腾 0d85313688 Merge branch 'dev' into dev2.0 2 years ago
黄泽腾 8af8962464 发票DI编码展示 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 5a22d137d8 预验收选入时增加过滤条件 2 years ago
薛宇 f189d0b6a3 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 1846ce85dc 发票相关以orderresult表为准 2 years ago
薛宇 c43873fafd Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 0b613af049 bug修改,物资字典boolean ->Boolean 2 years ago
郑明梁 72b367af15 发票bug修复 2 years ago
薛宇 a14a6140bf 库存查询的注册/备案号显示多个 2 years ago
郑明梁 3b0d22d0e0 单据bug修改 2 years ago
郑明梁 ba0cfd96c9 维护出入库增加状态控制 2 years ago
anthonywj 46f3da4e6e 单据备注问题 2 years ago
黄泽腾 1516a5104f 往来单位查询 2 years ago
黄泽腾 6b6280852f 往来单位查询 2 years ago
黄泽腾 5c451346ea 供应商发票页面优化问题 2 years ago
wangwei f5bd541e24 修改 新增单据明细重复问题 2 years ago
wangwei 16a7a61a73 发票打印 2 years ago
郑明梁 010bcc3b2e 预验收单据新增备注查询 2 years ago
anthonywj 4f25b9ee57 新增备注字段查询时查备注或病人信息 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
郑明梁 dbbf5a8811 定数包去掉无用代码 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
郑明梁 b1fc3a50ef 修改bug 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 3e28f48933 待校验,等相关修改, 2 years ago
郑明梁 5513726e0b 单据上传功能 2 years ago
郑明梁 5a377fe206 客户管理bug修复 2 years ago
郑明梁 4730d6fe78 单据上传功能代码提交 2 years ago
郑明梁 17a0e0b99c Merge branch 'zmlDev' into dev 2 years ago
郑明梁 31d1c52a30 单据上传功能代码提交 2 years ago
郑明梁 c5b7ba7db5 客户管理功能代码提交 2 years ago
anthonywj a09eb7c2da 多级产品出库问题,申购新增备注字段搜索 2 years ago
wangwei 60b96aaec6 带票出入库明细 增加查询条件等 2 years ago
郑明梁 11be2ef830 修改货位上架按当前仓库筛选,和汇总导出加上仓库字段 2 years ago
郑明梁 ce2aa13b5f 修改单据bug 2 years ago
anthonywj 84b7aae6dc 发票修改同步 2 years ago