Commit Graph

2646 Commits (dev_xcgl)

Author SHA1 Message Date
yewj 4bba7945b1 扫码关联关系等相关修改 12 months ago
yewj b250e7b930 扫码关联关系等相关修改 12 months ago
wangwei 4223be84b5 11/8 12 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
12 months ago
wangwei 8d6388c62e 11/8 工位库存增加卡槽编码 12 months ago
yewj b97e374e66 新增取货确认 12 months ago
yewj 1a2a766a54 代码备份 12 months ago
wangwei cc6f9109fa 11/7 打印功能 12 months ago
chenhc 25a0b9b9a4 fix:优化关联关系 12 months ago
chenhc 1762f69d83 fix:优化关联关系 12 months ago
chenhc b58e4aae8c fix:优化关联关系 12 months ago
wangwei 7651031603 11/7 取货架删除 12 months ago
wangwei 1e36dfa587 11/7 摆货层删除 12 months ago
wangwei 5d9f2ced7e 11/7 卡槽增加货位1.0 12 months ago
wangwei 1bc6c7319c 货架code 12 months ago
wangwei d2d57a13ee 11/7 货架管理1.1 12 months ago
yewj 9bfc063682 现场管理单据审核 12 months ago
wangwei c702d8b9cf 10/31 上货工位增加货位 12 months ago
wangwei 7b87723552 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 12 months ago
wangwei af8e236530 11/6 货架管理1.0 12 months ago
yewj ac6dc59303 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 12 months ago
yewj 8bdd8ad3b8 单据审核问题 12 months ago
chenhc ea5ad5220f fix:修复 12 months ago
wangwei efdc7cb70f 11/5 增加货架功能,优化货位1.0 12 months ago
yewj 605287e869 最后一个码拆零 12 months ago
yewj af172bea40 自动赋码问题修改 12 months ago
wangwei ab7a0474d2 11/4 上货产品是否属于本货位 12 months ago
chenhc 0e441c3bda feat: 码明细到国家同步库 12 months ago
yewj ed735aa532 判断当前工位底下是否有其他产品 1 year ago
yewj a8db4fcdc3 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj e6b631a5c7 根据工位货位队列判断是否同一个产品 1 year ago
wangwei fa706b6abb 11/01 bug优化1.0 1 year ago
chenhc f28501c3d8 fix: 修复 1 year ago
chenhc 23c3b5d288 fix: 修复 1 year ago
yewj 370a1c77a3 平板工位上货问题 1 year ago
yewj 96f8d0f76d 平板工位上货问题 1 year ago
yewj d885e26775 平板工位上货问题 1 year ago
yewj 4bb3ffb274 平板工位上货问题 1 year ago
yewj c6ad3e0bed 多码提交确认 1 year ago
yewj 1b1474307d 处理单据确认 1 year ago
wangwei 63c1f5f351 10/31 上货工位增加货位 1 year ago
chenhc a24a8c5348 feat: 拆零扫码确认 1 year ago
yewj abf62a7bc3 新增工位上货货位编码,新增处理单据扫码确认 1 year 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
1 year ago
wangwei b11c7b3d1b 10/31 工位分格1.0 1 year ago
yewj 43e8094c40 新增工位上货货位编码,新增处理单据扫码确认 1 year ago
wangwei 1f92ad7a9a 10/30 工位分格1.0 1 year ago
yewj b183c8c519 工位添加格子编码 1 year ago
yewj 346a0b0413 工位上货扫码移除 1 year ago
wangwei 4d04834a69 10/28 剔除码1.0 1 year ago
yewj a1b5b58845 批量删除问题 1 year 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
1 year ago
yewj f08e86703a 单据处理相关修改,代码备份 1 year ago
chenhc 67d6056b66 feat: 上传多码融合 1 year ago
wangwei df185518ed 10/25 bug 优化 1.0 1 year ago
chenhc 906f15b300 feat: 上传多码融合 1 year ago
chenhc 4f22588cf8 feat: 多码融合 1 year ago
wangwei c992490c13 10/24 bug优化1.0 1 year ago
wangwei d5f3142c43 10/24 bug优化1.0 1 year ago
yewj e5fd1d64f9 代码备份 1 year ago
chenhc e03511d6b8 feat: 多码融合 1 year ago
chenhc 3c8db94c77 feat: 多码融合 1 year ago
chenhc ed48569d2d feat: 多码融合 1 year ago
wangwei 0907e42e4e 10/23 bug优化1.0 1 year ago
yewj ace1830bbb 代码备份 1 year ago
chenhc 93cf1636f3 feat: 多码融合 1 year ago
qyt 0fbeb2ae09 仓库逻辑改变仓库详情的逻辑都改成仓库表(第二次更新) 1 year ago
qyt 4168a85ccb Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z 1 year ago
wangwei fdb95857cc Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 3021ca2d16 10/22 优化1.0 1 year ago
yewj 0b10eb6610 代码备份 1 year ago
chenhc 9e318b8f8e fix: 修复工位库存 1 year ago
wangwei f23db0fe4a 10/22 库存优化 1 year ago
yewj 7d7ac52514 修改扫码减一删除,修改扫码数量,以及PDA扫码时流通时,使用时数量计算 1 year ago
qyt 2df7c3fb94 Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z 1 year ago
chenhc a0dba60a33 feat: 码明细 1 year ago
yewj 321d4ad85e 选单搜索 1 year ago
qyt 589e368744 Merge branch 'dev_no_inv' into dev_fifo_z
# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
1 year ago
qyt bef6e840ce UdiTraceController 接口兼容修改 1 year ago
yewj 9f46579a9d 查询码明细修改 1 year ago
chenhc 4d4e4e8760 feat: 内网拉取外网单据 1 year ago
yewj 7d4e190b05 单据完成修改 1 year ago
chenhc a17b725415 feat: 拉取外网单据 1 year ago
yewj e3f53aabac 代码备份 1 year ago
qyt 3813dd8295 仓库逻辑改变仓库详情的逻辑都改成仓库表(第一次更新) 1 year ago
yewj 5662dc31d6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj f42eaebbb6 代码备份 1 year ago
wangwei d23572b7cf 10/21 同步单据修改 1 year ago
yewj afed3289bd 选择已完成单据问题 1 year ago
yewj c2b0c69ef3 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 5f915dffe2 工位上货问题 1 year ago
chenhc d4e0b66ff4 feat: 药品关联信息 1 year ago
yewj f614074665 器械扫码拆零问题 1 year ago
yewj 86ba1f0dfe 器械扫码拆零问题 1 year ago
chenhc 43c5b1923f feat: 修复 1 year ago
chenhc 86f229fd69 feat: 修复 1 year ago
chenhc 0c7008a8b7 feat: 药品关联关系是否存在 1 year ago
yewj 714531279f Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj b3291be59c 拆零管理大改 1 year ago
wangwei 3f2f2edf30 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
chenhc e66332e4fb feat: 药品关联信息上下传输功能 1 year ago
wangwei 2a1ff42fe7 10/17 代码备份1.0 1 year ago
yewj 29bfdc9725 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj f6fbc4272b 器械层级修改 1 year ago
wangwei 61e784aca3 10/17 单据增加单据类型(器械/药品)基础数据器械响应优化 1 year ago
chenhc 081bf3c658 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
chenhc bfaae7675e feat: 药品关联关系功能 1 year ago
yewj 987fb774c0 药品暂时不校验序列号,有bug,药品扫码序列号没有识别到 1 year ago
yewj cd2f580e0a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 08c4123483 库存拆零 1 year ago
chenhc dcfa320847 fix: 拉取外网药品关联信息 1 year ago
qyt fa02aaa439 1、耗材字典信息表 备注有误修改 1 year ago
yewj d313d19f35 删除库存明细 1 year ago
wangwei df00fdc69e 10/15 基础数据 器械优化 1 year ago
yewj 5387561d2b 器械工位上货等相关问题修改 1 year ago
chenhc 23e199af6d fix: 修复原始单据下载本地单据 1 year ago
chenhc 77b0bb79ce fix: 修复原始单据下载本地单据 1 year ago
yewj a250ce1700 备份 1 year ago
chenhc 0c21bd46a3 fix: 修复 1 year ago
qyt a8b853ef96 Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z 1 year ago
qyt 8927680db7 1、增加流通层级默认值为1 1 year ago
chenhc 432882d8ff fix: 修复 1 year ago
chenhc e938cc0c7a fix: 修复 1 year ago
chenhc 2bb5f8b116 fix: 修复 1 year ago
chenhc dbf696db1e feat: 手工、拼箱关联修改 1 year ago
yewj 9782e2a47d 备份 1 year ago
chenhc 18418fa8f0 feat: 手工、拼箱关联修改 1 year ago
yewj 5edf979164 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 7f8a26354e 重复扫码相关问题 1 year ago
chenhc f1f8847bfe feat: 手工、拼箱关联修改 1 year ago
chenhc 14ae99a760 feat: 拼箱关联 1 year ago
zane d7e6b20bcb 上下货类型 1 year ago
wangwei 372d633d3b 10/12 bug优化1.0 1 year ago
chenhc 59614c8fc1 feat: 拼箱关联 1 year ago
zane dafeed6667 还原 1 year ago
chenhc 0014b8b1d3 feat: 手动关联 1 year ago
zane 84d2f939ae 暂存 1 year ago
wangwei aaed60e9cc 10/10 bug优化1.0 1 year ago
chenhc 182cb345d8 feat: 待处理单据删除增加明细删除 1 year ago
zane d81671b20d 失效日期 1 year ago
wangwei 125b6c9736 10/8 现场管理优化 1 year ago
zane f72a821392 关联码 1 year ago
yewj 18a47639f5 产品过期提醒 1 year ago
yewj 932387a90f 新增不良产品信息库 1 year ago
chenhc 2884de554f feat: 单据下载-器械 1 year ago
zane 7c954014c5 关联码 1 year ago
wangwei b4217ac5d6 10/8 查询优化1.0 1 year ago
yewj 3ee4a3291f 未上架拆零 1 year ago
yewj 84639dac58 适配平板修改 1 year ago
yewj 673532e300 pda,平板修改 1 year ago
yewj b7ff531f30 系统繁忙修改 1 year ago
chenhc eeab9775bb feat: 捕获自动拉取原始单据异常 1 year ago
yewj 67d872e446 系统繁忙修改 1 year ago
yewj 3395c439d1 系统繁忙修改 1 year ago
yewj 7839465aac 工位扣减库存扫码数量问题 1 year ago
chenhc e8d2c8be83 feat: 用户编辑 1 year ago
wangwei c12798ad5d 9/29 页面优化 更改单据id为Long 1 year ago
chenhc 7d4811ebb3 feat: 拆包失效进行损耗出库 1 year ago
chenhc 6f92047212 feat: 产品记录页面 1 year ago
chenhc 88d147eb5d feat: 产品记录页面 1 year ago
yewj b3da551677 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj bb274d15fd 登录相关修改 1 year ago
chenhc c17bb88f8c feat: 产品记录页面 1 year ago
yewj 4b464925ba Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj b59b7d75ad 器械计量设置 1 year ago
wangwei 9b5e03278e 9/29 工位维护-上货工位优化1.0 1 year ago
yewj fdf1c2e178 添加产品系统繁忙 1 year ago
yewj af07643adf 扫码校验 1 year ago
wangwei 28bda3c70c 9/29 工位维护增加上货工位 1 year ago
yewj 4d73efd7ac 工位库存,上货,拆零等相关修改 1 year ago
yewj 38dcaae1e2 工位库存,上货,拆零等相关修改 1 year ago
yewj 82b6b1ddf9 bug修改 1 year ago
yewj 57fb77adda 代码备份 1 year ago
yewj 7c6e8dc929 代码备份 1 year ago
yewj 8ed250abe8 包装层级数量修改 1 year ago
zane 1894cfec9a 上传关联2.0 1 year ago
zane adb7d0ed2c 上传关联2.0 1 year ago
yewj 8b1cc5b0f9 sys_workplace_put_rel,io_split_fifo_inv_rel脚本 1 year ago
yewj 2b0eab6452 工位上货接口独立 1 year ago
wangwei d9078fe7d8 9/27 优化页面查询条件1.0 1 year ago
zane 3df1ede2c4 上传关联优化 1 year ago
zane 9a9dafa28c 上传关联优化 1 year ago
wangwei 73c5b8940c 9/27 xml位置改变 1 year ago
wangwei 6b10bdf8e1 9/27 1 year ago
wangwei 3de8e4aaa6 9/27 生成 1 year ago
chenhc 93851eb11c feat: 器械处方 1 year ago
chenhc 1f565dc9a9 feat: 器械处方 1 year ago
yewj c93e9c68a2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj b309fc5565 工位上货接口独立 1 year ago
zane e93c8bfb25 上传关联 1 year ago
wangwei d45ef6a53e 9/26 优化1.0 1 year ago
wangwei 39b034ac50 9/26 增加工位类型 1 year ago
zane 00ec6eca85 上传关联 1 year ago
zane c565b37b4f 上传关联 1 year ago
chenhc dbe6477e09 feat: 器械处方 1 year ago
wangwei f43ff8d1f4 9/26 业务类型增加出入库方式1.0 1 year ago
chenhc d387a3e6be feat: 初始化层级码关联关系 1 year ago
zane 1fa6991f90 退货校验 1 year ago
chenhc 7d917318ca feat: 修复分组 1 year ago
wangwei 55e7050e58 9/25 1.0 1 year ago
wangwei 19362f7032 9/25 药品层级优化 1 year ago
yewj d4856b2df5 使用层级数量 1 year ago
yewj c530e04750 现场管理业务名称 1 year ago
chenhc dfcf62f1a8 feat: 修复 1 year ago
wangwei 820b698cbe 9/24 现场管理bug优化1.0 1 year ago
chenhc dab3a664e5 feat: 修复 1 year ago
chenhc 6af801c20a feat: 修复 1 year ago
chenhc 4ebf9eedf3 feat: 修复 1 year ago
chenhc 67e4600796 feat: 修复 1 year ago
yewj 8c94f1db23 PDA登录修改,单据查询post 1 year ago
yewj 06c84bcb14 工位上货问题,单据详情 1 year ago
yewj 5b19a7aef1 选中单据下载,多码添加问题 1 year ago
wangwei d10c449420 9/21 优化1.0 1 year ago
yewj 19cc9a46a6 代码备份 1 year ago
chenhc 8346812955 feat: 修复 1 year ago
chenhc 3d59c98962 feat: 修复 1 year ago
chenhc 6cfb262075 feat: 修复 1 year ago
yewj ec6c04999a 关键字查询修改 1 year ago
chenhc 47f1b6875d feat: 工位上货选已完成单 1 year ago
wangwei 415ec8729b 9/19 追溯码备份查询1.0 1 year ago
yewj 01028cc67f 修改扫码单生成业务单逻辑 1 year ago
yewj ead85598dc Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 1d73e94df8 代码备份 1 year ago
wangwei d56d8b99c6 9/18 现场管理优化1.0 1 year ago
wangwei e53cfd2c25 9/118 现场管理工位作业 搜索字段优化 1 year ago
chenhc 574bc32f3d feat: 下载高级搜索 收货发货 1 year ago
chenhc 661dd402cb feat: 下载处方key模糊、修复分页接口 1 year ago
chenhc 25b40f33de feat: 下载处方key模糊、修复分页接口 1 year ago
yewj ea8b6e3d31 代码备份 1 year ago
wangwei 39a2b2ca54 9/18 拆零管理搜索字段优化 1 year ago
chenhc 9fd7db20d7 feat: 定时设置结合业务 1 year ago
wangwei 0b32274b65 9/18 字段查询优化 1 year ago
chenhc fa2ca710bd fix: 三方单据查询分页增加模糊key 1 year ago
wangwei c612696cae 9/17 字段搜索优化1.0 1 year ago
yewj e881336059 单据配置相关修改 1 year ago
chenhc f392e7888b fix: 三方单据查询分页增加模糊key 1 year ago
yewj 0c6a6341ef 单据上传相关修改 1 year ago
yewj ef17ecec51 代码备份 1 year ago
yewj 3047f89cc1 代码备份 1 year ago
yewj 079bbd5e22 新增第三方单据类型编码 1 year ago
yewj a394586976 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 47fcc01651 修改界面配置是否常用字段,修改数据库为线上数据库 1 year ago
wangwei e077eb262c 9/14 判断当前工位是在处理单据 1 year ago
chenhc 23d9b46917 fix: 修复原始单据 1 year ago
yewj 74295f16e8 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj e83ea0388d 新增发货方 1 year ago
chenhc d7c6d4bbfe fix: 修复原始单据 1 year ago
yewj 5b42e35df6 代码备份 1 year ago
chenhc f1601e673f fix: 修复原始单据 1 year ago
wangwei ed415e534f 9/11 业务类型增加收货方送货方 1 year ago