Commit Graph

1493 Commits (8d2f1ff615869514d2dab8df5c6c210c49dd2359)

Author SHA1 Message Date
wangwei 57b60cddc0 11/27 上货工位-货架打印优化 8 months ago
yewj 1e1672da9f 自动赋码任务修改,完成单据兼容自动赋码 8 months ago
wangwei 34b5dd1dfe 11/27 查询优化撤回 修改药品选入diType类型 8 months ago
wangwei eee7553e6b 11/27 产品查询优化 8 months ago
qiuyt 46e96c44e1 第三方基础数据拉取查询问题 8 months ago
yewj edad8988dd 关联关系临时解决 8 months ago
chenhc 9341f2bdf0 fix:修复 8 months ago
wangwei 468a7aeb08 11/25 申购查询显示优化1.0 8 months ago
chenhc c0111c959b fix:修复 8 months ago
yewj a1fd086920 基础信息选入问题,拉单问题 8 months ago
wangwei ab3e5a7173 11/22 临时码表不存在去正式码表搜索1.0 8 months ago
wangwei 9aa9c9b509 11/21 码明细插入批次号 生产日期 失效日期 8 months ago
qiuyt 764d430322 1、工位上货大码包装只加入下面一级码 一级码就直接加入 8 months ago
qiuyt 8be0b3b5a8 1、单据上传统计界面增加采购和销售 码数进行计算开发 8 months ago
wangwei 56e74bade8 11/20 药品带票出入库查询优化1.0 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
chenhc 9115551dfd feat: 修复 8 months ago
yewj afd6253b7c bug修改 8 months ago
yewj 55beb3b285 处理单据,关联关系问题等 8 months ago
wangwei 924debdaee 11/13 上货增加虚拟槽位1.0 8 months ago
yewj 38165b4cc8 层级校验修改 8 months ago
chenhc 2a4601b681 feat: 修复 8 months ago
wangwei 2493f0d8a6 11/12 槽位管理解除产品 8 months ago
chenhc 7b8a4a6555 feat: 阿里药品加批准文号 8 months ago
wangwei c814146f6c 11/12 上货时对取货槽,产品判断 8 months ago
wangwei 61f775940e 11/11 bug优化1.0 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
chenhc d8ac8c152e fix:修复 8 months ago
yewj 9d99ccb322 拆零数量不足判断 8 months ago
wangwei 8c35a2be71 出货槽 分页接口 8 months ago
yewj 8670d53fce 业务详情关联取货槽编码 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
yewj b97e374e66 新增取货确认 8 months ago
yewj 1a2a766a54 代码备份 8 months ago
wangwei cc6f9109fa 11/7 打印功能 8 months ago
chenhc 25a0b9b9a4 fix:优化关联关系 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 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
wangwei ab7a0474d2 11/4 上货产品是否属于本货位 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 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 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 346a0b0413 工位上货扫码移除 8 months ago
wangwei 4d04834a69 10/28 剔除码1.0 9 months ago
yewj a1b5b58845 批量删除问题 9 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
9 months ago
yewj f08e86703a 单据处理相关修改,代码备份 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 d5f3142c43 10/24 bug优化1.0 9 months ago
yewj e5fd1d64f9 代码备份 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
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
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
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
chenhc d4e0b66ff4 feat: 药品关联信息 9 months ago
chenhc 43c5b1923f feat: 修复 9 months ago
chenhc 0c7008a8b7 feat: 药品关联关系是否存在 9 months ago
chenhc e66332e4fb feat: 药品关联信息上下传输功能 9 months ago
wangwei 61e784aca3 10/17 单据增加单据类型(器械/药品)基础数据器械响应优化 9 months ago
yewj 987fb774c0 药品暂时不校验序列号,有bug,药品扫码序列号没有识别到 9 months ago
yewj 08c4123483 库存拆零 9 months ago
wangwei df00fdc69e 10/15 基础数据 器械优化 9 months ago
yewj 5387561d2b 器械工位上货等相关问题修改 9 months ago
chenhc 77b0bb79ce fix: 修复原始单据下载本地单据 9 months ago
chenhc 432882d8ff fix: 修复 9 months ago
yewj 9782e2a47d 备份 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
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
chenhc 182cb345d8 feat: 待处理单据删除增加明细删除 9 months ago
wangwei 125b6c9736 10/8 现场管理优化 9 months ago
yewj 932387a90f 新增不良产品信息库 9 months ago
zane 7c954014c5 关联码 9 months ago
wangwei b4217ac5d6 10/8 查询优化1.0 9 months ago
yewj 3ee4a3291f 未上架拆零 9 months ago
yewj 84639dac58 适配平板修改 9 months ago
yewj 673532e300 pda,平板修改 9 months ago
yewj b7ff531f30 系统繁忙修改 9 months ago
yewj 67d872e446 系统繁忙修改 9 months ago
yewj 3395c439d1 系统繁忙修改 9 months ago
yewj 7839465aac 工位扣减库存扫码数量问题 9 months ago
chenhc e8d2c8be83 feat: 用户编辑 9 months ago
chenhc 6f92047212 feat: 产品记录页面 9 months ago
chenhc 88d147eb5d feat: 产品记录页面 9 months ago
yewj b3da551677 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj bb274d15fd 登录相关修改 9 months ago
chenhc c17bb88f8c feat: 产品记录页面 9 months ago
yewj 4b464925ba Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj b59b7d75ad 器械计量设置 9 months ago
wangwei 9b5e03278e 9/29 工位维护-上货工位优化1.0 9 months ago
yewj af07643adf 扫码校验 9 months ago
wangwei 28bda3c70c 9/29 工位维护增加上货工位 9 months ago
yewj 38dcaae1e2 工位库存,上货,拆零等相关修改 10 months ago
yewj 82b6b1ddf9 bug修改 10 months ago
yewj 8ed250abe8 包装层级数量修改 10 months ago
zane adb7d0ed2c 上传关联2.0 10 months ago
yewj 2b0eab6452 工位上货接口独立 10 months ago
wangwei d9078fe7d8 9/27 优化页面查询条件1.0 10 months ago
zane 9a9dafa28c 上传关联优化 10 months ago
wangwei 3de8e4aaa6 9/27 生成 10 months ago
yewj c93e9c68a2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj b309fc5565 工位上货接口独立 10 months ago
zane e93c8bfb25 上传关联 10 months ago
wangwei 39b034ac50 9/26 增加工位类型 10 months ago
zane c565b37b4f 上传关联 10 months ago
chenhc dbe6477e09 feat: 器械处方 10 months ago
zane 1fa6991f90 退货校验 10 months ago
wangwei 19362f7032 9/25 药品层级优化 10 months ago
yewj c530e04750 现场管理业务名称 10 months ago
wangwei 820b698cbe 9/24 现场管理bug优化1.0 10 months ago
chenhc 67e4600796 feat: 修复 10 months ago
yewj 8c94f1db23 PDA登录修改,单据查询post 10 months ago
yewj 5b19a7aef1 选中单据下载,多码添加问题 10 months ago
wangwei d10c449420 9/21 优化1.0 10 months ago
yewj 19cc9a46a6 代码备份 10 months ago
chenhc 3d59c98962 feat: 修复 10 months ago
chenhc 6cfb262075 feat: 修复 10 months ago
yewj ec6c04999a 关键字查询修改 10 months ago
chenhc 47f1b6875d feat: 工位上货选已完成单 10 months ago
wangwei 415ec8729b 9/19 追溯码备份查询1.0 10 months ago
yewj 01028cc67f 修改扫码单生成业务单逻辑 10 months ago
yewj 1d73e94df8 代码备份 10 months ago
chenhc 574bc32f3d feat: 下载高级搜索 收货发货 10 months ago
chenhc 661dd402cb feat: 下载处方key模糊、修复分页接口 10 months ago
chenhc 25b40f33de feat: 下载处方key模糊、修复分页接口 10 months ago
yewj ea8b6e3d31 代码备份 10 months ago
chenhc 9fd7db20d7 feat: 定时设置结合业务 10 months ago
chenhc fa2ca710bd fix: 三方单据查询分页增加模糊key 10 months ago
yewj e881336059 单据配置相关修改 10 months ago
chenhc f392e7888b fix: 三方单据查询分页增加模糊key 10 months ago
yewj 0c6a6341ef 单据上传相关修改 10 months ago
yewj ef17ecec51 代码备份 10 months ago
wangwei e077eb262c 9/14 判断当前工位是在处理单据 10 months ago
yewj 5b42e35df6 代码备份 10 months ago
chenhc c83afb9459 fix: 修复原始单据 10 months ago
chenhc a7b3ffced2 fix: 修复原始单据 10 months ago
wangwei 787e9f220c 9/14 优化 10 months ago
yewj b42b4d272a 取消单据,提示修改 10 months ago
yewj db7acbb48c 处理单据相关修改 10 months ago
chenhc f50097ee87 fix: 修复处理单据扫码回车 10 months ago
yewj a96d25b8bc 代码备份 10 months ago
yewj 5fc0d84bff 待处理单据 10 months ago