Commit Graph

764 Commits (9904fff69ff957649bb16c2f51eab6b551c9f90c)

Author SHA1 Message Date
1178634255 c241831d6d 代码更新 2 years ago
1178634255 91cf593506 修改密码代码备份 2 years ago
1178634255 de6f13ec27 修改密码代码备份 2 years ago
1178634255 420dea5428 代码备份 2 years ago
schry f89247401a 导出产品信息窗口执行‘结果全部导出’操作,导出的文件数据为空 2 years ago
1178634255 e20a65a00c 新增扫码单模块到待校验单据模块,备注会消失 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
郑明梁 86bd9ebc9c 往来单位是客户的客户类型为患者 2 years ago
郑明梁 0618f9b317 内部码扫码bug修复 2 years ago
郑明梁 dad49893d3 定数包设置代码提交 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
anthonywj 91ff79f125 第三方产品信息编辑bug 2 years ago
郑明梁 b77f1e215e 第三方单据bug修复 2 years ago
郑明梁 3a923c18d8 第三方单据bug修复 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
anthonywj fce5d7b7c6 申购单据,采购订单等相关修改 2 years ago
anthonywj f66705d82b 采购计划,采购订单等相关修改 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
anthonywj 0149230284 预验收,寄售有序列号库存不足问题 2 years ago
anthonywj 415b931c06 库存不足问题,单据验收问题 2 years ago
郑明梁 ce2aa13b5f 修改单据bug 2 years ago
郑明梁 7fd6639c18 汇总统计bug修复 2 years ago
anthonywj 84b7aae6dc 发票修改同步 2 years ago
郑明梁 02a17df71a 多次出库bug修改 2 years ago
wangwei 7893940cc6 修改第三方数据 单据类型新增 编辑问题 2 years ago
wangwei 280859bb91 修改bug 2 years ago
郑明梁 d8fe73595b Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 487473f91c 多次出库bug修改 2 years ago
wangwei 68fd6641ba 同步代码 发票优化 2 years ago
anthonywj 374f8261f8 相关bug修改 2 years ago
郑明梁 fed1bc9bde 单据判断序列号 2 years ago
wangwei d4e0107b91 新增出入库 物资录入查询问题 2 years ago
郑明梁 d1fe07356c 多次出入库代码提交 2 years ago
anthonywj ea3c82f475 出入库扫码相关bug修改 2 years ago
wangwei 690d415779 新增申购 调整产品录入多选 2 years ago
郑明梁 d61ee07461 业务单据修改产品id类型(long) 2 years ago
anthonywj 1a015238d6 采购计划提交系统繁忙问题,物资字典选入系统繁忙,生产企业查询系统繁忙 2 years ago
wangwei 545905a5f3 新增申购产品录入多选问题 2 years ago
anthonywj bb43c32a1e Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj d3697401a2 单据上传重盖 2 years ago
郑明梁 46a981040a 业务单据功能修改 2 years ago
郑明梁 d4119a70a8 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 66d890ab18 业务单据功能修改 2 years ago
wangwei 42cd45112b 修改第三方产品信息 结果全部导出问题以及 编辑第三方部门信息仓库会联动问题 2 years ago
anthonywj eb3f48ce04 代码合并 2 years ago
1178634255 68586c23cb 上传设置备份 2 years ago
anthonywj 85324b42db 序列号校验 2 years ago
anthonywj 2962670774 申购,相关查询修改 2 years ago
anthonywj 70c0784584 申购,相关查询修改 2 years ago
1178634255 f0cd926013 上传设置备份 2 years ago
anthonywj f51054ea40 第三方单据上传类型修改 2 years ago
郑明梁 15ddba6d41 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 6b004099d3 业务单据功能优化 2 years ago
wangwei 28d9198f0f 修改bug 2 years ago
郑明梁 fce6af7827 单据复制bug修复 2 years ago
郑明梁 aa76cb9578 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 b6ef0496d7 单据草稿保存创建往来单位 2 years ago
wangwei fa18f2787f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wangwei e841371176 修改第三方仓库问题 2 years ago
郑明梁 47fabd4fca bug修复 2 years ago
wangwei bd75cdeee8 修改bug 2 years ago
wangwei f8d481facc 发票二维码解析 2 years ago
郑明梁 0c4e94a308 业务补单时间推迟bug修复 2 years ago
anthonywj 651a0ef658 内部码打印问题,启用使用单元数量问题,申购系统繁忙问题 2 years ago
郑明梁 2334016fec 领用管理bug修复 2 years ago
郑明梁 17a7d9859f 物资拜放bug修复 2 years ago
郑明梁 fb9aa452d1 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 4b4d6beb7a 第三方bug修改 2 years ago
anthonywj 906bb7e6a6 单据审核UDI码后面加GS1符号 2 years ago
anthonywj c87cfdd641 单据删除做限制 2 years ago
anthonywj 4cd4d9b44c 单据重复提交问题 2 years ago
anthonywj 7bb00727f3 打印全部内部码问题 2 years ago
郑明梁 ecc358f41b 增加查询用户接口 2 years ago
anthonywj 3e53fea186 第三方接口下载bug修改 2 years ago
anthonywj f7d09c1ec4 第三方接口相关修改 2 years ago
wj 598b58d8d4 下载第三方产品信息 2 years ago
wj 1496bb4bda 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
郑明梁 83baf6d325 打印代码提交 2 years ago
郑明梁 ddf0a1866f 内部码报表打印代码提交 2 years ago
anthonywj 5619aa362c 代码备份 2 years ago
郑明梁 bd15235a99 单据报表打印代码提交 2 years ago
郑明梁 fe4b0082e3 单据报表打印代码提交 2 years ago
1178634255 56aa7faa57 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
1178634255 ed08449b2c 修复审核申购单报错 2 years ago
郑明梁 4a6f792398 多次使用出库新增功能代码提交 2 years ago
1178634255 e58e49b816 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
1178634255 9f1f491db3 修复入账库查询列表不会显示‘计量单位’,生产企业与单据类型的不一致 2 years ago
郑明梁 d72625c5cd Merge remote-tracking branch 'origin/zmlDev' into dev 2 years ago
郑明梁 3a26eafb7d 多次使用出库新增功能代码提交 2 years ago
anthonywj ee89548201 排序相关修改 2 years ago
anthonywj b0d1ddda6c 采购订单修改 2 years ago
郑明梁 14c4bd0248 多次使用出库新增功能代码提交 2 years ago
anthonywj f2968bf275 单据复制,单据流转带业务单信息,采购订单新增价格 2 years ago
anthonywj be6abd2063 bug修改 2 years ago
郑明梁 32ff539034 多次使用出库设置功能代码提交 2 years ago
schry ccbeadfe68 目标出入库单显示出入库类型单据 2 years ago
anthonywj aaff1b1d7f 发票系统繁忙问题 2 years ago
wangwei 4b917f22fd 冷链报告 2 years ago
郑明梁 b517963a08 内部码报表打印代码提交 2 years ago
郑明梁 1fa5263492 库存明细打印代码提交 2 years ago
anthonywj 385b9075ac bug修改 2 years ago
郑明梁 92e2a0fe89 inv_user_product,inv_user_product_detail表初始化代码提交 2 years ago
1178634255 6abd1137a8 1、业务流转设置了‘产品申购’自动生成‘采购计划’,无这个问题
申购单据审核提示‘系统繁忙’,可能是数据库多加了几条一样的数据
2 years ago
wangwei e25899a6ae 内部码 2 years ago
wangwei e1c80c5360 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wangwei 8837b12fd4 内部码 2 years ago
郑明梁 8ec5a59d85 资质打印代码提交 2 years ago
wangwei a7f3caefe9 资质打印 2 years ago
anthonywj 38f2e7b1a6 修改文件统一路径 2 years ago
anthonywj 59a0078a84 新增按货位出库功能 2 years ago
郑明梁 400f32ac9b Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 ffc363773e 单据打印修改 2 years ago
wangwei 10ecccc021 如果角色存在用户关联 就不能是禁用状态 2 years ago
wangwei 4ddca65ad5 修改bug 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
郑明梁 3b29b7f804 物资摆放下架代码提交 2 years ago
wangwei d55358b8cd 修改查询发票方法 2 years ago
anthonywj b4a00f5c51 发票,单据修改 2 years ago
wj b8a97dd2e6 文件下载调整 2 years ago
anthonywj 1003d2ec8f 业务单据详情改成雪花ID 2 years ago
郑明梁 82e46675a9 订单管理id问题修改 2 years ago
wangwei f563478aa2 修改bug 2 years ago
郑明梁 1379389f80 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 e61285dd5b 产品选入按国家库查询 2 years ago
anthonywj 23dacbc0d7 bug修改 2 years ago
wangwei 972ed90e40 同步 优化发票代码 2 years ago
wangwei f45d18ec7f 同步发票代码 2 years ago
郑明梁 f11e0fbb10 物质摆放变更功能代码提交 2 years ago
wangwei a4bf1e086c 发票刷新功能 2 years ago
郑明梁 1071b496dd 物质摆放按单功能代码提交 2 years ago
wangwei 1bf136848f 同步发票代码 2 years ago
anthonywj b54308121b 绑定供应商无法选择问题 2 years ago
郑明梁 9ac295028b 物质摆放功能代码提交 2 years ago
anthonywj 75077b05a4 同步相关问题修改。用户选入物资字典相关修改 2 years ago
anthonywj 1e77692313 发票ID改为long 2 years ago
wangwei 5697692584 发票修改 2 years ago
wangwei 94118141b5 发票修改 2 years ago
anthonywj cc248bab94 上线bug修改,同步修改,发票修改 2 years ago
wj 948d9ce1f3 异步同步 2 years ago
wj 09915f0e66 手动上传数据 2 years ago
wj f7247819da 手动上传数据 2 years ago
郑明梁 9b0b346017 用户修改不能修改角色问题 2 years ago
郑明梁 7ee91a1a2c 修改打印模板地址 2 years ago
anthonywj f658c2c4c9 bug修改,上架摆货修改 2 years ago
anthonywj 4b08aa2a4e bug修改,上架摆货修改 2 years ago
anthonywj 6322a3bd03 修改预验收,寄售其他仓库用户可查看,修复修改角色bug,修复按单摆货bug 2 years ago
anthonywj c6e36d0a79 数据同步下载问题 2 years ago
anthonywj 3cae7526bc 摆货相关修改,添加货位查询,预验收,寄售等相关库存摆货 2 years ago
anthonywj a9fd3f2c2b 相关bug修改 2 years ago
anthonywj 75d388e121 同步功能修改 2 years ago
郑明梁 0d878f1d64 修复id问题 2 years ago
wangwei 0d51bce1a3 出入库自动补单 业务单自动补单 修改id问题 2 years ago
anthonywj eec7d4f87a 带配货功能修改 2 years ago
wangwei dbaa3cf85e 修改 维护往来id问题 2 years ago
anthonywj eca01f3f4a 仓库用户单据类型移除问题 2 years ago
anthonywj a4838a4459 解决选入用户,移除用户系统繁忙问题 2 years ago
wangwei 5b970dc4c7 修改id问题 2 years ago
anthonywj 8ca7d523df 预验收按货位退货 2 years ago
wangwei d5a8a5e1fb Merge remote-tracking branch 'origin/wtest' 2 years ago
wangwei dbbcd67347 修改id问题 2 years ago
anthonywj 095aecff9e 用户选入单据类型系统繁忙 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 73d6187176 合并master分支 2 years ago
郑明梁 2e36abdc60 修改单据bug 2 years ago
wangwei d6336d806e 修改 仓库编辑时候判断 同部门下是否有同名的仓库 2 years ago
anthonywj 4ea1efaa92 同步数据bug相关修复 2 years ago
wangwei cfe0153f1b 修改 用户管理,编辑时候,会把之前选入的部门替换掉 2 years ago
anthonywj 6ba113593b 数据同步bug修改 2 years ago
郑明梁 48188c661c 耗材领用代码修改 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
郑明梁 b648cd1999 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 e0da5a4c12 院内分类代码提交(需同步) 2 years ago
anthonywj 32a30b5fec bug修改 2 years ago
郑明梁 d4fa6da5af 部门bug代码提交 2 years ago
郑明梁 9676304a40 计划单据提交 2 years ago
anthonywj 4278cf047e bug修改 2 years ago
wangwei 0e502f8666 修改部门 仓库bug 2 years ago
郑明梁 140403de6d 耗材领用单据提交 2 years ago
anthonywj 9f65dda33c 物资分类带代码迁移 2 years ago
wangwei 1a5279e608 修改 bug 2 years ago
wangwei 4ca132aabe 同步 部门代码 2 years ago
anthonywj 1e82f37f7f 物资字典参数设置,单据类型修改 2 years ago
anthonywj f3f717cf17 新增委托验收 2 years ago
wangwei 1524185bc6 同步 内部码 2 years ago
郑明梁 b05f001af6 Merge remote-tracking branch 'origin/master' 2 years ago
郑明梁 b0543b862a 资质代码同步 2 years ago
anthonywj 422311d7df UDI码过期禁止录入 2 years ago
anthonywj e4e94c3118 物资字典代码迁移,新增国家库同步到外网查询 2 years ago
anthonywj bd7fd9691a 物资字典代码迁移,新增国家库同步到外网查询 2 years ago
anthonywj 8a9607f690 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj d730b5c084 数据同步修改 2 years ago
wangwei a2944efa3e 修改bug 2 years ago
anthonywj ec9c295e03 单据库存相关代码迁移 2 years ago