Commit Graph

999 Commits (20231126-yw)

Author SHA1 Message Date
anthonywj 8c885991b3 过滤追溯查询单据 2 years ago
wj 17e03fb9a3 代码调整 2 years ago
wj 7594fa138e ms上传调整 2 years ago
wj 97628c8015 ms上传调整 2 years ago
wj 170c39a53e Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj 0b93501508 属性copy调整 2 years ago
1178634255 c5cb19cdda Merge remote-tracking branch 'origin/dev' into dev 2 years ago
1178634255 fd89a744c5 代码更新 2 years ago
anthonywj fcaabc888a 单据同步更新问题 2 years ago
1178634255 853fe6e897 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
1178634255 c46575f8d2 代码更新 2 years ago
wj 5a11fafa8e 还原 2 years ago
郑明梁 0bd7c00292 发票代码提交 2 years ago
1178634255 0ea118f03e Merge remote-tracking branch 'origin/dev' into dev 2 years ago
1178634255 e735cab2e7 密码修改 2 years ago
anthonywj 8e33768fb8 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj b78a5a35c3 单据业务详情丢失,单据未补单,使用出库多补退货单等问题 2 years ago
wj 7bdaf137b6 还原 2 years ago
wj 1d2f030f67 别名调整 2 years ago
wj 7816c44344 别名调整 2 years ago
郑明梁 26865894d0 UDIMS平台验证接口提交 2 years ago
anthonywj dce2904b65 新增按发票登记相关接口 2 years ago
anthonywj 654d32def0 关联DI必填字段不被覆盖 2 years ago
anthonywj fdbe829ef0 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj d6f9e3f06a 临床使用出库单新增备注字段 2 years ago
wj d3802d7606 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj e47cc79388 ReplaceBatch.java调整 2 years ago
anthonywj f89170c3df 是否包含序列号 2 years ago
anthonywj 3caf75626b bug修改,提供协调平台追溯查询接口 2 years ago
anthonywj ce0da2cd18 ,bug修改 2 years ago
郑明梁 f85520eccf 创建仓库编码取最大值 2 years ago
郑明梁 3fa40797e0 单据上传功能代码提交 2 years ago
anthonywj 35c8440d5b 第三方产品信息编辑,bug修改 2 years ago
郑明梁 33c4793870 单据上传功能代码提交 2 years ago
anthonywj dbc8030980 代码备份 2 years ago
anthonywj e322f91fda 第三方产品信息编辑,bug修改 2 years ago
郑明梁 f02fbc16c2 单据上传功能代码提交 2 years ago
anthonywj 3e67b15a4d 扫码单据资质证书校验 2 years ago
郑明梁 472fc4f30c 单据上传功能代码提交 2 years ago
anthonywj 5bac5e9dee UDI管理系统与UDIMS同步过来数据不进行删除 2 years ago
anthonywj 82d08be38d 代码备份 2 years ago
anthonywj b1d1b446d2 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 694e560243 采购订单同步问题 2 years ago
郑明梁 eac48ebe51 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 61ae73c856 单据上传功能代码提交 2 years ago
anthonywj b4243db10c 更新审核人,核对人,供应商编辑信息bug 2 years ago
郑明梁 5236bfaf39 单据上传功能代码提交 2 years ago
郑明梁 8f11acd645 单据上传功能代码提交 2 years ago
郑明梁 dbcb7bbaf1 Merge remote-tracking branch 'origin/pro' into dev
# Conflicts:
#	src/main/java/com/glxp/api/controller/auth/LoginController.java
2 years ago
郑明梁 b4acc0a913 单据上传功能代码提交 2 years ago
anthonywj e39c57f68a 基础信息相关修改 2 years ago
anthonywj 287b8e762a 基础信息相关修改 2 years ago
郑明梁 d14f2dbefd 单据上传功能代码提交 2 years ago
wangwei b295e9e811 去除多余代码 2 years ago
anthonywj 111a68c728 内部码查询问题 2 years ago
郑明梁 a862ff7651 管理ms拉自助平台接口提交 2 years ago
anthonywj 491ef762df 界面标题,logo修改 2 years ago
anthonywj 17e69d34b5 排序问题 2 years ago
郑明梁 1067aebdfe Merge branch 'dev' into test 2 years ago
anthonywj 4f0da29206 相关bug修改 2 years ago
anthonywj 2fd1ca3559 单据验收,库存不足问题 2 years ago
wangwei b8fcfa9d0b 代码恢复 修改新增货位问题 2 years ago
wangwei a5db577785 修改 供应商字典导出id问题 2 years ago
wangwei 035c05c4f5 修改 admin设置产品为可集采状态,供应商 入院物资没同步更新 2 years ago
anthonywj 82c73f6eb3 发票修改优化 2 years ago
anthonywj c57e232dfb 发票问题代码备份 2 years ago
wangwei 3ac25d320a 修改bug 2 years ago
wangwei f4771d3382 优化 2 years ago
wangwei d67ef1050c 发票价格不匹配时 状态是未登记 2 years ago
anthonywj 8198a35458 发票问题 2 years ago
anthonywj 005fff4671 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoOrderController.java
2 years ago
wangwei 8733e63cd5 发票优化 2 years ago
wangwei 82fadb3e7d 单据 添加排序 2 years ago
郑明梁 79df891647 送货发票登记接口优化 2 years ago
郑明梁 d52bb00a18 送货发票登记接口优化 2 years ago
郑明梁 e7e5cac0bb 送货发票登记接口优化 2 years ago
anthonywj 0a393fc1ae 根据实际数量计算金额 2 years ago
anthonywj f20c17083d 根据实际数量计算金额 2 years ago
anthonywj b9edabf126 序列号校验 2 years ago
anthonywj ae1be7bbf3 新增单据复制功能 2 years ago
郑明梁 fc70a92213 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 e3ad9e47f6 新增单据bug修复 2 years ago
wangwei 842fb00813 发票二维码解析 2 years ago
anthonywj 69ea52be42 内部码打印问题,启用使用单元数量问题 2 years ago
anthonywj 7f4f58c92e Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 8e1bd4621c 单据审核UDI码后面加GS1符号 2 years ago
郑明梁 42141422a1 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 24057e1458 新增扫码单据排序 2 years ago
anthonywj 5b2ad5b348 单据重复提交问题 2 years ago
anthonywj 491173a242 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj e6cf46a50c 打印全部内部码问题 2 years ago
wj 522cbb27b9 Merge branch 'dev' into test 2 years ago
wj 9ad3ec4311 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj e5406f64f4 最新代码提交 2 years ago
anthonywj 044313f22b relId 去掉用雪花ID生成 2 years ago
wj 169e50ac78 Merge branch 'dev' into test 2 years ago
wj b3eca1daaa 最新代码提交 2 years ago
anthonywj c6a74080d0 relId long型修改 2 years ago
wj d068fb6f73 insertIgnoreBatch/replaceBatch改造 2 years ago
wj aff2dadc3c insertIgnoreBatch/replaceBatch改造 2 years ago
wj f88ac7da1c Merge branch 'dev' into test 2 years ago
wj ed0793f0c2 bug修复 2 years ago
wj c9eb7079a2 Merge branch 'dev' into test 2 years ago
wj e4ed256783 平台验证接口增加返回单据类型 2 years ago
wj a3b551a2b0 Merge branch 'dev' into test 2 years ago
wj 10472f7815 平台验证接口增加返回单据类型 2 years ago
郑明梁 c7adf7bbb4 内部码和明细打印代码提交 2 years ago
郑明梁 7670517b97 Merge branch 'master' into dev
# Conflicts:
#	src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java
#	src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java
#	src/main/resources/schemas/schema_v2.1.sql
2 years ago
郑明梁 be1c63e774 内部码和明细打印代码提交 2 years ago
郑明梁 69c3c9e830 内部码和明细打印代码提交 2 years ago
1178634255 cd9a944c0f 修复待校验单据模块中的‘编辑单据’窗口,功能按钮点击无反应 2 years ago
anthonywj 50d5996c65 物资字典编辑问题 2 years ago
anthonywj 7c6b5b1da3 内部码打印问题 2 years ago
wj ae06cb6f4c Merge branch 'dev' into test 2 years ago
wj c2c7b0b339 增加平台验证接口 2 years ago
wj 86a14f88f5 Merge branch 'dev' into test 2 years ago
wj 2169d3300d 增加平台验证接口 2 years ago
wj 493a30dd5d Merge branch 'dev' into test 2 years ago
wj aeedcdd984 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj 97c84757da 增加平台验证接口 2 years ago
anthonywj 7998af918e 代码备份 2 years ago
anthonywj 0083117df9 采购订单,单据流转等修改 2 years ago
anthonywj d458e72c7e 资质证书同步修改,检验报告冷链报告支持多条,单据类型修改 2 years ago
wj 03b98fceb6 Merge branch 'dev' into test 2 years ago
wj d5bee1722d Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj 2ed04f6c42 bug修复 2 years ago
schry 36602ee0e6 入院物资维护模块选入页面字段名称不一致 2 years ago
schry cfc32f6bdc 解决本企业资质证书添加错误 2 years ago
schry 43571f316c 解决添加资质证书提示错误 2 years ago
郑明梁 0ee194313d 内部码和明细打印代码提交
(cherry picked from commit b493e80846)
2 years ago
anthonywj 6122a793b7 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 974e26a3e9 发票刷新系统繁忙问题 2 years ago
wangwei aa8fee64d1 冷链报告 2 years ago
郑明梁 b493e80846 内部码和明细打印代码提交 2 years ago
anthonywj f3b92944ae 采购订单问题 2 years ago
wj a90aed66fc 调整 2 years ago
wj 82ce51f0a1 调整 2 years ago
wangwei e15f17b2db bug修改 2 years ago
anthonywj bd23124565 bug修改 2 years ago
wangwei 94a6af5fef bug修改 2 years ago
wangwei 213b1a6aee bug修改 2 years ago
wangwei 133b778a99 bug修改 2 years ago
anthonywj c46eebd1f4 检验报告没更新问题 2 years ago
wangwei 016e323566 修改bug 2 years ago
wangwei 6153bc7907 资质打印 2 years ago
wangwei f6d2ed3816 内部码 2 years ago
郑明梁 2c20566d39 单据打印修改打印地址 2 years ago
wj b44bbc53b0 向内同步国家库数据 2 years ago
wj edb34d1f92 使用自定义Iservice和ServiceImpl 2 years ago
wj 4a38f13d7b 自定义Iservice和ServiceImpl 2 years ago
wangwei b9738be229 如果角色存在用户关联 就不能禁用此角色 2 years ago
anthonywj fde36ac636 单据同步bug 2 years ago
anthonywj 6130e90770 模板单据预览修改 2 years ago
anthonywj 9f9ad88b16 库存查询 2 years ago
wangwei fbda76440c 修改bug 2 years ago
wangwei f8b7f78d64 修改发票查询方法 2 years ago
wangwei 316cafe9a0 角色修改问题 2 years ago
anthonywj 0f903962a3 发票刷新修改,更新同步问题 2 years ago
wj 1f904a6263 Merge branch 'dev' into test 2 years ago
wj d2b6289733 文件下载调整 2 years ago
wj dc8930f2c3 提示文案调整 2 years ago
wangwei 18bf0924ec 修改排序 2 years ago
anthonywj 795b57b500 发票新增,或更新同步问题 2 years ago
wj cd8cebda30 Merge branch 'dev' into test 2 years ago
anthonywj e4864f67e4 单据详情改为雪花ID 2 years ago
wangwei db77297df4 查询发票方法修改 2 years ago
wj 84e31c8ae1 bug修复 2 years ago
wj b5656de6b6 bug修复 2 years ago
wj fcd744930f 文件下载调整 2 years ago
wj 2a3dcb6564 文件下载调整 2 years ago
wj 22cf3f4687 手动同步调整 2 years ago
wj 9f436e8aa6 手动同步调整 2 years ago
wj 907d19d0d1 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj 21f46347ad 手动同步调整 2 years ago
wangwei 1ce939aacf 修改bug 2 years ago
wj f5397a245e 手动同步调整 2 years ago
wj 07d671975b 手动同步调整 2 years ago
郑明梁 c074b53599 物质摆放变更功能代码提交 2 years ago
wangwei 6e2d85ed76 修改bug 寄售 预验收 带票库存详情加排序 2 years ago
wj 596f11a597 Merge branch 'dev' into test 2 years ago
wj 62b26214a6 id类型调整 2 years ago
wj 2d623577f1 id类型调整,异常打印 2 years ago
wj 7efba33fc0 数据上传接口调整 2 years ago
wj 26473b3658 Merge branch 'dev' into test 2 years ago
wj b0683426dc 数据同步调整 2 years ago
anthonywj 282459ca4e bug修改 2 years ago
wj 7d0ad99a74 时间判断调整 2 years ago
wj 56ac3bb262 判断调整 2 years ago
wangwei 2832d8944c 发票 优化 2 years ago
anthonywj f5f69fb26b Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj f155b6d580 货位,bug修改,单据同步修改 2 years ago
wj a74ce2f9d5 Merge branch 'dev' into test 2 years ago
wj f52cdb3844 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj 2ed8b33180 id类型问题 2 years ago
wangwei 83697b44bd 修改发票bug 添加金额 总金额 2 years ago
anthonywj 7e6f38b274 Merge branch 'master' into dev 2 years ago
anthonywj 54fefd81d9 获取最大货位
(cherry picked from commit 2a2397a7d1)
2 years ago
anthonywj 2a2397a7d1 获取最大货位 2 years ago
anthonywj 2a7fe6c1e9 供应商注册无更新时间,新增排序规则,倒序正序,仓库问题 2 years ago
wj 3221cb8d73 Merge branch 'dev' into test 2 years ago