Commit Graph

2826 Commits (6311af88194fbba714f8eb7270d394831d512ab0)

Author SHA1 Message Date
wangwei a6469784e2 1/14 槽位修改1.2 8 months ago
chenhc 00688e24ae fix: 库存预警 8 months ago
chenhc 4cc4f5ec8b fix: 库存预警 8 months ago
wangwei a9d0681260 1/14 新增槽位 高度 药品 预警数 预警开关 8 months ago
chenhc c6f8fecc75 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 8 months ago
chenhc 7f3b121d54 fix: 优化 8 months ago
qiuyt 0192432809 同步下载基础数据 8 months ago
chenhc a3b81317c8 fix: 优化 8 months ago
wangwei fe5fc6a089 1/13 码校验优化1.0 8 months ago
chenhc 3de25f7dfc fix: 事务超时优化 8 months ago
yewj 37b73c6d8b 拆零标记问题 8 months ago
wangwei a50a51f1b1 1/10 同步删除产品层级1.0 8 months ago
wangwei f9a8e8c4f2 1/10 槽位优化 摆货层DMQ001-01 槽位:DMQ001-01-01 8 months ago
chenhc 1db008e039 feat: 启用单品种槽位 8 months ago
wangwei 546591f1d9 1/10 取消校验1.1 8 months ago
yewj 26a2fabaa5 扫码查询单据明细 8 months ago
qiuyt aa4fbf93eb 同步下载基础数据 namecode为空导致的问题 8 months ago
wangwei 9845a541a2 1/9 码校验代码优化1.0 8 months ago
chenhc 1bbb57dd78 feat: 只允许上货单一产品开关0 8 months ago
yewj 2097e537f6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 8 months ago
yewj f8ca8d7ef1 拆零确认,规格型号等一些修改 8 months ago
wangwei 7e5570671e 1/8 扫码校验优化 差一个扫码过多校验1.0 8 months ago
chenhc 4a3d11af1b feat: 增加上货记录 8 months ago
wangwei ae24e4ebf5 1/8 代码备份1.0 8 months ago
chenhc 5e2259b65b fix:修复 8 months ago
chenhc bd3e05c898 feat:按取货槽退货 8 months ago
yewj 030bb804a7 下载单据死循环修改 8 months ago
chenhc 67e6cf04db feat:手动上传药品处方单据 8 months ago
chenhc 7adc9d681e feat:手动上传药品处方单据 8 months ago
wangwei 7458c4e250 1/6 取货架设置是都属于单产品槽位 默认为是 8 months ago
yewj f4ff112ea9 根据配置修改是否启用扫码拆零确认 8 months ago
yewj 19d62e09ea 扫码数量问题 8 months ago
yewj 4fa13da834 新增确认取药-拆零确认 8 months ago
yewj 61c313a778 新增确认取药-拆零确认 8 months ago
wangwei cfce757ff7 1/4 代码优化 8 months ago
yewj b9e8dea931 灯组剂量单位修改 8 months ago
wangwei a1118b316a 1/2 修改1.0 9 months ago
wangwei a071bd031a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
wangwei ebea2a4dc9 12/31 灯组1.3 9 months ago
qiuyt b10ee4d443 从供应商选入药品选入药品层级功能搬到内网 9 months ago
wangwei 01036e5cfb 12/31 现场管理单据详情表增加槽位字段和灯组 9 months ago
yewj 7b053a694b 取药确认 9 months ago
yewj 73f8be2082 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj c01b43beb0 取药确认 9 months ago
wangwei 8d3923e94e 12/31 灯组管理优化1.2 9 months ago
wangwei 76c6d5ed71 12/31 灯组修改 9 months ago
wangwei c49c57b8ee 12/31 访问参数修改 9 months ago
wangwei fd5b500f15 12/31 灯组 9 months ago
wangwei f9189fa482 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
wangwei e449821966 12/27 自动创建目录1.0 9 months ago
chenhc 7e2460352b Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
chenhc d6a9524e11 fix:修复 9 months ago
wangwei eb24096db7 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
wangwei 7ef9325c75 12/26 药品查询优化 9 months ago
qiuyt 64f3440afd 下载三方错误 9 months ago
wangwei 691eb0b9b2 12/26 单据审核放弃接口 9 months ago
qiuyt 40e9108d9e 选入药品层级查询就不查询国家库了 本地查不到直接去阿里拉 9 months ago
yewj 36eb5ad134 器械拆零问题 9 months ago
qiuyt dea6b0a780 Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z 9 months ago
qiuyt 03fd8680bf 从供应商选入药品选入药品层级功能搬到内网 9 months ago
chenhc e50dd6fc73 feat: 增加发药机的接口对接 9 months ago
chenhc 4b48e22345 feat: 增加发药机的接口对接 9 months ago
yewj 6c9ca5f0d7 切换分支备份 9 months ago
yewj 52b59b52f4 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj 3889e77a2c 工位上货与医保校验相关调整 9 months ago
wangwei 1f791a88e7 12/23 同步基础数据供应商关联产品呢基础数据1.0 9 months ago
qiuyt 5c04226f78 1、从供应商选入药品搬到内网 9 months ago
yewj f40fca4468 医保校验 9 months ago
wangwei 1495828521 医保校验 9 months ago
yewj 458bf6c817 补齐checkCode 9 months ago
yewj 9c5cd64033 有三期业务单校验改成不校验三期 9 months ago
yewj 2ba951a513 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj e4433e186a 扫码问题,器械处方扫码教研问题 9 months ago
wangwei be0957369b 12/23 优化 9 months ago
yewj daf13f9990 层级数量换算 9 months ago
yewj 0d3aa74cda 自动上货分配槽位 9 months ago
wangwei d2013db891 12/20 发票优化 9 months ago
wangwei e492e33b3b 12/20 bug修改 现场管理 9 months ago
qiuyt 491256236d 1、器械拉数据时间格式问题 9 months ago
wangwei b455c8c6c1 12/19 界面优化1.0 9 months ago
wangwei 68057172b7 12/19 字段优化1 9 months ago
wangwei d21c96facb 12/19 多余的优化1.0 9 months ago
yewj 030b7815bd Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj 5ebda61a81 代码备份 9 months ago
wangwei 2d01beb4bb 12/16 器械选入规格型号字段1.0 9 months ago
yewj 0256dbf20b 修改单据 9 months ago
wangwei 7520e93a91 12/13 码校验调整1.0 9 months ago
yewj a987057b46 单据完成后自动上传 9 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
9 months ago
wangwei 1dfabbdc42 12/12 已完成单据 详情优化 9 months ago
chenhc 0f26f7f4d4 fix: 工位单据类型增加是否上传医保参数 9 months ago
yewj 920379f15f 单据上传 9 months ago
wangwei 72699ee8fc 12/12 字段优化1.0 9 months ago
wangwei d565cf640e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj c18d4a907c 单据上传 9 months ago
wangwei 74501c23ce Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj 4975422c12 修改带校验,库存等 9 months ago
wangwei 0e70cb18eb 12/12 代码备份 扫码校验1.0 9 months ago
yewj b12d1e0a11 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj 62dec41a67 处方按照队列取货 9 months ago
qiuyt 54eeaa4d4f 1、医保上传转换问题 怎么样都是失败问题 9 months ago
wangwei 3c4e13470d 12/10 单据审核2.0 9 months ago
wangwei 6add29cf82 12/9 已完成单-码校验 序列号字段查询 9 months ago
wangwei 17a392e687 12/9 已完成单扫码校验1.0 9 months ago
yewj 14875c39a2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj 151ad2ed2d 审核送货单带入扫码明细, 9 months ago
wangwei 2cf859a630 12/9 价格显示问题1.0 9 months ago
yewj c0363c564e 扫码数量计算错误问题 9 months ago
wangwei bfd75a8285 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
wangwei 9993dd1932 12/6 已完成单码明细 9 months ago
yewj 09bbe78f54 当前产品不支持采集该包装层级追溯码问题修改 9 months ago
qiuyt 3e9eb6de76 1、菜单更新 9 months ago
yewj fb20732839 长泰上传问题 9 months ago
yewj ae7bcaf284 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 9 months ago
yewj 5c2ee6d58b 单据上传供应商问题 9 months ago
wangwei abf80eeb07 12/6 字段查询优化 9 months ago
qiuyt ed9a13f65b 1、选入药品bug
2、医保上传统计问题
9 months ago
wangwei 9dbc74c56f 12/6 现场管理 扫码成功后产品信息展示补齐 9 months ago
yewj 3fb0422a2b 拆零库存校验问题,有库存提示问题 9 months ago
yewj 4a7858a73d 扫码,拆零,无拆零插入备份表 9 months ago
qiuyt cba907ba42 1、选入药品bug 9 months ago
qiuyt 086a0c2354 1、选入药品bug 9 months ago
qiuyt d6809e34f5 1、key使用阿里用户表获取 9 months ago
qiuyt af003ea3cf 1、选入药品调用国家库或者阿里接口进行拉取药品码段数据插入我们的表
2、医保接口也没有的时候也调用接口
3、医保菜单上传
9 months ago
wangwei d2f82fa0b2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei 29672ba005 12/3 已完成单-码校验 10 months ago
yewj 3afecad2b4 业务单生成扫码单修改 10 months ago
yewj 0069d2dcd9 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj dbd1f1c0f5 最小数量修改 10 months ago
chenhc d639d9bd20 feat: 加定时重载异常单据功能 10 months ago
qiuyt 341fbc9c6b 扫码自动获取关联关系对象属性变化 10 months ago
wangwei a761685950 11/28 内部码分页优化 10 months ago
yewj 3f1ea341a2 取货确认问题 10 months ago
yewj 0d3e5b670b 现场管理去除掉产品供应商绑定 10 months ago
yewj c88e431977 待审核单据 10 months ago
wangwei 57b60cddc0 11/27 上货工位-货架打印优化 10 months ago
wangwei b145bd513a 11/27 脚本 10 months ago
wangwei 774d2b0366 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei 78f395ada5 11/27 采集工位-自动采集 10 months ago
yewj 1e1672da9f 自动赋码任务修改,完成单据兼容自动赋码 10 months ago
wangwei d987d112ef 11/27 单据类型加入字段是否自动处理 10 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
10 months ago
chenhc 647d2c553a fix:修复自动完成tagStatus为1的单据 10 months ago
wangwei 2e35f6d0eb 11/27 工位增加是否自动采集字段 10 months ago
wangwei b07cf1a073 11/27 是否自动处理 10 months ago
wangwei 2bf59e4d96 11/27 提交 10 months ago
wangwei 34b5dd1dfe 11/27 查询优化撤回 修改药品选入diType类型 10 months ago
wangwei eee7553e6b 11/27 产品查询优化 10 months ago
qiuyt 46e96c44e1 第三方基础数据拉取查询问题 10 months ago
chenhc ed2cab2506 fix:修复 10 months ago
yewj edad8988dd 关联关系临时解决 10 months ago
chenhc 9341f2bdf0 fix:修复 10 months ago
wangwei bed08797dd 11/26 药品业务管理字段优化1.1 10 months ago
qiuyt 69d61b87d2 药品选入bug
单据错误信息字段更改
10 months ago
yewj 862ba42729 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj e838984013 基础信息选入问题 10 months ago
wangwei ae63015073 11/26 sql优化1.1 10 months ago
wangwei 7441b65c35 11/26 药品字典对照条件sql修改 10 months ago
wangwei 468a7aeb08 11/25 申购查询显示优化1.0 10 months ago
chenhc c0111c959b fix:修复 10 months ago
yewj a1fd086920 基础信息选入问题,拉单问题 10 months ago
wangwei ebfd686f09 11/25 扫码发货方消失bug 10 months ago
qiuyt e86612240b 管理系统增加扫码的时候如果码关联关系找不到那就调用外网的阿里接口进行插入关联关系 10 months ago
wangwei ab3e5a7173 11/22 临时码表不存在去正式码表搜索1.0 10 months ago
yewj bbdf9c5302 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj f89de74fb8 第三方产品信息修改 10 months ago
yewj 35de11717b 单据处理数量,槽位绑定,扫码明细等 10 months ago
wangwei 9aa9c9b509 11/21 码明细插入批次号 生产日期 失效日期 10 months ago
qiuyt 764d430322 1、工位上货大码包装只加入下面一级码 一级码就直接加入 10 months ago
wangwei 8cfbfc56e0 11/21 槽位管理绑定产品进行过滤1.0 10 months ago
qiuyt 8be0b3b5a8 1、单据上传统计界面增加采购和销售 码数进行计算开发 10 months ago
wangwei bf931019d6 11/20 库存查询优化 10 months ago
wangwei 56e74bade8 11/20 药品带票出入库查询优化1.0 10 months ago
yewj 97f4c24dc1 单据处理数量,槽位绑定,扫码明细等 10 months ago
qiuyt 8ddb8d340c 1、单据上传统计界面开发
2、单据上传设置在呢个价论述时间定时设置 取消起始上传时间更新逻辑 无限循环处理有问题的单据
10 months ago
wangwei c7f70898e7 11/19 现场管理-已完成单规格显示 10 months ago
wangwei cc284cdd23 查询优化1.0 11/19 10 months ago
yewj dfc9097717 代码备份 10 months ago
yewj 32851dfa59 关联关系修改,处方下载修改 10 months ago
yewj f469754e17 处方单分流,单据读取关联关系 10 months ago
qiuyt 122f698004 上传医保提示优化 10 months ago
yewj f6b2f78d46 代码备份 10 months ago
qiuyt b00e14a391 创建表语句空格问题 10 months ago
yewj 81622f8fcf bug修改 10 months ago
qiuyt 4acc72064f Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z 10 months ago
qiuyt dd2b6b10ce 采购计划高级查询 10 months ago
wangwei a6d4913e49 11/15 采购订单申购明细 10 months ago
wangwei 4db20f6159 11/15 药品基础信息优化 10 months ago
wangwei f0be935b0b Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei 186ccd438a 11/14 槽位管理高级搜索 10 months ago
chenhc 9115551dfd feat: 修复 10 months ago
yewj afd6253b7c bug修改 10 months ago
wangwei 4a552f3ac8 11/14 现场管理规格字段展示优化1.0 10 months ago
yewj 55beb3b285 处理单据,关联关系问题等 10 months ago
wangwei 7ddccf734f 11/13 bug优化1.0 10 months ago
wangwei 1b56dc65f1 11/13 优化1.0 10 months ago
wangwei 924debdaee 11/13 上货增加虚拟槽位1.0 10 months ago
wangwei e380c8cf1f 11/13 供应商发票优化 10 months ago
yewj 287057e2fb 多个工位自动拆零问题 10 months ago
chenhc da4cde26b1 feat: 修复 10 months ago