Commit Graph

598 Commits (474971fb2fda99cb5187bf41d0adbd8b3ad74af5)

Author SHA1 Message Date
anthonywj 40f8701bc2 新增同步操作日志相关方法 2 years ago
anthonywj cc2cd0b511 新增同步操作日志相关方法 2 years ago
anthonywj 161e457797 Merge branch 'dev' into dev2.0 2 years ago
薛宇 5367acb349 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 6cac80437b 明细列表中的‘DI/物资编码’字段显示有误 2 years ago
wangwei b5c1f907eb 巡检 添加查询字段 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
郑明梁 a8ad971567 设备报修代码提交 2 years ago
薛宇 48904a0239 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wangwei 6d8e7bdf87 报修详情接口 2 years ago
郑明梁 f6f9b599a5 设备保修详情代码提交 2 years ago
郑明梁 32c2798027 设备巡检任务代码提交 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
wangwei 1a87f29e4d 我的巡检任务 2 years ago
anthonywj ad2a95e94c 诊断单据产品下载问题 2 years ago
郑明梁 6c66ec37ca 设备代码提交 2 years ago
wangwei 76e3df3611 报修查询接口优化 2 years ago
anthonywj 5a22d137d8 预验收选入时增加过滤条件 2 years ago
wangwei b27758f8db 报修单 维保设备清单 2 years ago
黄泽腾 f69b85697c 物资资质新增--新增配送产品资质信息 2 years ago
薛宇 f189d0b6a3 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wangwei 3585dde191 新增领用过滤零库存和负库存 保存时判断库存 2 years ago
anthonywj d9371c48f5 新增设备管理相关实体类与字段 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
黄泽腾 5c0818cabc 内部码打印,选入单据后,点击 打印--生成内部码 时 报系统繁忙 2 years ago
薛宇 7f3d03587f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 cf543f8228 新增盘点单-录入产品:结余数量错误 2 years ago
薛宇 a14a6140bf 库存查询的注册/备案号显示多个 2 years ago
郑明梁 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
郑明梁 de55970ff8 定数包加工代码初始化 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 3e28f48933 待校验,等相关修改, 2 years ago
郑明梁 29df3286de 申购单流转价格问题修复 2 years ago
anthonywj 2faa905bfb 第三方单据上传bug,发票重复bug 2 years ago
anthonywj ae4ff7d291 单据校验备份 2 years ago
郑明梁 c50bd49100 多次出库bug修复 2 years ago
郑明梁 e3bb14f114 定数包实体初始化 2 years ago
anthonywj c1d4d1b1df 分类第三方产品信息问题 2 years ago
郑明梁 32be3ec3e8 新增申购单选入申购新增物资类别搜索 2 years ago
郑明梁 5513726e0b 单据上传功能 2 years ago
anthonywj 069069e32b bug修改 2 years ago
anthonywj aa17be0b83 bug修改 2 years ago
郑明梁 5a377fe206 客户管理bug修复 2 years ago