Commit Graph

1596 Commits (477b0c86a368abcde7b4503bb53cb2ca94230b92)

Author SHA1 Message Date
yewj 4975422c12 修改带校验,库存等 7 months ago
wangwei 0e70cb18eb 12/12 代码备份 扫码校验1.0 7 months ago
yewj b12d1e0a11 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
yewj 62dec41a67 处方按照队列取货 7 months ago
qiuyt 54eeaa4d4f 1、医保上传转换问题 怎么样都是失败问题 7 months ago
wangwei 3c4e13470d 12/10 单据审核2.0 7 months ago
wangwei 6add29cf82 12/9 已完成单-码校验 序列号字段查询 7 months ago
wangwei 17a392e687 12/9 已完成单扫码校验1.0 7 months ago
yewj 151ad2ed2d 审核送货单带入扫码明细, 7 months ago
yewj c0363c564e 扫码数量计算错误问题 7 months ago
wangwei bfd75a8285 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
wangwei 9993dd1932 12/6 已完成单码明细 7 months ago
yewj fb20732839 长泰上传问题 7 months ago
yewj 5c2ee6d58b 单据上传供应商问题 7 months ago
qiuyt ed9a13f65b 1、选入药品bug
2、医保上传统计问题
7 months ago
yewj 3fb0422a2b 拆零库存校验问题,有库存提示问题 7 months ago
yewj 4a7858a73d 扫码,拆零,无拆零插入备份表 7 months ago
qiuyt 086a0c2354 1、选入药品bug 7 months ago
qiuyt d6809e34f5 1、key使用阿里用户表获取 7 months ago
qiuyt af003ea3cf 1、选入药品调用国家库或者阿里接口进行拉取药品码段数据插入我们的表
2、医保接口也没有的时候也调用接口
3、医保菜单上传
7 months ago
wangwei d2f82fa0b2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
wangwei 29672ba005 12/3 已完成单-码校验 7 months ago
yewj 3afecad2b4 业务单生成扫码单修改 7 months ago
yewj dbd1f1c0f5 最小数量修改 7 months ago
wangwei a761685950 11/28 内部码分页优化 7 months ago
yewj 3f1ea341a2 取货确认问题 7 months ago
yewj c88e431977 待审核单据 7 months ago
wangwei 57b60cddc0 11/27 上货工位-货架打印优化 7 months ago
yewj 1e1672da9f 自动赋码任务修改,完成单据兼容自动赋码 7 months ago
chenhc 647d2c553a fix:修复自动完成tagStatus为1的单据 7 months ago
wangwei 34b5dd1dfe 11/27 查询优化撤回 修改药品选入diType类型 7 months ago
qiuyt 46e96c44e1 第三方基础数据拉取查询问题 7 months ago
chenhc ed2cab2506 fix:修复 7 months ago
yewj edad8988dd 关联关系临时解决 7 months ago
qiuyt 69d61b87d2 药品选入bug
单据错误信息字段更改
7 months ago
yewj e838984013 基础信息选入问题 7 months ago
wangwei 468a7aeb08 11/25 申购查询显示优化1.0 7 months ago
yewj a1fd086920 基础信息选入问题,拉单问题 7 months ago
wangwei ebfd686f09 11/25 扫码发货方消失bug 7 months ago
qiuyt e86612240b 管理系统增加扫码的时候如果码关联关系找不到那就调用外网的阿里接口进行插入关联关系 8 months ago
wangwei ab3e5a7173 11/22 临时码表不存在去正式码表搜索1.0 8 months ago
yewj bbdf9c5302 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 8 months ago
yewj f89de74fb8 第三方产品信息修改 8 months ago
wangwei 9aa9c9b509 11/21 码明细插入批次号 生产日期 失效日期 8 months ago
qiuyt 764d430322 1、工位上货大码包装只加入下面一级码 一级码就直接加入 8 months ago
qiuyt 8be0b3b5a8 1、单据上传统计界面增加采购和销售 码数进行计算开发 8 months ago
yewj 97f4c24dc1 单据处理数量,槽位绑定,扫码明细等 8 months ago
qiuyt 8ddb8d340c 1、单据上传统计界面开发
2、单据上传设置在呢个价论述时间定时设置 取消起始上传时间更新逻辑 无限循环处理有问题的单据
8 months ago
yewj 32851dfa59 关联关系修改,处方下载修改 8 months ago
yewj f469754e17 处方单分流,单据读取关联关系 8 months ago
qiuyt 122f698004 上传医保提示优化 8 months ago
yewj f6b2f78d46 代码备份 8 months ago
yewj afd6253b7c bug修改 8 months ago
yewj 55beb3b285 处理单据,关联关系问题等 8 months ago
wangwei 7ddccf734f 11/13 bug优化1.0 8 months ago
wangwei 1b56dc65f1 11/13 优化1.0 8 months ago
wangwei 924debdaee 11/13 上货增加虚拟槽位1.0 8 months ago
wangwei e380c8cf1f 11/13 供应商发票优化 8 months ago
yewj 287057e2fb 多个工位自动拆零问题 8 months ago
chenhc da4cde26b1 feat: 修复 8 months ago
yewj 53aa5e4c85 药品层级换算,插入等 8 months ago
qiuyt acc8ee83ea 基础管理的药品字典维护 增加明细分类逻辑 增加药品层级逻辑更改 选入增加明细分类 增加耗材字典表字段 8 months ago
yewj 6c541c8ab9 关联关系问题修改 8 months ago
chenhc 2a4601b681 feat: 修复 8 months ago
wangwei 2493f0d8a6 11/12 槽位管理解除产品 8 months ago
chenhc 7b8a4a6555 feat: 阿里药品加批准文号 8 months ago
chenhc 37f27adf68 fix:阿里药品关系维护 8 months ago
chenhc 4c0140e05a fix:层级文件上传 8 months ago
chenhc 4745da8c22 fix:暂存 8 months ago
qiuyt 9df7b4a90a Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z 8 months ago
qiuyt be9014f5d1 1、增加配置 开启就进行单据所有码包括下级的码进行校验有没有传过 传过了就不能再传了 8 months ago
yewj c72e45c9ff 关联关系问题修改 8 months ago
chenhc 8e716c53dd fix:槽位关联关系 8 months ago
qiuyt 59818217ce 1、增加签到字段
2、校验码是和下级所有码否传过了逻辑还没写
8 months ago
yewj 9d99ccb322 拆零数量不足判断 8 months ago
wangwei 8c35a2be71 出货槽 分页接口 8 months ago
wangwei 06625600ac 11/9 增加摆货层高度 根据货架查看摆货层和出货槽 8 months ago
yewj a74fe8a6c3 确认取药全部完成确认 8 months ago
yewj d0fb49b0bd 确认取药 8 months ago
yewj 4bba7945b1 扫码关联关系等相关修改 8 months ago
yewj b250e7b930 扫码关联关系等相关修改 8 months ago
wangwei 0940619d9c Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
8 months ago
wangwei 8d6388c62e 11/8 工位库存增加卡槽编码 8 months ago
yewj b97e374e66 新增取货确认 8 months ago
yewj 1a2a766a54 代码备份 8 months ago
wangwei cc6f9109fa 11/7 打印功能 8 months ago
chenhc b58e4aae8c fix:优化关联关系 8 months ago
wangwei 7651031603 11/7 取货架删除 8 months ago
wangwei 1e36dfa587 11/7 摆货层删除 8 months ago
wangwei 5d9f2ced7e 11/7 卡槽增加货位1.0 8 months ago
wangwei 1bc6c7319c 货架code 8 months ago
yewj 9bfc063682 现场管理单据审核 8 months ago
wangwei 7b87723552 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 8 months ago
wangwei af8e236530 11/6 货架管理1.0 8 months ago
yewj 8bdd8ad3b8 单据审核问题 8 months ago
wangwei efdc7cb70f 11/5 增加货架功能,优化货位1.0 8 months ago
yewj 605287e869 最后一个码拆零 8 months ago
yewj af172bea40 自动赋码问题修改 8 months ago
wangwei ab7a0474d2 11/4 上货产品是否属于本货位 8 months ago
chenhc 0e441c3bda feat: 码明细到国家同步库 8 months ago
yewj ed735aa532 判断当前工位底下是否有其他产品 8 months ago
yewj a8db4fcdc3 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 8 months ago
yewj e6b631a5c7 根据工位货位队列判断是否同一个产品 8 months ago
wangwei fa706b6abb 11/01 bug优化1.0 8 months ago
chenhc f28501c3d8 fix: 修复 8 months ago
chenhc 23c3b5d288 fix: 修复 8 months ago
yewj 370a1c77a3 平板工位上货问题 8 months ago
yewj c6ad3e0bed 多码提交确认 8 months ago
yewj 1b1474307d 处理单据确认 8 months ago
yewj abf62a7bc3 新增工位上货货位编码,新增处理单据扫码确认 8 months ago
wangwei 5d1e073556 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
#	src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java
8 months ago
wangwei b11c7b3d1b 10/31 工位分格1.0 8 months ago
yewj 43e8094c40 新增工位上货货位编码,新增处理单据扫码确认 8 months ago
wangwei 1f92ad7a9a 10/30 工位分格1.0 8 months ago
yewj b183c8c519 工位添加格子编码 8 months ago
yewj 346a0b0413 工位上货扫码移除 8 months ago
wangwei 4d04834a69 10/28 剔除码1.0 8 months ago
yewj 1e918222e1 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
8 months ago
yewj f08e86703a 单据处理相关修改,代码备份 8 months ago
wangwei df185518ed 10/25 bug 优化 1.0 9 months ago
chenhc 906f15b300 feat: 上传多码融合 9 months ago
wangwei c992490c13 10/24 bug优化1.0 9 months ago
wangwei d5f3142c43 10/24 bug优化1.0 9 months ago
yewj e5fd1d64f9 代码备份 9 months ago
chenhc 3c8db94c77 feat: 多码融合 9 months ago
wangwei 0907e42e4e 10/23 bug优化1.0 9 months ago
qyt 4168a85ccb Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z 9 months ago
wangwei fdb95857cc Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
wangwei 3021ca2d16 10/22 优化1.0 9 months ago
yewj 0b10eb6610 代码备份 9 months ago
wangwei f23db0fe4a 10/22 库存优化 9 months ago
qyt 2df7c3fb94 Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z 9 months ago
chenhc a0dba60a33 feat: 码明细 9 months ago
qyt 589e368744 Merge branch 'dev_no_inv' into dev_fifo_z
# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
9 months ago
yewj 9f46579a9d 查询码明细修改 9 months ago
chenhc a17b725415 feat: 拉取外网单据 9 months ago
yewj e3f53aabac 代码备份 9 months ago
qyt 3813dd8295 仓库逻辑改变仓库详情的逻辑都改成仓库表(第一次更新) 9 months ago
wangwei d23572b7cf 10/21 同步单据修改 9 months ago
yewj 5f915dffe2 工位上货问题 9 months ago
yewj f614074665 器械扫码拆零问题 9 months ago
yewj 86ba1f0dfe 器械扫码拆零问题 9 months ago
chenhc 43c5b1923f feat: 修复 9 months ago
chenhc 86f229fd69 feat: 修复 9 months ago
chenhc 0c7008a8b7 feat: 药品关联关系是否存在 9 months ago
yewj 714531279f Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj b3291be59c 拆零管理大改 9 months ago
wangwei 3f2f2edf30 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
chenhc e66332e4fb feat: 药品关联信息上下传输功能 9 months ago
wangwei 2a1ff42fe7 10/17 代码备份1.0 9 months ago
yewj 29bfdc9725 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj f6fbc4272b 器械层级修改 9 months ago
wangwei 61e784aca3 10/17 单据增加单据类型(器械/药品)基础数据器械响应优化 9 months ago
chenhc bfaae7675e feat: 药品关联关系功能 9 months ago
chenhc dcfa320847 fix: 拉取外网药品关联信息 9 months ago
yewj d313d19f35 删除库存明细 9 months ago
wangwei df00fdc69e 10/15 基础数据 器械优化 9 months ago
yewj 5387561d2b 器械工位上货等相关问题修改 9 months ago
chenhc 23e199af6d fix: 修复原始单据下载本地单据 9 months ago
chenhc 77b0bb79ce fix: 修复原始单据下载本地单据 9 months ago
yewj a250ce1700 备份 9 months ago
chenhc 0c21bd46a3 fix: 修复 9 months ago
qyt a8b853ef96 Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z 9 months ago
qyt 8927680db7 1、增加流通层级默认值为1 9 months ago
chenhc 432882d8ff fix: 修复 9 months ago
chenhc e938cc0c7a fix: 修复 9 months ago
chenhc 2bb5f8b116 fix: 修复 9 months ago
chenhc dbf696db1e feat: 手工、拼箱关联修改 9 months ago
yewj 9782e2a47d 备份 9 months ago
chenhc 18418fa8f0 feat: 手工、拼箱关联修改 9 months ago
yewj 5edf979164 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj 7f8a26354e 重复扫码相关问题 9 months ago
chenhc f1f8847bfe feat: 手工、拼箱关联修改 9 months ago
chenhc 14ae99a760 feat: 拼箱关联 9 months ago
zane d7e6b20bcb 上下货类型 9 months ago
wangwei 372d633d3b 10/12 bug优化1.0 9 months ago
chenhc 59614c8fc1 feat: 拼箱关联 9 months ago
zane 84d2f939ae 暂存 9 months ago
wangwei aaed60e9cc 10/10 bug优化1.0 9 months ago
zane d81671b20d 失效日期 9 months ago
wangwei 125b6c9736 10/8 现场管理优化 9 months ago
zane f72a821392 关联码 9 months ago
yewj 18a47639f5 产品过期提醒 9 months ago
yewj 932387a90f 新增不良产品信息库 9 months ago
chenhc 2884de554f feat: 单据下载-器械 9 months ago
zane 7c954014c5 关联码 9 months ago
wangwei b4217ac5d6 10/8 查询优化1.0 9 months ago
yewj 3ee4a3291f 未上架拆零 9 months ago
yewj b7ff531f30 系统繁忙修改 9 months ago
yewj 7839465aac 工位扣减库存扫码数量问题 9 months ago
wangwei c12798ad5d 9/29 页面优化 更改单据id为Long 9 months ago
chenhc 7d4811ebb3 feat: 拆包失效进行损耗出库 9 months ago
chenhc 6f92047212 feat: 产品记录页面 9 months ago
chenhc 88d147eb5d feat: 产品记录页面 9 months ago
chenhc c17bb88f8c feat: 产品记录页面 9 months ago
yewj af07643adf 扫码校验 9 months ago
wangwei 28bda3c70c 9/29 工位维护增加上货工位 9 months ago
yewj 4d73efd7ac 工位库存,上货,拆零等相关修改 9 months ago
yewj 38dcaae1e2 工位库存,上货,拆零等相关修改 9 months ago
yewj 82b6b1ddf9 bug修改 9 months ago
yewj 8ed250abe8 包装层级数量修改 9 months ago
zane 1894cfec9a 上传关联2.0 9 months ago
zane adb7d0ed2c 上传关联2.0 9 months ago
yewj 2b0eab6452 工位上货接口独立 9 months ago
zane 3df1ede2c4 上传关联优化 9 months ago
wangwei 73c5b8940c 9/27 xml位置改变 9 months ago
wangwei 6b10bdf8e1 9/27 9 months ago
wangwei 3de8e4aaa6 9/27 生成 9 months ago
chenhc 93851eb11c feat: 器械处方 9 months ago
chenhc 1f565dc9a9 feat: 器械处方 9 months ago
zane e93c8bfb25 上传关联 9 months ago
zane 00ec6eca85 上传关联 9 months ago
zane c565b37b4f 上传关联 9 months ago
chenhc dbe6477e09 feat: 器械处方 9 months ago
chenhc d387a3e6be feat: 初始化层级码关联关系 9 months ago
wangwei 55e7050e58 9/25 1.0 10 months ago
wangwei 19362f7032 9/25 药品层级优化 10 months ago
yewj d4856b2df5 使用层级数量 10 months ago
chenhc dfcf62f1a8 feat: 修复 10 months ago
wangwei 820b698cbe 9/24 现场管理bug优化1.0 10 months ago
chenhc dab3a664e5 feat: 修复 10 months ago
chenhc 6af801c20a feat: 修复 10 months ago
chenhc 4ebf9eedf3 feat: 修复 10 months ago
chenhc 67e4600796 feat: 修复 10 months ago
yewj 06c84bcb14 工位上货问题,单据详情 10 months ago
yewj 19cc9a46a6 代码备份 10 months ago
yewj ec6c04999a 关键字查询修改 10 months ago
wangwei 415ec8729b 9/19 追溯码备份查询1.0 10 months ago
yewj 01028cc67f 修改扫码单生成业务单逻辑 10 months ago
wangwei d56d8b99c6 9/18 现场管理优化1.0 10 months ago
chenhc 661dd402cb feat: 下载处方key模糊、修复分页接口 10 months ago
chenhc 9fd7db20d7 feat: 定时设置结合业务 10 months ago
chenhc fa2ca710bd fix: 三方单据查询分页增加模糊key 10 months ago
yewj e881336059 单据配置相关修改 10 months ago
yewj 0c6a6341ef 单据上传相关修改 10 months ago
yewj 3047f89cc1 代码备份 10 months ago
wangwei e077eb262c 9/14 判断当前工位是在处理单据 10 months ago
yewj 5b42e35df6 代码备份 10 months ago
chenhc f1601e673f fix: 修复原始单据 10 months ago
chenhc 4b43b43efa fix: 修复原始单据 10 months ago
chenhc a7b3ffced2 fix: 修复原始单据 10 months ago
wangwei 609e7b9e84 9/14 工位优化 10 months ago
wangwei 97484a6e10 9/14 youhua 10 months ago
wangwei 787e9f220c 9/14 优化 10 months ago
yewj b42b4d272a 取消单据,提示修改 10 months ago
yewj db7acbb48c 处理单据相关修改 10 months ago
yewj 5fc0d84bff 待处理单据 10 months ago
yewj 79a2e44340 原始单据下载问题 10 months ago
yewj 6981fba035 代码备份 10 months ago
chenhc 902be7b1b6 fix: 修复 10 months ago