Commit Graph

1512 Commits (e8b6397294a13285c3d679de91748256c55892f1)

Author SHA1 Message Date
chenhc e15f1c1fd8 fix:修复 6 months ago
chenhc 59195e2e0f feat: 药房上货推荐单 6 months ago
chenhc bcd25d976a feat: 药房上货推荐单 6 months ago
wangwei aef1ca0d6c 1/17 选入采集工位增加部门条件1.0 6 months ago
chenhc bbdc772231 feat: 优化 6 months ago
chenhc 4b7e671514 fix: 修复事务 6 months ago
chenhc 7c8b73e410 fix: 货柜预览图 6 months ago
chenhc 00688e24ae fix: 库存预警 6 months ago
chenhc 4cc4f5ec8b fix: 库存预警 6 months ago
wangwei a9d0681260 1/14 新增槽位 高度 药品 预警数 预警开关 6 months ago
chenhc 7f3b121d54 fix: 优化 6 months ago
wangwei fe5fc6a089 1/13 码校验优化1.0 6 months ago
chenhc 1bbb57dd78 feat: 只允许上货单一产品开关0 6 months ago
yewj f8ca8d7ef1 拆零确认,规格型号等一些修改 6 months ago
chenhc 4a3d11af1b feat: 增加上货记录 6 months ago
yewj 030bb804a7 下载单据死循环修改 6 months ago
wangwei 7458c4e250 1/6 取货架设置是都属于单产品槽位 默认为是 6 months ago
yewj f4ff112ea9 根据配置修改是否启用扫码拆零确认 6 months ago
wangwei cfce757ff7 1/4 代码优化 6 months ago
yewj b9e8dea931 灯组剂量单位修改 7 months ago
wangwei ebea2a4dc9 12/31 灯组1.3 7 months ago
wangwei 01036e5cfb 12/31 现场管理单据详情表增加槽位字段和灯组 7 months ago
yewj 73f8be2082 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
yewj c01b43beb0 取药确认 7 months ago
wangwei 8d3923e94e 12/31 灯组管理优化1.2 7 months ago
wangwei 76c6d5ed71 12/31 灯组修改 7 months ago
wangwei fd5b500f15 12/31 灯组 7 months ago
yewj 36eb5ad134 器械拆零问题 7 months ago
qiuyt 03fd8680bf 从供应商选入药品选入药品层级功能搬到内网 7 months ago
yewj 458bf6c817 补齐checkCode 7 months ago
yewj 0d3aa74cda 自动上货分配槽位 7 months ago
wangwei e492e33b3b 12/20 bug修改 现场管理 7 months ago
wangwei 68057172b7 12/19 字段优化1 7 months ago
yewj 0256dbf20b 修改单据 7 months ago
wangwei 7520e93a91 12/13 码校验调整1.0 7 months ago
wangwei 71c198668f Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
7 months ago
wangwei 1dfabbdc42 12/12 已完成单据 详情优化 7 months ago
chenhc 0f26f7f4d4 fix: 工位单据类型增加是否上传医保参数 7 months ago
wangwei 72699ee8fc 12/12 字段优化1.0 7 months ago
wangwei 74501c23ce Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
yewj 4975422c12 修改带校验,库存等 7 months ago
wangwei 0e70cb18eb 12/12 代码备份 扫码校验1.0 7 months ago
wangwei 17a392e687 12/9 已完成单扫码校验1.0 7 months ago
yewj 14875c39a2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
yewj 151ad2ed2d 审核送货单带入扫码明细, 7 months ago
wangwei 2cf859a630 12/9 价格显示问题1.0 7 months ago
yewj c0363c564e 扫码数量计算错误问题 7 months ago
qiuyt 3e9eb6de76 1、菜单更新 7 months ago
wangwei abf80eeb07 12/6 字段查询优化 7 months ago
qiuyt ed9a13f65b 1、选入药品bug
2、医保上传统计问题
7 months ago
wangwei 9dbc74c56f 12/6 现场管理 扫码成功后产品信息展示补齐 7 months ago
qiuyt d6809e34f5 1、key使用阿里用户表获取 7 months ago
qiuyt af003ea3cf 1、选入药品调用国家库或者阿里接口进行拉取药品码段数据插入我们的表
2、医保接口也没有的时候也调用接口
3、医保菜单上传
8 months ago
chenhc d639d9bd20 feat: 加定时重载异常单据功能 8 months ago
wangwei a761685950 11/28 内部码分页优化 8 months ago
yewj 0d3e5b670b 现场管理去除掉产品供应商绑定 8 months ago
yewj c88e431977 待审核单据 8 months ago
wangwei 57b60cddc0 11/27 上货工位-货架打印优化 8 months ago
wangwei b145bd513a 11/27 脚本 8 months ago
wangwei 774d2b0366 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 8 months ago
wangwei 78f395ada5 11/27 采集工位-自动采集 8 months ago
yewj 1e1672da9f 自动赋码任务修改,完成单据兼容自动赋码 8 months ago
chenhc 2f798cad04 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
8 months ago
chenhc 647d2c553a fix:修复自动完成tagStatus为1的单据 8 months ago
wangwei 2e35f6d0eb 11/27 工位增加是否自动采集字段 8 months ago
wangwei 2bf59e4d96 11/27 提交 8 months ago
wangwei bed08797dd 11/26 药品业务管理字段优化1.1 8 months ago
qiuyt 69d61b87d2 药品选入bug
单据错误信息字段更改
8 months ago
yewj 862ba42729 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 8 months ago
yewj e838984013 基础信息选入问题 8 months ago
wangwei ae63015073 11/26 sql优化1.1 8 months ago
wangwei 7441b65c35 11/26 药品字典对照条件sql修改 8 months ago
wangwei 468a7aeb08 11/25 申购查询显示优化1.0 8 months ago
yewj a1fd086920 基础信息选入问题,拉单问题 8 months ago
qiuyt e86612240b 管理系统增加扫码的时候如果码关联关系找不到那就调用外网的阿里接口进行插入关联关系 8 months ago
yewj bbdf9c5302 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 8 months ago
yewj 35de11717b 单据处理数量,槽位绑定,扫码明细等 8 months ago
wangwei 8cfbfc56e0 11/21 槽位管理绑定产品进行过滤1.0 8 months ago
qiuyt 8be0b3b5a8 1、单据上传统计界面增加采购和销售 码数进行计算开发 8 months ago
wangwei bf931019d6 11/20 库存查询优化 8 months ago
wangwei 56e74bade8 11/20 药品带票出入库查询优化1.0 8 months ago
qiuyt 8ddb8d340c 1、单据上传统计界面开发
2、单据上传设置在呢个价论述时间定时设置 取消起始上传时间更新逻辑 无限循环处理有问题的单据
8 months ago
wangwei c7f70898e7 11/19 现场管理-已完成单规格显示 8 months ago
wangwei cc284cdd23 查询优化1.0 11/19 8 months ago
yewj dfc9097717 代码备份 8 months ago
yewj 32851dfa59 关联关系修改,处方下载修改 8 months ago
qiuyt 122f698004 上传医保提示优化 8 months ago
qiuyt b00e14a391 创建表语句空格问题 8 months ago
yewj 81622f8fcf bug修改 8 months ago
qiuyt 4acc72064f Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z 8 months ago
qiuyt dd2b6b10ce 采购计划高级查询 8 months ago
wangwei a6d4913e49 11/15 采购订单申购明细 8 months ago
wangwei 4db20f6159 11/15 药品基础信息优化 8 months ago
wangwei f0be935b0b Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 8 months ago
wangwei 186ccd438a 11/14 槽位管理高级搜索 8 months ago
yewj afd6253b7c bug修改 8 months ago
wangwei 4a552f3ac8 11/14 现场管理规格字段展示优化1.0 8 months ago
wangwei e380c8cf1f 11/13 供应商发票优化 8 months ago
yewj 53aa5e4c85 药品层级换算,插入等 8 months ago
qiuyt acc8ee83ea 基础管理的药品字典维护 增加明细分类逻辑 增加药品层级逻辑更改 选入增加明细分类 增加耗材字典表字段 8 months ago
yewj 6c541c8ab9 关联关系问题修改 8 months ago
wangwei 2493f0d8a6 11/12 槽位管理解除产品 8 months ago
chenhc 37f27adf68 fix:阿里药品关系维护 8 months ago
wangwei c814146f6c 11/12 上货时对取货槽,产品判断 8 months ago
wangwei 61f775940e 11/11 bug优化1.0 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
wangwei 8c35a2be71 出货槽 分页接口 8 months ago
yewj 8670d53fce 业务详情关联取货槽编码 8 months ago
wangwei 3cfddaba55 出货槽增加产品属性id 8 months ago
wangwei 06625600ac 11/9 增加摆货层高度 根据货架查看摆货层和出货槽 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 4223be84b5 11/8 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 1762f69d83 fix:优化关联关系 8 months ago
chenhc b58e4aae8c fix:优化关联关系 8 months ago
wangwei 1bc6c7319c 货架code 8 months ago
wangwei d2d57a13ee 11/7 货架管理1.1 8 months ago
wangwei c702d8b9cf 10/31 上货工位增加货位 8 months ago
wangwei af8e236530 11/6 货架管理1.0 8 months ago
wangwei efdc7cb70f 11/5 增加货架功能,优化货位1.0 8 months ago
yewj 605287e869 最后一个码拆零 8 months ago
wangwei ab7a0474d2 11/4 上货产品是否属于本货位 9 months ago
wangwei fa706b6abb 11/01 bug优化1.0 9 months ago
yewj 4bb3ffb274 平板工位上货问题 9 months ago
wangwei 63c1f5f351 10/31 上货工位增加货位 9 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
9 months ago
wangwei b11c7b3d1b 10/31 工位分格1.0 9 months ago
yewj 43e8094c40 新增工位上货货位编码,新增处理单据扫码确认 9 months ago
wangwei 1f92ad7a9a 10/30 工位分格1.0 9 months ago
yewj b183c8c519 工位添加格子编码 9 months ago
wangwei 4d04834a69 10/28 剔除码1.0 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
wangwei d5f3142c43 10/24 bug优化1.0 9 months ago
yewj ace1830bbb 代码备份 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 f23db0fe4a 10/22 库存优化 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 3813dd8295 仓库逻辑改变仓库详情的逻辑都改成仓库表(第一次更新) 9 months ago
yewj f42eaebbb6 代码备份 9 months ago
yewj afed3289bd 选择已完成单据问题 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
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
wangwei df00fdc69e 10/15 基础数据 器械优化 9 months ago
yewj 5387561d2b 器械工位上货等相关问题修改 9 months ago
yewj 7f8a26354e 重复扫码相关问题 9 months ago
zane d7e6b20bcb 上下货类型 9 months ago
wangwei 372d633d3b 10/12 bug优化1.0 9 months ago
chenhc 0014b8b1d3 feat: 手动关联 9 months ago
wangwei aaed60e9cc 10/10 bug优化1.0 9 months ago
zane f72a821392 关联码 9 months ago
yewj 932387a90f 新增不良产品信息库 9 months ago
wangwei b4217ac5d6 10/8 查询优化1.0 9 months ago
yewj 84639dac58 适配平板修改 9 months ago
yewj 673532e300 pda,平板修改 10 months ago
yewj 3395c439d1 系统繁忙修改 10 months ago
wangwei c12798ad5d 9/29 页面优化 更改单据id为Long 10 months ago
chenhc 88d147eb5d feat: 产品记录页面 10 months ago
wangwei 9b5e03278e 9/29 工位维护-上货工位优化1.0 10 months ago
yewj fdf1c2e178 添加产品系统繁忙 10 months ago
wangwei 28bda3c70c 9/29 工位维护增加上货工位 10 months ago
yewj 82b6b1ddf9 bug修改 10 months ago
yewj 57fb77adda 代码备份 10 months ago
yewj 7c6e8dc929 代码备份 10 months ago
yewj 8ed250abe8 包装层级数量修改 10 months ago
zane adb7d0ed2c 上传关联2.0 10 months ago
yewj 8b1cc5b0f9 sys_workplace_put_rel,io_split_fifo_inv_rel脚本 10 months ago
yewj 2b0eab6452 工位上货接口独立 10 months ago
wangwei d9078fe7d8 9/27 优化页面查询条件1.0 10 months ago
wangwei 73c5b8940c 9/27 xml位置改变 10 months ago
wangwei 3de8e4aaa6 9/27 生成 10 months ago
chenhc 93851eb11c feat: 器械处方 10 months ago
chenhc 1f565dc9a9 feat: 器械处方 10 months ago
wangwei d45ef6a53e 9/26 优化1.0 10 months ago
wangwei 39b034ac50 9/26 增加工位类型 10 months ago
zane c565b37b4f 上传关联 10 months ago
chenhc d387a3e6be feat: 初始化层级码关联关系 10 months ago
chenhc 7d917318ca feat: 修复分组 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