Commit Graph

1043 Commits (2e2ac0116e3529535a2c80813f6827f78c42e1d7)

Author SHA1 Message Date
anthonywj c5f47f8139 bug修改,新增单据验收补单校验 2 years ago
wangwei d69f9449e7 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wangwei 18c83f4318 修改 产品di未绑定多个产品id 扫入条码弹指定产品的弹窗 问题 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
wangwei 7f6f78f776 修改 编辑出入库单据流转设置中 无法切换 审核状态问题 2 years ago
黄泽腾 6daef0a567 字段更正 2 years ago
郑明梁 ba0cfd96c9 维护出入库增加状态控制 2 years ago
wangwei 9bb86c7929 修改 核对送货单 撤回单据至带校验 再次以扫码结果提交 继续核对时核对页面 物资重复显示问题 2 years ago
anthonywj 4498670058 诊断第三方单据详情重复下载问题 2 years ago
anthonywj 721730166b 单据上传轮询遍历问题 2 years ago
anthonywj 4988e314fb 同步单据审核时间不一致问题 2 years ago
anthonywj 177c600112 代码备份 2 years ago
黄泽腾 a9f1ff3932 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 b2fafe27ef 内部码打印更新代码 2 years ago
wangwei acd37c413a 修改 维护出入库执行减一 扫码数量未变化问题 2 years ago
郑明梁 80c5d58787 单据上传(回传自助单据号) 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
郑明梁 cece855d6b 三期出现重复序列号问题 2 years ago
wangwei f5bd541e24 修改 新增单据明细重复问题 2 years ago
wangwei 16a7a61a73 发票打印 2 years ago
anthonywj 447526f19c 误删登记状态 2 years ago
wangwei f98133e100 修改 用内部码进行调拨出库 提示库存不足问题 2 years ago
黄泽腾 4fd3c726f0 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 60952f6168 新增往来单位搜索备份 2 years ago
anthonywj a9d68d3048 单据自动提交至第三方系统问题修改 2 years ago
黄泽腾 0dec5c2ed0 生成不了多级的内部码,会自动变成一级的内部码(片仔癀诊断和管理系统都有这个问题) 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
anthonywj 660d748cfa Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 5810d14716 修改诊断现存量查询,库存实时查询 2 years ago
郑明梁 35594d91a2 单据查询问题修复(带校验) 2 years ago
郑明梁 50edb4e747 单据查询问题修复(带校验) 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
郑明梁 e01ec88f65 内部码打印问题修复 2 years ago
1178634255 de6f13ec27 修改密码代码备份 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
郑明梁 883084f4c5 定数包代码提交 2 years ago
anthonywj bec91b93ca 新增协调平台追溯查询 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
anthonywj 2faa905bfb 第三方单据上传bug,发票重复bug 2 years ago
anthonywj ae4ff7d291 单据校验备份 2 years ago
郑明梁 e3bb14f114 定数包实体初始化 2 years ago
anthonywj 6c2e5b7f14 备份 2 years ago
郑明梁 9eb3dfa675 单据上传功能代码提交 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
郑明梁 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
郑明梁 2576df6d2b Merge remote-tracking branch 'origin/zmlDev' into zmlDev 2 years ago
郑明梁 31d1c52a30 单据上传功能代码提交 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
郑明梁 2127c2f170 物资类别功能代码初始化 2 years ago
郑明梁 a7982e80dd 汇总修改汇总日期 2 years ago
郑明梁 11be2ef830 修改货位上架按当前仓库筛选,和汇总导出加上仓库字段 2 years ago
anthonywj 0149230284 预验收,寄售有序列号库存不足问题 2 years ago
郑明梁 ce2aa13b5f 修改单据bug 2 years ago
郑明梁 22b3ee6974 汇总统计bug修复 2 years ago
anthonywj dd1f68f103 发票相关问题修改 2 years ago
anthonywj 84b7aae6dc 发票修改同步 2 years ago
郑明梁 02a17df71a 多次出库bug修改 2 years ago
wangwei 7893940cc6 修改第三方数据 单据类型新增 编辑问题 2 years ago
wangwei 68fd6641ba 同步代码 发票优化 2 years ago
anthonywj 374f8261f8 相关bug修改 2 years ago
wangwei 320b8f0487 单据排序 2 years ago
郑明梁 bfbb85eb57 统计汇总代码提交 2 years ago
anthonywj ea3c82f475 出入库扫码相关bug修改 2 years ago
wangwei 690d415779 新增申购 调整产品录入多选 2 years ago
郑明梁 e38a4dad81 产品名称转拼音首字母 2 years ago
郑明梁 d1eb441bca Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 90f1b6c334 产品名称转拼音首字母 2 years ago
anthonywj 1a015238d6 采购计划提交系统繁忙问题,物资字典选入系统繁忙,生产企业查询系统繁忙 2 years ago
anthonywj bb43c32a1e Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj d3697401a2 单据上传重盖 2 years ago
郑明梁 d4119a70a8 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 66d890ab18 业务单据功能修改 2 years ago
anthonywj eb3f48ce04 代码合并 2 years ago
1178634255 68586c23cb 上传设置备份 2 years ago
anthonywj 70c0784584 申购,相关查询修改 2 years ago
郑明梁 c3e32fd7ad Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 1b0c8638b9 修改统计汇总代码 2 years ago
anthonywj f51054ea40 第三方单据上传类型修改 2 years ago
郑明梁 47fabd4fca bug修复 2 years ago
郑明梁 ff449d6371 预警设置bug修复 2 years ago
郑明梁 a6f82a7812 预警设置bug修复 2 years ago
anthonywj 651a0ef658 内部码打印问题,启用使用单元数量问题,申购系统繁忙问题 2 years ago
郑明梁 ba9711c467 库存预警bug修复 2 years ago
郑明梁 17a7d9859f 物资拜放bug修复 2 years ago
wangwei 9974b9ec89 修改 新增出入库自动补单bug 2 years ago
郑明梁 f81471d4e6 新增扫码单据排序 2 years ago
郑明梁 adb9428e36 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 847de9c01b 汇总代码提交 2 years ago
anthonywj 4cd4d9b44c 单据重复提交问题 2 years ago
anthonywj 5365852e1e 获取第三方产品规格型号问题 2 years ago
anthonywj d23ffecf3b 获取第三方产品规格型号问题 2 years ago
anthonywj e954b9b4c2 异常单据显示问题 2 years ago
anthonywj 111f196415 规格型号显示问题 2 years ago
anthonywj 723c863bb2 定时下载任务重复下载问题 2 years ago
anthonywj 3c98777e20 第三方接口调试 2 years ago
anthonywj 0f93175ce0 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 17827ab959 第三方产品信息接口新增厂家编码,供应商编码 2 years ago
郑明梁 de32494a78 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 e713e03a31 日和月统计代码提交 2 years ago
anthonywj 3e53fea186 第三方接口下载bug修改 2 years ago
wj 7b3cf5a9d1 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj 6111d7c580 insertIgnoreBatch/replaceBatch改造 2 years ago
anthonywj f7d09c1ec4 第三方接口相关修改 2 years ago
郑明梁 7b2f82c151 耗材批量导入问题修复 2 years ago
wj 21b81c5e40 bug修复 2 years ago
wj 1496bb4bda bug修复--改方法名 2 years ago
wj 1f3ba38e22 bug修复 2 years ago
anthonywj e1bf9bad81 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java
2 years ago
anthonywj 6e6b56085c 代码备份 2 years ago
wj 64fcfe9c22 bug修复 2 years ago
wj ab780d007f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj dc0a842edf ThrSystemDetailEntity增加表名,ThrProductsEntity增加字段[生产厂家编码,配送企业编码] 2 years ago
anthonywj 5619aa362c 代码备份 2 years ago
郑明梁 d72625c5cd Merge remote-tracking branch 'origin/zmlDev' into dev 2 years ago
郑明梁 3a26eafb7d 多次使用出库新增功能代码提交 2 years ago
anthonywj ee89548201 排序相关修改 2 years ago
郑明梁 14c4bd0248 多次使用出库新增功能代码提交 2 years ago
anthonywj f2968bf275 单据复制,单据流转带业务单信息,采购订单新增价格 2 years ago
anthonywj be6abd2063 bug修改 2 years ago
郑明梁 32ff539034 多次使用出库设置功能代码提交 2 years ago
anthonywj 85d73a0ee4 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj c3d9c20bc6 新增多次使用出库功能 2 years ago
郑明梁 52393b786c 货位变更bug修改 2 years ago
anthonywj 385b9075ac bug修改 2 years ago
郑明梁 7b3f63f85d 用户库存代码提交 2 years ago
郑明梁 75f346c7a7 用户库存代码提交 2 years ago
郑明梁 cc736af286 inv_user_product,inv_user_product_detail表初始化代码提交 2 years ago
郑明梁 92e2a0fe89 inv_user_product,inv_user_product_detail表初始化代码提交 2 years ago
郑明梁 f22fc931f2 inv_user_product,inv_user_product_detail表初始化代码提交 2 years ago
郑明梁 7a19bbe32f 物资摆放下架bug修改 2 years ago
wangwei f9080d08b8 打印设置分页问题 2 years ago
anthonywj be5f16b38d 库存货位查询 2 years ago
郑明梁 f78f9d7e8b Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 790c0d09ba 物资摆放修改 2 years ago
anthonywj 59a0078a84 新增按货位出库功能 2 years ago
wj 58e035ad03 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj fa79cbf280 自定义Iservice和ServiceImpl 2 years ago
wangwei 10ecccc021 如果角色存在用户关联 就不能是禁用状态 2 years ago
wj 508caa86e0 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj eb470c4c55 优化 2 years ago
郑明梁 a198add3af Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 851232e270 库存查询新增货架查询 2 years ago
anthonywj 0d3c032660 库存查询修改,内网单据确认同步到外网 2 years ago
郑明梁 4ed43cda03 库存查询新增货架查询 2 years ago
郑明梁 2eccbe7c8a 物资摆放下架代码提交 2 years ago
郑明梁 3b29b7f804 物资摆放下架代码提交 2 years ago
wj 62367e9acf 同步文件调整 2 years ago
wj 9019c8b6cc 去除方法Resource注解 2 years ago
anthonywj 5f5b4d1bbe 单据流转后价格小数点问题 2 years ago
anthonywj 8a8965e1e7 新增单据详情,发票、确认状态,同步更新, 2 years ago
anthonywj 1003d2ec8f 业务单据详情改成雪花ID 2 years ago
wj 1ea8e7c2d4 文件下载调整 2 years ago
wj 0bc9b927ce bug修复 2 years ago
wj da57675d60 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj dded9d696b 时间判断调整 2 years ago
anthonywj 23dacbc0d7 bug修改 2 years ago
wangwei 972ed90e40 同步 优化发票代码 2 years ago
wj 0c348c43ac 判断调整 2 years ago
wj 4507e41043 判断调整 2 years ago
郑明梁 40c9648762 物质摆放变更功能代码提交 2 years ago
wj 4a35a538ae Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj 7a3e8b72cb 文件下载问题 2 years ago
wangwei f45d18ec7f 同步发票代码 2 years ago
郑明梁 f11e0fbb10 物质摆放变更功能代码提交 2 years ago
郑明梁 1071b496dd 物质摆放按单功能代码提交 2 years ago
wangwei 1bf136848f 同步发票代码 2 years ago
郑明梁 fa09ca7078 物质摆放功能代码提交
(cherry picked from commit e880330e7c)
2 years ago
wj 943cea1816 Merge branch 'master' into dev 2 years ago
郑明梁 9ac295028b 物质摆放功能代码提交 2 years ago
anthonywj 75077b05a4 同步相关问题修改。用户选入物资字典相关修改 2 years ago
wj 004dea3694 拉取数据增加特殊处理 2 years ago
wj 5208a1aea2 拉取数据增加特殊处理 2 years ago
wj 102cf093c2 增加replace,replaceBatch,insertIgnore,insertIgnoreBatch 2 years ago
anthonywj 1e77692313 发票ID改为long 2 years ago
wangwei 94118141b5 发票修改 2 years ago
anthonywj a7ef10a6d7 寄售出库问题,预验收入库问题,同步问题,领用单据问题 2 years ago
anthonywj cc248bab94 上线bug修改,同步修改,发票修改 2 years ago
wj e8cdafc14b 调整任务开始时间 2 years ago
wj 3143e58c0b 代码调整 2 years ago
wj 0214b2cf94 代码调整 2 years ago
wj 7d39656d92 Merge remote-tracking branch 'origin/master' 2 years ago
wj ef0c71b1e5 记录执行结果 2 years ago
anthonywj f658c2c4c9 bug修改,上架摆货修改 2 years ago
anthonywj 4b08aa2a4e bug修改,上架摆货修改 2 years ago
anthonywj 6322a3bd03 修改预验收,寄售其他仓库用户可查看,修复修改角色bug,修复按单摆货bug 2 years ago
anthonywj 3cae7526bc 摆货相关修改,添加货位查询,预验收,寄售等相关库存摆货 2 years ago
anthonywj a9fd3f2c2b 相关bug修改 2 years ago
anthonywj ba410331a5 同步功能修改 2 years ago
anthonywj 75d388e121 同步功能修改 2 years ago
郑明梁 0d878f1d64 修复id问题 2 years ago
wangwei dbaa3cf85e 修改 维护往来id问题 2 years ago
郑明梁 ac199432c9 物资添加id问题 2 years ago
anthonywj a4838a4459 解决选入用户,移除用户系统繁忙问题 2 years ago
anthonywj fec801b31e 预验收按货位退货 2 years ago
郑明梁 c573d485b6 修改测试 2 years ago
郑明梁 bd77dc9bb5 修改测试 2 years ago
anthonywj 14e43730de ID相关修改 2 years ago
anthonywj 3360b7e2bd bug修改代码备份 2 years ago
x_z 90340e2607 1.调整摆放功能代码,添加上架记录 2 years ago
wj c0aa3f4107 下载记录文件 2 years ago
anthonywj 37af4d2462 合并同步 分支 2 years ago
anthonywj e62c88dfbe 合并git 分支 2 years ago
wj 1c6ebe2899 调整 2 years ago
anthonywj 73d6187176 合并master分支 2 years ago
anthonywj aa9d903fd7 bug修改 2 years ago
anthonywj 164c76858c 文件上传修改,路径修改 2 years ago
wj c85d0f445d 上传及下载写入文件 2 years ago
anthonywj 655ecb508c bug修复 2 years ago
anthonywj 4318495bac 同步数据bug相关修复 2 years ago
wj 19d156e2c4 Merge remote-tracking branch 'origin/generId' into generId
# Conflicts:
#	src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java
#	src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java
#	src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml
2 years ago
wj 0499617822 系统设置同步 2 years ago
anthonywj 4ea1efaa92 同步数据bug相关修复 2 years ago
郑明梁 9f3bed8cf0 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 e12f19f502 往来单位编辑提示重复 2 years ago
anthonywj 6ba113593b 数据同步bug修改 2 years ago
wangwei db2b9bcafe 修复单据查询bug 2 years ago
wj 56fcc52b2b 修改下载记录状态
(cherry picked from commit 07b6f3e9b0)
2 years ago
wj 07b6f3e9b0 修改下载记录状态 2 years ago
anthonywj 54dc7cd0eb 同步数据修改为雪花ID 2 years ago
anthonywj 9e25fc5036 bug修改代码备份 2 years ago
x_z fc2ab43807 1.调整摆放功能代码 2 years ago
anthonywj 1f6a08e74c 新增三期拣货,无三期拣货,为配货等页面 2 years ago
x_z 18719072d6 1.调整盘点代码 2 years ago
wj 76630f303d idDatas赋值调整 2 years ago
郑明梁 b648cd1999 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 e0da5a4c12 院内分类代码提交(需同步) 2 years ago
anthonywj 32a30b5fec bug修改 2 years ago
x_z d0ce12b6d9 1.调整获取货位编码方法位置 2 years ago
x_z 0eb427119c 1.调整添加货位逻辑 2 years ago
anthonywj 5d1875ebb9 库存详情新增入库数量与出库数量,方便后续分组统计查询 2 years ago
anthonywj 4278cf047e bug修改 2 years ago
wj 3f4c4511d6 第三方数据同步 2 years ago
wj 943c02af52 Merge remote-tracking branch 'origin/master' 2 years ago
wj 1517d71b78 用户数据同步 2 years ago
anthonywj 9f65dda33c 物资分类带代码迁移 2 years ago
wangwei 4ca132aabe 同步 部门代码 2 years ago
x_z d86907486c 1.同步自助平台资质预警代码 2 years ago
wj a57b6a23a4 存储单据类型 2 years ago
wj d9026565f5 Merge remote-tracking branch 'origin/master' 2 years ago
wj 27e1d95b47 由内向外同步,文档增强 2 years ago
anthonywj 1e82f37f7f 物资字典参数设置,单据类型修改 2 years ago
anthonywj f3f717cf17 新增委托验收 2 years ago
wangwei a1a8172dd1 修改 内部码bug 2 years ago
wj 79f23bd511 由内向外同步 2 years ago
wj 729badbb04 由内向外同步 2 years ago
wj 2bfc6a0b75 Merge remote-tracking branch 'origin/master' 2 years ago
wj a2cdc0bbfe 解决循环问题 2 years ago
anthonywj 81cae64e57 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 2ca37b890a 预验收,寄售撤回bug 2 years ago
wj 6c13eb05d4 Merge remote-tracking branch 'origin/master' 2 years ago
wj cdfda6af2a 由内向外同步 2 years ago
wangwei 1524185bc6 同步 内部码 2 years ago
x_z bbb845f1bc Merge remote-tracking branch 'origin/master' 2 years ago
x_z 02f1ce16c6 1.提交代码 2 years ago
郑明梁 b0543b862a 资质代码同步 2 years ago
anthonywj bd7fd9691a 物资字典代码迁移,新增国家库同步到外网查询 2 years ago
x_z a0d6f3cc06 1.修复临时文件存储失败问题
2.修改下载第三方系统基础数据数据校验逻辑
2 years ago
anthonywj 5bc3ce3115 业务单选入第三方单据bug 2 years ago
anthonywj 8a9607f690 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj d730b5c084 数据同步修改 2 years ago
x_z 2d98bd3651 1.添加下载第三方单据类型逻辑 2 years ago
anthonywj ec9c295e03 单据库存相关代码迁移 2 years ago
x_z 9cc66f85da 1.添加第三方产品数据导入接口和逻辑
2.完善下载第三方系统数据逻辑
2 years ago
anthonywj ea93694923 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj a8504f276e 代码迁移备份,预验收退回修改 2 years ago
wj bc5891aa28 bug修复 2 years ago
wj 9fc23761ac 去除多余代码 2 years ago
wj a1088a5170 Merge remote-tracking branch 'origin/master' 2 years ago
wj e871f8a9a2 设置统一入口 2 years ago
x_z faf499a4c6 1.合并第三方接口请求 2 years ago
wj fc898119ed Merge remote-tracking branch 'origin/master' 2 years ago
wj 98730beeaf 增加返回状态码判断 2 years ago
wangwei 6ef9f8dc9c 同步 部门仓库代码 2 years ago
wj f544f22cc9 Merge remote-tracking branch 'origin/master' 2 years ago
wj dea175b4d7 下载同步数据--其他数据 2 years ago
wangwei c965db25d9 同步 部门信息 仓库信息 用户关系 角色管理 2 years ago
x_z e3c25b05b5 1.添加接口请求时间设置 2 years ago
anthonywj abe47786b5 领用单据审核bug修改,自动生成业务单,扫码单等修改迁移 2 years ago
anthonywj d395703a81 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java
2 years ago
anthonywj 76994ae9f5 领用单据审核bug修改,自动生成业务单,扫码单等修改迁移 2 years ago
wangwei d175bf1e66 恢复代码 2 years ago
anthonywj e3c6399aa5 单据流转相关修改 2 years ago
x_z 15848414a9 1.添加上传模板文件逻辑 2 years ago
x_z abbc13b2f5 1.合并自助平台库存预警设置的代码 2 years ago
wj d3e6df8623 bug修复 2 years ago
wj 4d26d59cd2 Merge remote-tracking branch 'origin/master' 2 years ago
wj 61bbeeda53 拉取基础数据 插入数据库 2 years ago
anthonywj 7b96cfab4e 1.单据类型修改,
2。预验收退回,
3.预验收库存
2 years ago
x_z 628d991efe 1.添加更新时间字段的更新逻辑 2 years ago
anthonywj 3a13555c5c by中继服务验收单据 2 years ago
anthonywj 2bd885c398 同步国家库数据 2 years ago
wangwei 1e57b7ca4f 汇总记录,导出excel 2 years ago
x_z c68cb845a0 1.添加第三方基础数据同步和系统设置同步代码 2 years ago
wangwei 7d6341a9c2 导出excel 2 years ago
郑明梁 303e1e7217 模板打印代码提交 2 years ago
anthonywj 497764e61a 同步基础类 2 years ago
anthonywj 5c09ceeb6e 同步设置页面重整,,基础数据上传,单据类型上传 2 years ago
anthonywj b9590dcd50 单据同步相关修改 2 years ago
anthonywj 03097198f5 单据同步 2 years ago
x_z 9bab80a61e 1.同步库存预警设置代码 2 years ago
anthonywj d47ff60dd6 迁移自助平台单据相关代码 2 years ago
anthonywj d14cba051e 单据类型迁移,内部码打印迁移 2 years ago
anthonywj 073e87eae1 代码备份 2 years ago
anthonywj 78efd5b5eb 页面展示,同步相关修改 2 years ago
x_z 437938b6c9 1.测试 2 years ago
x_z 3f81a88bce 1.调整同步设置业务单据类型代码 2 years ago
x_z f2e715bd9a 1.添加同步,业务单据类型代码 2 years ago
wangwei 56ea125915 添加事务注解 2 years ago
x_z 71cb1c1e2d 1.添加采购计划和采购单明细接口 2 years ago
x_z 72a4b9095c 1.添加申购单据明细查询接口 2 years ago
admin e8be747527 dlAllOrder null检查 2 years ago
anthonywj adc2bae64b 新增业务单据同步 2 years ago
x_z e514676578 1.修复盘点转单锁库存的问题导致单据未生成的问题,调整为暂时不锁库存,待后续库存功能完善后再放开此逻辑 2 years ago
x_z ef4b457199 1.修复盘点单bug 2 years ago
anthonywj 39baff10bf UDI管理系统定时上传,定时下载单据相关 2 years ago
x_z 208440cc2d 1.完善生成维保单逻辑 2 years ago
x_z 8e91f3b4b5 1.添加巡检计划转维保单和报修单转维保单 2 years ago
x_z d1e932c8ae 1.调整维保单相关代码 2 years ago
x_z 62a1d3ef79 1.调整报修单逻辑 2 years ago
x_z e2fbaf9443 1.调整巡检计划相关代码 2 years ago
x_z fd9aae06ce 1.调整科室设备明细,设备巡检设置接口 2 years ago
anthonywj bb8626eff5 新增同步设置相关功能界面 2 years ago
x_z 098ada84c9 1.提交设备巡检,维保等接口代码 2 years ago
x_z f06dc47afb 1.提交设备巡检计划相关代码 2 years ago
郑明梁 9d42a60f66 多级产品页面代码提交 2 years ago
x_z 37b4be08b2 1.修改设备领用逻辑,审核通过后添加到部门设备明细
2.添加保修单,科室设备明细等相关表实体类
3.添加科室设备明细增删改查接口
2 years ago
郑明梁 3651b54080 多级产品页面代码提交 2 years ago
anthonywj b2779284f0 bug相关修改,业务单据修改 2 years ago
郑明梁 a89aba0977 多级产品页面代码提交 2 years ago
x_z 2f48a29839 1.初步完成出入库汇总逻辑 2 years ago
wangwei c1cfccbf87 同步代码 2 years ago
anthonywj 0b746a5a09 单据流程相关迁移到UDI管理系统 2 years ago
x_z aca8b1b682 1.添加查询汇总记录详情接口 2 years ago
x_z 9a9b292495 1.提交查询汇总记录列表接口 2 years ago
x_z 18d17933be 1.完善汇总出入库数据逻辑 2 years ago
x_z 9868ebd8d0 1.添加生成单日出入库汇总数据逻辑 2 years ago
x_z 340073ea81 1.添加物资出入库汇总数据生成代码 2 years ago
郑明梁 176f808bca 产品申购添加领用单引入 2 years ago
anthonywj f8a7c55c09 单据相关bug修改 2 years ago
x_z 44941fb089 1.完善资质预警代码 2 years ago
x_z 501454a868 1.添加资质预警相关代码 2 years ago
x_z cd3f09e887 1.修复库存养护,设备领用等功能的bug 2 years ago
x_z 667a51a126 1.完善盘点转单逻辑
2.修复空库状态下添加部门失败问题
2 years ago
wangwei 78dde4ca60 修改资产管理页面 及bug 2 years ago
x_z 1bb83857a9 1.完成库存预警功能 2 years ago
郑明梁 319e07d641 修改内部码bug 2 years ago
郑明梁 095680513b 删除院内分类关联表代码 2 years ago
x_z 90dd44579f 1.调整库存预警功能逻辑 2 years ago
郑明梁 df0df7d7c1 修改院内分类功能代码 2 years ago
郑明梁 3bb10e20ea Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 e4dfbc21e6 修改院内分类功能代码 2 years ago
x_z 811f721067 1.调整预警信息相关代码 2 years ago
郑明梁 a5b125e2a4 库存查询语句修改 2 years ago
郑明梁 3aead441db Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 46d09234fe 内部码打印bug修改 2 years ago
wangwei d3523a669c 修改bug 2 years ago
wangwei 73caacae13 修改实体类 新增设备领用bug 2 years ago
郑明梁 72e08edcce 修改业务新增bug 2 years ago
x_z 2e63c41c13 Merge remote-tracking branch 'origin/master' 2 years ago
x_z 76a73d95f8 1.添加库存产品名称列表接口 2 years ago
anthonywj 731976a40c 新增条码完整性校验缓存表,关联关系等 2 years ago
郑明梁 4b7640bd51 采购订单管理功能代码提交 2 years ago
x_z f0f4b215c0 1.完善库存预警消息提醒,添加测试环境配置文件 2 years ago
wangwei deefec3fa6 修改bug 2 years ago
x_z d4bb8ca1af 1.修复盘点审核功能接口bug 2 years ago
x_z 17798d6057 1.添加采购单据实体类,修改预警消息生成逻辑 2 years ago
anthonywj cb435dabe3 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj fb786e3271 bug修改 2 years ago
x_z dcbc6712eb 1.添加库存预警相关的实体类和接口 2 years ago
郑明梁 d74a95f05f 耗材字典院内分类功能代码提交 2 years ago
wangwei b814e811f5 修改bug 2 years ago
wangwei b6b3591a1d 修改仓库bug 2 years ago
x_z 8905ea8ca4 1.修复耗材,盘点,单据相关的bug 2 years ago
wangwei 06dd9a4021 修改仓库分页bug 2 years ago
anthonywj d1d10bbd8f bug修改 2 years ago
wangwei c3ad3cdbd1 修改bug 2 years ago
郑明梁 ee7dc90fc2 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 f8d31bb723 修改单据导入文件获取不到用户信息和单据校验问题 2 years ago
anthonywj 2e99d05ae9 新增库存提醒功能 2 years ago
x_z 704e678df2 1.修复单据编辑更新库存信息的bug 2 years ago
x_z e4ab807085 1.更新仓库信息时同步更新货位绑定的仓库编码,修复货位丢失问题 2 years ago
x_z 89190e3a86 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
2 years ago
x_z 9762e04dbd 1.修复单据编辑页面查询单据列表无往来单位字段问题 2 years ago
郑明梁 0ec54ddd64 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 cc794ea107 修改单据编辑bug 2 years ago
wangwei e72352d7f0 修改仓库bug 2 years ago
x_z 5e915fd4f0 1.修复库存查询功能的bug 2 years ago
anthonywj ab91a623b4 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 702c655810 待校验详情校验 2 years ago
x_z 8e077d72e5 1.修复三期校验异常信息未填充到单据问题
2.修复录入产品时使用UDI码查询不到数据的问题
2 years ago
x_z c6ce533caf 1.添加单据上传接收日志查询,删除接口 2 years ago
郑明梁 70b4ccef64 修改耗材单据bug 2 years ago
x_z b772499867 1.添加提交单据相关接口 2 years ago
anthonywj dfd5e936cb 业务单据,库存相关bug修改 2 years ago
郑明梁 3bfb013a2c 单据打印功能代码提交 2 years ago
anthonywj 8a41703215 单据类型,仓库,新增寄售功能,关联库存,寄售库存,以及其他联动 2 years ago
wangwei b11264e812 修改bug 2 years ago
x_z e730bcb2e9 1.删除重复代码 2 years ago
x_z 9a644e8f73 1.添加上传单据设置查询新增接口 2 years ago
anthonywj ca8ebace24 寄售库存生成! 2 years ago
anthonywj a493526502 模板单据问题修改 2 years ago
anthonywj a380f67945 单据相关bug修改,单据撤回,单据编辑 2 years ago
郑明梁 25e5fbe0b6 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 4079cb0d0d 业务单据内部码打印功能代码提交 2 years ago
anthonywj 0b46d88e47 单据相关bug修改 2 years ago
anthonywj f68b2e4597 单据相关bug修改 2 years ago
郑明梁 b1ddfaa2d8 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 37be575f8e 内部码打印功能代码提交 2 years ago
anthonywj a643f5388f 仓库Dao修改 2 years ago
anthonywj 113a178779 第三方单据修整,模板上传bug 2 years ago
anthonywj d6abb99481 第三方单据类型,领用单据徐选入 2 years ago
anthonywj 9ed9b7ec47 单据相关问题修改 2 years ago
郑明梁 c7ecdd380a Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 8faadb6066 内部码打印代码提交 2 years ago
anthonywj 6fb648ea84 单据撤回相关 2 years ago
郑明梁 913dca5ebc 耗材领用管理代码提交 2 years ago
anthonywj 44afbdd651 单据相关bug修改 2 years ago
anthonywj 5dae7d0f51 单据编辑删除库存等 2 years ago
anthonywj c5dab991d3 预验收功能 2 years ago
anthonywj 528deba44f 预验收相关功能 2 years ago
x_z 5f6ee6ff6a 1.添加单据编辑码详情查询接口 2 years ago
anthonywj 6a7127cd7a 等待处理单据提交问题 2 years ago
anthonywj 8742683103 单据相关bug修改 2 years ago
x_z 1173860b09 1.添加单据编辑查询和修改时间接口 2 years ago
wangwei cccfe44098 修改仓库信息bug 2 years ago
x_z d8da9f5c71 1.修复单据相关的bug 2 years ago
anthonywj 96d811e8da 手持终端流向查询,库存查询 ,验收等 2 years ago
x_z 45c5a209c2 1.库存查询添加分组 2 years ago
anthonywj 9de2e3881c 插入库存无批次号问题,手持终端扫码验收 2 years ago
x_z a91cb4e194 1.修复单据相关的问题 2 years ago
x_z b0b5476d75 1.添加盘点单据查询库存详情列表接口 2 years ago
anthonywj ac32ef672d 补单问题,pda单据提交 2 years ago
x_z c2c18bb715 1.补充盘点转单代码 2 years ago
x_z e57b30d9fc 1.添加盘点单据相关实体类和接口 2 years ago
wangwei 8216e6fcbd 修改bug 2 years ago
wangwei 2db5497a93 修改bug 2 years ago
x_z 9e6b381738 1.添加设备领用养护接口 2 years ago
anthonywj db961a82f4 单据流程相关修改 2 years ago
x_z f1e9becf45 1.调整库存养护功能接口 2 years ago
anthonywj e963f74448 Merge remote-tracking branch 'origin/master' 2 years ago
x_z a6c0d34522 1.添加库存养护功能接口 2 years ago
anthonywj 38c5001097 单据流程梳理 2 years ago
郑明梁 5cb6c3ebbc 修改资质bug 2 years ago
anthonywj fe939d6965 单据提交状态修改 2 years ago
anthonywj bd98eaa7e2 单据领用 2 years ago
x_z e6153fa85b 1.添加库存养护功能实体类和相关接口代码 2 years ago
郑明梁 fae35d058a Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 f7d3031ef0 采购计划代码提交 2 years ago
x_z e0b1296f0c 1.添加库存摆放功能接口 2 years ago
x_z 69e0f65b61 1.添加库存统计接口 2 years ago
anthonywj 6e4dadd22a 单据管理相关功能修改 2 years ago
x_z 4a79b317fa 1.完善部分查询接口逻辑,添加重复添加校验 2 years ago
郑明梁 cb4d5a52ba 采购计划代码提交 2 years ago
x_z 61415aa489 1.修复单据生成等接口的bug 2 years ago
anthonywj 37a54d3ef9 多个供应商绑定,多个产品关联绑定,预验收库存校验,普通库存校验 2 years ago
x_z db7c6405e3 1.添加删除寄售库存接口 2 years ago
x_z 3c9a46b7fe 1.添加寄售库存实体类和查询接口 2 years ago
wangwei 5d26e2372e 修改bug 2 years ago
anthonywj 2744ae6894 条码编辑,修改,生成库存修改! 2 years ago
郑明梁 8d6ae5b67b Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 a7873d3831 申购代码提交 2 years ago
anthonywj d526c615c5 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 6014dd7640 单据类型,委托验收相关功能 2 years ago
x_z 6892a86ce7 1.调整仓库列表查询接口 2 years ago
wangwei f49fb06de3 修改bug 2 years ago
x_z 9e42e8ee52 1.修改单据列表查询接口,修改参数标识 2 years ago