Commit Graph

515 Commits (88552a28d9e23bb582446ff0823bb65d1f89ad15)

Author SHA1 Message Date
郑明梁 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
黄泽腾 6daef0a567 字段更正 2 years ago
郑明梁 ba0cfd96c9 维护出入库增加状态控制 2 years ago
anthonywj 46f3da4e6e 单据备注问题 2 years ago
郑明梁 c386367832 bug修复 2 years ago
黄泽腾 26f5caeded 代码备份 2 years ago
黄泽腾 1516a5104f 往来单位查询 2 years ago
黄泽腾 45335cd21f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 6b6280852f 往来单位查询 2 years ago
郑明梁 6473840e17 申购单查询状态判断 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
黄泽腾 5c451346ea 供应商发票页面优化问题 2 years ago
wangwei f5bd541e24 修改 新增单据明细重复问题 2 years ago
wangwei 16a7a61a73 发票打印 2 years ago
wangwei f98133e100 修改 用内部码进行调拨出库 提示库存不足问题 2 years ago
黄泽腾 60952f6168 新增往来单位搜索备份 2 years ago
黄泽腾 0dec5c2ed0 生成不了多级的内部码,会自动变成一级的内部码(片仔癀诊断和管理系统都有这个问题) 2 years ago
郑明梁 010bcc3b2e 预验收单据新增备注查询 2 years ago
wangwei 596a46130e 去除废弃字段 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
1178634255 c95b52a538 新增采购订单-产品录入:生产企业、注册/备案证号搜索框无法查询 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
郑明梁 ec39ea48d1 修改往来单位查询问题 2 years ago
schry 1abae0b4db 物资资质审核拒绝完,资质证书变成暂无数据 2 years ago
郑明梁 0617359bca 内部码打印bug修复 2 years ago
郑明梁 dbbf5a8811 定数包去掉无用代码 2 years ago
郑明梁 e01ec88f65 内部码打印问题修复 2 years ago
wangwei b86501eb88 新增出入库单 di绑定多个产品 产品重复问题 2 years ago
1178634255 c241831d6d 代码更新 2 years ago
1178634255 de6f13ec27 修改密码代码备份 2 years ago
schry 5fe7fb4067 页面优化 2 years ago
1178634255 e20a65a00c 新增扫码单模块到待校验单据模块,备注会消失 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
郑明梁 3081327066 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 b1fc3a50ef 修改bug 2 years ago
anthonywj 1e29c762ce 第三方产品信息更新问题 2 years ago
郑明梁 1f260cb9de 单据上传拉取客户修改outType类型 2 years ago
郑明梁 883084f4c5 定数包代码提交 2 years ago
anthonywj 2e7d4c0999 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/resources/application-dev.yml
2 years ago
anthonywj bec91b93ca 新增协调平台追溯查询 2 years ago
郑明梁 86bd9ebc9c 往来单位是客户的客户类型为患者 2 years ago