Commit Graph

1103 Commits (e187c81b04a261eec25c1a15b9e7e783357fb333)

Author SHA1 Message Date
郑明梁 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
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
郑明梁 b1fc3a50ef 修改bug 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
郑明梁 db6cfc0476 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 86bd9ebc9c 往来单位是客户的客户类型为患者 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 6e38f6e9a3 备份 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
anthonywj 6c2e5b7f14 备份 2 years ago
郑明梁 7af361a932 单据上传修改 2 years ago
郑明梁 32be3ec3e8 新增申购单选入申购新增物资类别搜索 2 years ago
anthonywj 91ff79f125 第三方产品信息编辑bug 2 years ago
郑明梁 b77f1e215e 第三方单据bug修复 2 years ago
郑明梁 3a923c18d8 第三方单据bug修复 2 years ago
郑明梁 e2720aff8a 第三方单据新增字段 2 years ago
郑明梁 5513726e0b 单据上传功能 2 years ago
anthonywj 0e6b0be87d 第三方产品信息编辑bug 2 years ago
anthonywj ab66664e2f bug修改 2 years ago
anthonywj 069069e32b bug修改 2 years ago
郑明梁 d79a83de2d bug修复 2 years ago
anthonywj aa17be0b83 bug修改 2 years ago
anthonywj 428ed71f4e 申购单据,采购订单等相关修改 2 years ago
郑明梁 5a377fe206 客户管理bug修复 2 years ago
郑明梁 9eb3dfa675 单据上传功能代码提交 2 years ago
anthonywj fce5d7b7c6 申购单据,采购订单等相关修改 2 years ago
anthonywj 562cbd5ac2 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj f66705d82b 采购计划,采购订单等相关修改 2 years ago
郑明梁 134762db9e 单据上传功能代码提交 2 years ago
anthonywj 950301315d 更新审核人,核对人,供应商编辑信息bug 2 years ago
anthonywj 86f084836e 选入第三方业务单据修改 2 years ago
wangwei 77256a1516 bug修改 2 years ago
郑明梁 47b1bd2cd4 单据上传功能代码提交 2 years ago
郑明梁 dcb4cad964 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 4730d6fe78 单据上传功能代码提交 2 years ago
wangwei b7ecf98f9e Merge remote-tracking branch 'origin/zmlDev' into dev 2 years ago
wangwei 73057d3570 物资类别bug修改 2 years ago
anthonywj 5c0a78e70c 基础信息相关修改 2 years ago
郑明梁 17a0e0b99c Merge branch 'zmlDev' into dev 2 years ago
郑明梁 4a45824b8a 单据明细打印修改格式 2 years ago
郑明梁 2576df6d2b Merge remote-tracking branch 'origin/zmlDev' into zmlDev 2 years ago
郑明梁 31d1c52a30 单据上传功能代码提交 2 years ago
wangwei 19884e3aa3 修改bug 2 years ago
wangwei 607414c4a1 物资类别bug修改 2 years ago
郑明梁 c5b7ba7db5 客户管理功能代码提交 2 years ago
anthonywj a09eb7c2da 多级产品出库问题,申购新增备注字段搜索 2 years ago
wangwei 5e3901e040 物资类别功能 2 years ago
anthonywj 53aa0b11a8 界面标题等logo修改 2 years ago
郑明梁 07b6009203 物资类别功能代码初始化 2 years ago
wangwei 60b96aaec6 带票出入库明细 增加查询条件等 2 years ago
郑明梁 2127c2f170 物资类别功能代码初始化 2 years ago
anthonywj 461dedf088 第三方单据上传相关bug修改 2 years ago
郑明梁 a7982e80dd 汇总修改汇总日期 2 years ago
郑明梁 11be2ef830 修改货位上架按当前仓库筛选,和汇总导出加上仓库字段 2 years ago
anthonywj 0149230284 预验收,寄售有序列号库存不足问题 2 years ago
anthonywj 415b931c06 库存不足问题,单据验收问题 2 years ago