Commit Graph

1281 Commits (d95fa8811c97d10f116aae6681ec8ca83b584b73)
 

Author SHA1 Message Date
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
郑明梁 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
郑明梁 29df3286de 申购单流转价格问题修复 2 years ago
anthonywj c42c90cddc Merge branch 'dev' into test 2 years ago
anthonywj 6e38f6e9a3 备份 2 years ago
anthonywj 2faa905bfb 第三方单据上传bug,发票重复bug 2 years ago
anthonywj ae4ff7d291 单据校验备份 2 years ago
郑明梁 cda3602f74 Merge branch 'dev' into test 2 years ago
郑明梁 c50bd49100 多次出库bug修复 2 years ago
郑明梁 e3bb14f114 定数包实体初始化 2 years ago
anthonywj c1d4d1b1df 分类第三方产品信息问题 2 years ago
anthonywj 6c2e5b7f14 备份 2 years ago
郑明梁 7af361a932 单据上传修改 2 years ago
郑明梁 32be3ec3e8 新增申购单选入申购新增物资类别搜索 2 years ago
anthonywj 91ff79f125 第三方产品信息编辑bug 2 years ago