Commit Graph

476 Commits (d47ff60dd6d97299542b16fabe7887f205e43043)

Author SHA1 Message Date
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
郑明梁 1a7df25952 预验收数据bug修复 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
anthonywj a7b199f6bd 新增患者使用溯源功能 2 years ago
x_z c6ce533caf 1.添加单据上传接收日志查询,删除接口 2 years ago
郑明梁 70b4ccef64 修改耗材单据bug 2 years ago
x_z b772499867 1.添加提交单据相关接口 2 years ago
wangwei a0c0aa7514 修改仓库信息bug 2 years ago
anthonywj dfd5e936cb 业务单据,库存相关bug修改 2 years ago
郑明梁 b911d27085 申购计划审核生成业务单据bug修改 2 years ago
郑明梁 3bfb013a2c 单据打印功能代码提交 2 years ago
anthonywj 8a41703215 单据类型,仓库,新增寄售功能,关联库存,寄售库存,以及其他联动 2 years ago
wangwei b11264e812 修改bug 2 years ago
anthonywj cec198ff66 业务异常单据校验 2 years ago
x_z 8893eb29b9 Merge remote-tracking branch 'origin/master' 2 years ago
x_z e730bcb2e9 1.删除重复代码 2 years ago
wangwei b86012184f Merge remote-tracking branch 'origin/master' 2 years ago
wangwei f60570502e 修改bug 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
wangwei 25b27d1c6f 修改bug 2 years ago
wangwei 2a6f601792 修改bug 2 years ago
郑明梁 25e5fbe0b6 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 4079cb0d0d 业务单据内部码打印功能代码提交 2 years ago
wangwei 8d576ea55d 修改操作日志bug 2 years ago
anthonywj 0b46d88e47 单据相关bug修改 2 years ago
wangwei 3e53996498 修改操作日志bug 2 years ago
anthonywj f68b2e4597 单据相关bug修改 2 years ago
anthonywj 7e9452d7de 第三方单据选入相关修改 2 years ago
anthonywj 5015ad932c Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj ec2cbf7c68 线程池配置 2 years ago
郑明梁 b1ddfaa2d8 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 37be575f8e 内部码打印功能代码提交 2 years ago
anthonywj 4465cc57e7 线程池配置 2 years ago
anthonywj a643f5388f 仓库Dao修改 2 years ago
anthonywj 113a178779 第三方单据修整,模板上传bug 2 years ago
x_z ee41bab71a 1.添加inv_inner_order_pdf_temp表对应实体类文件 2 years ago
x_z 0f8f25687a 1.修改主键生成方式为自增 2 years ago
x_z 0fcd4afa4b 1.提交inv_inner_order_print表生成实体类和dao文件 2 years ago
郑明梁 001a7d2065 耗材领用单据状态查询修改 2 years ago
anthonywj 699974a05e 第三方单据类型关联修改, 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
wangwei ce2bb2475a 修改操作日志bug 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
anthonywj 6f7cb9124e 修改bug,修改Integer 为int 2 years ago
wangwei cccfe44098 修改仓库信息bug 2 years ago
x_z d8da9f5c71 1.修复单据相关的bug 2 years ago
anthonywj 07c26bf55e 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
wangwei 1039fb0158 修改bug 2 years ago
wangwei 4d07c24afb 修改bug 2 years ago
anthonywj 29db4e1548 手持终端下载业务单据 2 years ago
anthonywj 56a221e4de Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 97c497ddc6 pda相关问题 2 years ago
x_z b0b5476d75 1.添加盘点单据查询库存详情列表接口 2 years ago
anthonywj ac32ef672d 补单问题,pda单据提交 2 years ago
x_z c2c18bb715 1.补充盘点转单代码 2 years ago
wangwei 04cd602d73 修改bug 2 years ago
wangwei 16d6956006 修改bug 2 years ago
wangwei 465c66918c 修改bug 2 years ago
x_z e57b30d9fc 1.添加盘点单据相关实体类和接口 2 years ago
anthonywj c1a5abea65 单据 2 years ago
wangwei 8216e6fcbd 修改bug 2 years ago
wangwei 2db5497a93 修改bug 2 years ago
x_z 7adf992a61 1.提交设备领用表实体类 2 years ago
x_z 9e6b381738 1.添加设备领用养护接口 2 years ago
anthonywj db961a82f4 单据流程相关修改 2 years ago
x_z 8d88121854 1.修改设备领用养护接口参数 2 years ago
x_z 5e2ff3cdc2 1.添加设备领用和养护实体类及dao接口和xml文件 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
郑明梁 2958725a39 修改页面显示问题 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 0644ca952d 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
x_z 709f0abf12 1.调整单据查询逻辑,修改单据状态值参数 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
wangwei 961e231561 修改bug 2 years ago
x_z d2dcf47003 1.删除库存详情原始码字段 2 years ago
x_z 52f27786aa 1.完善库存详情查询接口逻辑 2 years ago
anthonywj 01d818b715 新增单据->库存流程走通 2 years ago
x_z b8aeb30de5 1.补充库存查询VO类属性 2 years ago
x_z 56cc217a14 1.提交采购计划相关表实体类 2 years ago
wangwei 91089caa40 修改bug 2 years ago
anthonywj 2bffc13f85 仓库用户相关问题修改 2 years ago
anthonywj 86b7e95a1d 单据流程->可生成库存 2 years ago
x_z acb39129e9 1.添加库存查询相关接口 2 years ago
wangwei 99dc7ea920 修改bug 2 years ago
wangwei ada69b9971 修改bug 2 years ago
郑明梁 7785a9b287 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 e9723e430e 修改第三方库存功能连接不上第三方提示 2 years ago
wangwei 5d20f2ec30 Merge branch 'ww' 2 years ago
郑明梁 e77649aec6 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 0ac6508f6a 修改第三方业务单据bug 2 years ago
wangwei ec4719e21d 修改bug 2 years ago
x_z c6fb0bab31 1.删除实现序列化代码 2 years ago
x_z 120a3432e4 Merge remote-tracking branch 'origin/master' 2 years ago
x_z 1177a02870 1.修改单据状态值 2 years ago
郑明梁 507be86bde Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 c78a3000cb 修改耗材字典导出文件后缀 2 years ago
wangwei e721f92cd5 Merge branch 'ww' 2 years ago
wangwei 91e4a9021e 修改bug 2 years ago
郑明梁 987f6070f0 Merge remote-tracking branch 'origin/master' 2 years ago
wangwei 30eda1c060 Merge branch 'ww' 2 years ago
wangwei 25af20da31 修改bug 2 years ago
anthonywj 01d3a73c1c 扫码单据删除,生成库存后单据流转 2 years ago
x_z 3892f53aac 1.修改单据查询代码 2 years ago
wangwei 4b085f0ae6 修改bug 2 years ago
wangwei 711fd889d2 修改bug 2 years ago
郑明梁 8a7acda25d Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 98ece52110 首营资质 资质新增代码提交 2 years ago
wangwei b01eb4f0fd Merge remote-tracking branch 'origin/master' into ww 2 years ago
wangwei 70ca0e5697 修改bug 2 years ago
anthonywj cfd5403d09 新增单据提交 2 years ago
wangwei 527444fac9 Merge remote-tracking branch 'origin/master' into ww 2 years ago
anthonywj 99960be038 单据接口相同无法运行问题,业务单据校验 2 years ago
wangwei eeb4ecfb55 Merge remote-tracking branch 'origin/master' into ww 2 years ago
wangwei f9f64870a7 修改bug 2 years ago
anthonywj cde55e294e 新增单据相关修改 2 years ago
x_z 2baff77c00 1.完成单据详情相关表的基础查询接口代码 2 years ago
anthonywj 8fe7d604e0 单据流程->库存 2 years ago
wangwei 4821fb1ea0 修改bug 2 years ago
wangwei 51dfd9519a Merge remote-tracking branch 'origin/master' into ww 2 years ago
x_z 1abb492345 1.提交单据扫码明细等基础代码 2 years ago
wangwei 05f5e631f1 Merge remote-tracking branch 'origin/master' into ww 2 years ago
wangwei 6c0d05fd51 修改bug 2 years ago
x_z 24a1236685 1.添加单据,码表相关的查询接口 2 years ago
wangwei 7c2a255464 修改bug 2 years ago
wangwei 7b89981fa3 修改bug 2 years ago
wangwei 5df7e2e95e 修改bug 2 years ago
wangwei e4d062b152 Merge branch 'ww' 2 years ago
wangwei a252d29a8b 修改bug 2 years ago
郑明梁 4775da6533 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 4fd3f08bf1 耗材字典导入导出代码提交 2 years ago
anthonywj 0f3d83a854 单据校验相关修改 2 years ago
anthonywj c2472cb5e6 仓库部门,单据类型相关修改 2 years ago
x_z 0ccebc0721 1.添加正式码表查询接口文件 2 years ago
anthonywj eda6a5a7cb Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj 83868df12c 单据详情修改,库存,预验收库存等创建 2 years ago
wangwei 0957dcbd85 Merge branch 'ww' 2 years ago
wangwei 85794c2162 修改bug 2 years ago
x_z 24b711893d 1.添加耗材字典实体类 2 years ago
wangwei 2a406fc3d2 Merge branch 'ww' 2 years ago
wangwei 33417f58cb 修改bug 2 years ago
x_z f88afd8001 1.添加耗材字典导入导出实体类 2 years ago
wangwei a9b5f7d4d3 Merge branch 'ww' 2 years ago
wangwei 97c96219d2 修改bug 2 years ago
x_z ce4ad58370 1.修复单据类型的bug
2.合并第三方单据查询参数类
3.添加单据的查询参数,修复其他bug
2 years ago
anthonywj 3124dd50cb 单据管理相关 2 years ago
wangwei f54e7d2fea Merge branch 'ww' 2 years ago
wangwei da9c3c4360 修改bug 2 years ago
anthonywj f086482fdd 生成单据详情 2 years ago
x_z e55b64da99 Merge remote-tracking branch 'origin/master' 2 years ago
x_z 4777dbfb4d 1.修复单据类型字段前后端不统一问题
2.修复查询候选单据无数问题
3.新增,编辑单据类型添加重名校验
2 years ago
郑明梁 59959b9ef7 修改基础数据往来单位类名字 2 years ago
郑明梁 800644f7d7 修改第三方功能的导入导出格式 2 years ago
郑明梁 597794c096 修改基础数据往来单位导入导出格式 2 years ago
郑明梁 8a4c97aa56 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 ce92c21b3d 删除基础数据往来单位导入详情表 2 years ago
anthonywj 502f600775 订单详情类,耗材字典bug修改,扫码添加 2 years ago
anthonywj fa28d577e7 订单详情类,耗材字典bug修改,扫码添加 2 years ago
wangwei 05a0809a99 Merge branch 'ww' 2 years ago
wangwei e557e31739 修改bug 2 years ago
郑明梁 9597d7cb5e Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 fed0fcf9d2 基础信息往来信息代码提交 2 years ago
wangwei c396310a26 修改bug 2 years ago
anthonywj fcbc217750 用户修改,单据类型修改,往来单位修改,单据管理 2 years ago
anthonywj 4c3ef4f4f6 用户修改,单据类型修改,往来单位修改,单据管理 2 years ago
anthonywj 02e236724a 用户修改,单据类型修改,往来单位修改,单据管理 2 years ago
x_z a2e2e31e6d 1.修复系统管理和基础数据的bug 2 years ago
wangwei 239e3b3fb8 Merge branch 'ww' 2 years ago
wangwei f11cea6be9 修改bug 2 years ago
x_z 7b0de826e3 Merge remote-tracking branch 'origin/master' 2 years ago
wangwei 659be532be 修改bug 2 years ago
x_z fc0e5d2169 1.单据流转接口查询结果类完善字段 2 years ago
anthonywj 58bf32ddf5 供应商耗材字典管理,单据管理 2 years ago
x_z b5f30ce1c4 1.调整单据流转接口 2 years ago
郑明梁 5fd7c291d0 基础信息往来信息代码提交 2 years ago
x_z 35ada6f5ef 1.提交单据生成功能(原耗材领用设置)接口代码 2 years ago
x_z 25c1e6e0b1 1.调整单据类型接口 2 years ago
anthonywj 7f5c21cc64 仓库关联单据类型修改 2 years ago
x_z 05aaaee797 1.调整补单设置实体类字段
2.补全补单设置部分接口代码
2 years ago
郑明梁 9b2c6851ef 往来单位信息代码提交 2 years ago
x_z f15f5e6eaf 1.添加第三方系统单据类型关联查询接口
2.生成往来单位字典表实体类及对应的mapper文件和接口
2 years ago
x_z c7d891154f 1.补全单据类型缺失字段,调整异常处理代码 2 years ago
anthonywj bc15c42c82 第三方仓库,仓库信息修改 2 years ago
x_z 83ef10e32f 1.完成添加编辑单据类型接口 2 years ago
郑明梁 9ebf416b75 必填字段插入 2 years ago
郑明梁 d5aab2f18c 修改往来单位实体类名字 2 years ago
郑明梁 9f5c9687b1 第三方单据代码提交 2 years ago
anthonywj 5da45aea70 解决mybatisplus问题,新增mybatis基类 2 years ago
anthonywj 0a025cf733 耗材字典新增,修改完善 2 years ago
anthonywj be75d33c1a 耗材字典新增包装单位字段 2 years ago
anthonywj d4dac4091c 1.系统管理相关问题修复,重命名;
2.耗材字典相关代码提交
3 years ago
郑明梁 70318b9994 Merge remote-tracking branch 'origin/master' 3 years ago
郑明梁 647e84b5c2 第三方库存信息代码提交 3 years ago
x_z c6938e193d 1.调整单据类型接口 3 years ago