Commit Graph

2385 Commits (e492e33b3b0c90b8e7fa97ed79544900ae983b99)

Author SHA1 Message Date
yewj afd6253b7c bug修改 8 months ago
wangwei 4a552f3ac8 11/14 现场管理规格字段展示优化1.0 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
yewj 38165b4cc8 层级校验修改 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 78bb88d03d feat: 药品关联关系查重功能 8 months ago
chenhc 37f27adf68 fix:阿里药品关系维护 8 months ago
wangwei c814146f6c 11/12 上货时对取货槽,产品判断 8 months ago
chenhc 4c0140e05a fix:层级文件上传 8 months ago
wangwei 61f775940e 11/11 bug优化1.0 8 months ago
chenhc 4745da8c22 fix:暂存 8 months ago
wangwei 19dce5ea32 11/11 提示优化1.0 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
chenhc 5d7506360b fix:槽位关联关系 8 months ago
qiuyt 59818217ce 1、增加签到字段
2、校验码是和下级所有码否传过了逻辑还没写
8 months ago
chenhc d8ac8c152e fix:修复 8 months ago
yewj 9d99ccb322 拆零数量不足判断 8 months ago
wangwei 8c35a2be71 出货槽 分页接口 8 months ago
yewj 8670d53fce 业务详情关联取货槽编码 8 months ago
wangwei 3cfddaba55 出货槽增加产品属性id 8 months ago
wangwei 06625600ac 11/9 增加摆货层高度 根据货架查看摆货层和出货槽 8 months ago
yewj a74fe8a6c3 确认取药全部完成确认 8 months ago
yewj 25470950c7 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 8 months ago
yewj d0fb49b0bd 确认取药 8 months ago
chenhc 296a094765 fix:业务类型增加回传参数设置、单据明细card页面 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 25a0b9b9a4 fix:优化关联关系 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
wangwei d2d57a13ee 11/7 货架管理1.1 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 ac6dc59303 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 8 months ago
yewj 8bdd8ad3b8 单据审核问题 8 months ago
chenhc ea5ad5220f fix:修复 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 96f8d0f76d 平板工位上货问题 8 months ago
yewj d885e26775 平板工位上货问题 8 months ago
yewj 4bb3ffb274 平板工位上货问题 8 months ago
yewj c6ad3e0bed 多码提交确认 8 months ago
yewj 1b1474307d 处理单据确认 8 months ago
wangwei 63c1f5f351 10/31 上货工位增加货位 8 months ago
chenhc a24a8c5348 feat: 拆零扫码确认 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 a1b5b58845 批量删除问题 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
chenhc 67d6056b66 feat: 上传多码融合 9 months ago
wangwei df185518ed 10/25 bug 优化 1.0 9 months ago
chenhc 906f15b300 feat: 上传多码融合 9 months ago
chenhc 4f22588cf8 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 e03511d6b8 feat: 多码融合 9 months ago
chenhc 3c8db94c77 feat: 多码融合 9 months ago
chenhc ed48569d2d feat: 多码融合 9 months ago
wangwei 0907e42e4e 10/23 bug优化1.0 9 months ago
yewj ace1830bbb 代码备份 9 months ago
chenhc 93cf1636f3 feat: 多码融合 9 months ago
qyt 0fbeb2ae09 仓库逻辑改变仓库详情的逻辑都改成仓库表(第二次更新) 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
chenhc 9e318b8f8e fix: 修复工位库存 9 months ago
wangwei f23db0fe4a 10/22 库存优化 9 months ago
yewj 7d7ac52514 修改扫码减一删除,修改扫码数量,以及PDA扫码时流通时,使用时数量计算 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
yewj 321d4ad85e 选单搜索 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
qyt bef6e840ce UdiTraceController 接口兼容修改 9 months ago
yewj 9f46579a9d 查询码明细修改 9 months ago
chenhc 4d4e4e8760 feat: 内网拉取外网单据 9 months ago
yewj 7d4e190b05 单据完成修改 9 months ago
chenhc a17b725415 feat: 拉取外网单据 9 months ago
yewj e3f53aabac 代码备份 9 months ago
qyt 3813dd8295 仓库逻辑改变仓库详情的逻辑都改成仓库表(第一次更新) 9 months ago
yewj 5662dc31d6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj f42eaebbb6 代码备份 9 months ago
wangwei d23572b7cf 10/21 同步单据修改 9 months ago
yewj afed3289bd 选择已完成单据问题 9 months ago
yewj c2b0c69ef3 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj 5f915dffe2 工位上货问题 9 months ago
chenhc d4e0b66ff4 feat: 药品关联信息 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 081bf3c658 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
chenhc bfaae7675e feat: 药品关联关系功能 9 months ago
yewj 987fb774c0 药品暂时不校验序列号,有bug,药品扫码序列号没有识别到 9 months ago
yewj cd2f580e0a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj 08c4123483 库存拆零 9 months ago
chenhc dcfa320847 fix: 拉取外网药品关联信息 9 months ago
qyt fa02aaa439 1、耗材字典信息表 备注有误修改 9 months ago
yewj d313d19f35 删除库存明细 9 months ago
wangwei df00fdc69e 10/15 基础数据 器械优化 9 months ago