Commit Graph

1353 Commits (7588e50521ef2ec0d2df9c940a8082e915e35a6f)
 

Author SHA1 Message Date
郑明梁 14c5e9a65c 选入di国家库查询 2 years ago
郑明梁 4aaad76fe9 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 edb42ada3d 修改自助单据审核问题 2 years ago
wangwei 2738e58cbb 出入库补单 出入库单与目标出入库单相同给出提示 2 years ago
wangwei b86501eb88 新增出入库单 di绑定多个产品 产品重复问题 2 years ago
郑明梁 fad888eeac Merge branch 'dev' into test 2 years ago
郑明梁 6b05a72d5b yml 2 years ago
1178634255 9b518e90a2 代码更新 2 years ago
1178634255 165b81a0b2 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
1178634255 c241831d6d 代码更新 2 years ago
anthonywj 3438e4e2fb bug修改 2 years ago
anthonywj 9658dcd316 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
1178634255 91cf593506 修改密码代码备份 2 years ago
1178634255 de6f13ec27 修改密码代码备份 2 years ago
1178634255 42401e34ab Merge remote-tracking branch 'origin/dev' into dev 2 years ago
1178634255 420dea5428 代码备份 2 years ago
schry 5fe7fb4067 页面优化 2 years ago
schry f89247401a 导出产品信息窗口执行‘结果全部导出’操作,导出的文件数据为空 2 years ago
anthonywj 8e95a8e779 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj d2a56b42a1 默认允许无批次号 2 years ago
anthonywj 7c15d5ba3d 默认允许无批次号 2 years ago
1178634255 e20a65a00c 新增扫码单模块到待校验单据模块,备注会消失 2 years ago
wangwei 133f841b7c UdiRelevanceResponse实体类count修改类型 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
anthonywj 485d563f47 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj f1245c8fc9 切换分支备份 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
郑明梁 23d7d1623f 定数包sql提交 2 years ago
郑明梁 883084f4c5 定数包代码提交 2 years ago
anthonywj 7480c8edbe 关联DI必填字段不被覆盖 2 years ago
郑明梁 95e7c673c9 单据扫码序列号为空问题修复 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
wangwei b53b9a921f Merge remote-tracking branch 'origin/dev' into test 2 years ago
wangwei ecf449e079 yml提交 2 years ago
郑明梁 db6cfc0476 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 86bd9ebc9c 往来单位是客户的客户类型为患者 2 years ago
wj b94747dc7f 环境调整 2 years ago
wj 59fc149cc6 Merge branch 'dev' into test 2 years ago
wj 4da2b87169 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj 87ee0073c1 ReplaceBatch.java调整 2 years ago
郑明梁 0618f9b317 内部码扫码bug修复 2 years ago
anthonywj 768bb39532 是否包含序列号 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