Commit Graph

2751 Commits (7c5316f17334b183abf42426c5a3f20a8ae93ef8)

Author SHA1 Message Date
chenhc 9f8de20e54 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_2.5_optimize 5 months ago
wangwei 51e838ec5f 2/8 版本部署 5 months ago
chenhc 1e9cc53d4b feat: 科室产品出库功能 5 months ago
chenhc 96a3e9b184 feat: 科室产品出库功能 5 months ago
wangwei edb2d95a6d 2/8 扫码数量1.1 5 months ago
wangwei a8bba33860 2/8 扫码设置字段 5 months ago
chenhc 0b0167c784 fix:修复 5 months ago
chenhc 7a0c4b82b1 fix:修复 5 months ago
yewj f9855df25d 工位库存问题 6 months ago
chenhc 04fb994668 fix:修复 6 months ago
qiuyt b3d76b2c22 Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z 6 months ago
qiuyt 5a7669f7e0 拉取单据下载不下来的问题修复 6 months ago
wangwei e9be9f4f72 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 6 months ago
wangwei 61dc8aac4b 1/23 优化1.0 6 months ago
qiuyt e4db91cb52 医保上传统计
增加原始单据表索引
6 months ago
chenhc 03fc415c3f fix:修复重复下载 原始单据表的数据进行del 6 months ago
wangwei cdf52d8c6d 1/21 灯组逻辑优化1.0 6 months ago
qiuyt 907e7e240c 医保上传统计 6 months ago
wangwei d6b9404eed 1/21 灯组逻辑优化 1.0 6 months ago
wangwei 1a3bd7085e 1/20 上货增加批次号1.0 6 months ago
chenhc b053b6774c fix:修复 6 months ago
wangwei f4a7c2a606 1/18 槽位管理查询优化1.0 6 months ago
wangwei f655fb34c9 1/18 槽位优化1.0 6 months ago
chenhc 62693b315f fix:修复 6 months ago
yewj 1cd0d2f8fa 新增工位库存扫码数量,出入余 6 months ago
chenhc e15f1c1fd8 fix:修复 6 months ago
wangwei 87f6370906 1/18 优化1.0 6 months ago
chenhc 751073a22c fix:修复 6 months ago
chenhc bcd25d976a feat: 药房上货推荐单 6 months ago
chenhc c2fe09ea82 feat: 药房布局 6 months ago
wangwei aef1ca0d6c 1/17 选入采集工位增加部门条件1.0 6 months ago
yewj be04681efb 单据审核验收外网 6 months ago
chenhc bbdc772231 feat: 优化 6 months ago
yewj fe4445e184 云霄妇幼问问题,拆零码未显示 6 months ago
chenhc 4110250dcd Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 6 months ago
chenhc 3a6576c3d8 fix: 修复 6 months ago
yewj bdba960493 去掉线程操作 6 months ago
chenhc f0bcd57933 fix: 修复事务 6 months ago
chenhc 4b7e671514 fix: 修复事务 6 months ago
chenhc f1e959cf80 fix: 修复 6 months ago
chenhc 7c8b73e410 fix: 货柜预览图 6 months ago
yewj bab8df30a6 代码备份 6 months ago
wangwei a6469784e2 1/14 槽位修改1.2 6 months ago
chenhc 4cc4f5ec8b fix: 库存预警 6 months ago
wangwei a9d0681260 1/14 新增槽位 高度 药品 预警数 预警开关 6 months ago
qiuyt 0192432809 同步下载基础数据 6 months ago
chenhc a3b81317c8 fix: 优化 6 months ago
wangwei fe5fc6a089 1/13 码校验优化1.0 6 months ago
chenhc 3de25f7dfc fix: 事务超时优化 6 months ago
yewj 37b73c6d8b 拆零标记问题 6 months ago
wangwei a50a51f1b1 1/10 同步删除产品层级1.0 6 months ago
wangwei f9a8e8c4f2 1/10 槽位优化 摆货层DMQ001-01 槽位:DMQ001-01-01 6 months ago
chenhc 1db008e039 feat: 启用单品种槽位 6 months ago
wangwei 546591f1d9 1/10 取消校验1.1 6 months ago
yewj 26a2fabaa5 扫码查询单据明细 6 months ago
qiuyt aa4fbf93eb 同步下载基础数据 namecode为空导致的问题 6 months ago
wangwei 9845a541a2 1/9 码校验代码优化1.0 6 months ago
chenhc 1bbb57dd78 feat: 只允许上货单一产品开关0 6 months ago
yewj 2097e537f6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 6 months ago
yewj f8ca8d7ef1 拆零确认,规格型号等一些修改 6 months ago
wangwei 7e5570671e 1/8 扫码校验优化 差一个扫码过多校验1.0 6 months ago
chenhc 4a3d11af1b feat: 增加上货记录 6 months ago
wangwei ae24e4ebf5 1/8 代码备份1.0 6 months ago
chenhc 5e2259b65b fix:修复 6 months ago
chenhc bd3e05c898 feat:按取货槽退货 6 months ago
yewj 030bb804a7 下载单据死循环修改 6 months ago
chenhc 67e6cf04db feat:手动上传药品处方单据 6 months ago
chenhc 7adc9d681e feat:手动上传药品处方单据 6 months ago
wangwei 7458c4e250 1/6 取货架设置是都属于单产品槽位 默认为是 6 months ago
yewj f4ff112ea9 根据配置修改是否启用扫码拆零确认 6 months ago
yewj 19d62e09ea 扫码数量问题 6 months ago
yewj 4fa13da834 新增确认取药-拆零确认 6 months ago
yewj 61c313a778 新增确认取药-拆零确认 6 months ago
wangwei cfce757ff7 1/4 代码优化 6 months ago
yewj b9e8dea931 灯组剂量单位修改 6 months ago
wangwei a1118b316a 1/2 修改1.0 6 months ago
wangwei a071bd031a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 6 months ago
wangwei ebea2a4dc9 12/31 灯组1.3 6 months ago
qiuyt b10ee4d443 从供应商选入药品选入药品层级功能搬到内网 6 months ago
wangwei 01036e5cfb 12/31 现场管理单据详情表增加槽位字段和灯组 6 months ago
yewj 7b053a694b 取药确认 6 months ago
yewj 73f8be2082 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 6 months ago
yewj c01b43beb0 取药确认 6 months ago
wangwei 8d3923e94e 12/31 灯组管理优化1.2 6 months ago
wangwei 76c6d5ed71 12/31 灯组修改 6 months ago
wangwei c49c57b8ee 12/31 访问参数修改 6 months ago
wangwei fd5b500f15 12/31 灯组 6 months ago
wangwei f9189fa482 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 6 months ago
wangwei e449821966 12/27 自动创建目录1.0 6 months ago
chenhc 7e2460352b Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 6 months ago
chenhc d6a9524e11 fix:修复 6 months ago
wangwei eb24096db7 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 6 months ago
wangwei 7ef9325c75 12/26 药品查询优化 6 months ago
qiuyt 64f3440afd 下载三方错误 6 months ago
wangwei 691eb0b9b2 12/26 单据审核放弃接口 6 months ago
qiuyt 40e9108d9e 选入药品层级查询就不查询国家库了 本地查不到直接去阿里拉 6 months ago
yewj 36eb5ad134 器械拆零问题 6 months ago
qiuyt dea6b0a780 Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z 7 months ago
qiuyt 03fd8680bf 从供应商选入药品选入药品层级功能搬到内网 7 months ago
chenhc e50dd6fc73 feat: 增加发药机的接口对接 7 months ago
chenhc 4b48e22345 feat: 增加发药机的接口对接 7 months ago
yewj 6c9ca5f0d7 切换分支备份 7 months ago
yewj 52b59b52f4 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
yewj 3889e77a2c 工位上货与医保校验相关调整 7 months ago
wangwei 1f791a88e7 12/23 同步基础数据供应商关联产品呢基础数据1.0 7 months ago
qiuyt 5c04226f78 1、从供应商选入药品搬到内网 7 months ago
yewj f40fca4468 医保校验 7 months ago
wangwei 1495828521 医保校验 7 months ago
yewj 458bf6c817 补齐checkCode 7 months ago
yewj 9c5cd64033 有三期业务单校验改成不校验三期 7 months ago
yewj 2ba951a513 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
yewj e4433e186a 扫码问题,器械处方扫码教研问题 7 months ago
wangwei be0957369b 12/23 优化 7 months ago
yewj daf13f9990 层级数量换算 7 months ago
yewj 0d3aa74cda 自动上货分配槽位 7 months ago
wangwei d2013db891 12/20 发票优化 7 months ago
wangwei e492e33b3b 12/20 bug修改 现场管理 7 months ago
qiuyt 491256236d 1、器械拉数据时间格式问题 7 months ago
wangwei b455c8c6c1 12/19 界面优化1.0 7 months ago
wangwei 68057172b7 12/19 字段优化1 7 months ago
wangwei d21c96facb 12/19 多余的优化1.0 7 months ago
yewj 030b7815bd Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
yewj 5ebda61a81 代码备份 7 months ago
wangwei 2d01beb4bb 12/16 器械选入规格型号字段1.0 7 months ago
yewj 0256dbf20b 修改单据 7 months ago
wangwei 7520e93a91 12/13 码校验调整1.0 7 months ago
yewj a987057b46 单据完成后自动上传 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
yewj 920379f15f 单据上传 7 months ago
wangwei 72699ee8fc 12/12 字段优化1.0 7 months ago
wangwei d565cf640e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
yewj c18d4a907c 单据上传 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
yewj b12d1e0a11 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
yewj 62dec41a67 处方按照队列取货 7 months ago
qiuyt 54eeaa4d4f 1、医保上传转换问题 怎么样都是失败问题 7 months ago
wangwei 3c4e13470d 12/10 单据审核2.0 7 months ago
wangwei 6add29cf82 12/9 已完成单-码校验 序列号字段查询 7 months ago
wangwei 17a392e687 12/9 已完成单扫码校验1.0 7 months ago
yewj 151ad2ed2d 审核送货单带入扫码明细, 7 months ago
yewj c0363c564e 扫码数量计算错误问题 7 months ago
wangwei bfd75a8285 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
wangwei 9993dd1932 12/6 已完成单码明细 7 months ago
yewj 09bbe78f54 当前产品不支持采集该包装层级追溯码问题修改 7 months ago
yewj fb20732839 长泰上传问题 7 months ago
yewj ae7bcaf284 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
yewj 5c2ee6d58b 单据上传供应商问题 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
yewj 3fb0422a2b 拆零库存校验问题,有库存提示问题 7 months ago
yewj 4a7858a73d 扫码,拆零,无拆零插入备份表 7 months ago
qiuyt cba907ba42 1、选入药品bug 7 months ago
qiuyt 086a0c2354 1、选入药品bug 7 months ago
qiuyt d6809e34f5 1、key使用阿里用户表获取 7 months ago
qiuyt af003ea3cf 1、选入药品调用国家库或者阿里接口进行拉取药品码段数据插入我们的表
2、医保接口也没有的时候也调用接口
3、医保菜单上传
7 months ago
wangwei d2f82fa0b2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
wangwei 29672ba005 12/3 已完成单-码校验 7 months ago
yewj 3afecad2b4 业务单生成扫码单修改 7 months ago
yewj 0069d2dcd9 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
yewj dbd1f1c0f5 最小数量修改 7 months ago
chenhc d639d9bd20 feat: 加定时重载异常单据功能 7 months ago
qiuyt 341fbc9c6b 扫码自动获取关联关系对象属性变化 7 months ago
wangwei a761685950 11/28 内部码分页优化 7 months ago
yewj 3f1ea341a2 取货确认问题 7 months ago
yewj 0d3e5b670b 现场管理去除掉产品供应商绑定 7 months ago
yewj c88e431977 待审核单据 7 months ago
wangwei 57b60cddc0 11/27 上货工位-货架打印优化 7 months ago
wangwei 774d2b0366 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 7 months ago
wangwei 78f395ada5 11/27 采集工位-自动采集 7 months ago
yewj 1e1672da9f 自动赋码任务修改,完成单据兼容自动赋码 7 months ago
wangwei d987d112ef 11/27 单据类型加入字段是否自动处理 7 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
7 months ago
chenhc 647d2c553a fix:修复自动完成tagStatus为1的单据 7 months ago
wangwei 2e35f6d0eb 11/27 工位增加是否自动采集字段 7 months ago
wangwei b07cf1a073 11/27 是否自动处理 7 months ago
wangwei 34b5dd1dfe 11/27 查询优化撤回 修改药品选入diType类型 7 months ago
wangwei eee7553e6b 11/27 产品查询优化 7 months ago
qiuyt 46e96c44e1 第三方基础数据拉取查询问题 7 months ago
chenhc ed2cab2506 fix:修复 7 months ago
yewj edad8988dd 关联关系临时解决 7 months ago
chenhc 9341f2bdf0 fix:修复 7 months ago
qiuyt 69d61b87d2 药品选入bug
单据错误信息字段更改
7 months ago
yewj e838984013 基础信息选入问题 7 months ago
wangwei 468a7aeb08 11/25 申购查询显示优化1.0 7 months ago
chenhc c0111c959b fix:修复 7 months ago
yewj a1fd086920 基础信息选入问题,拉单问题 7 months ago
wangwei ebfd686f09 11/25 扫码发货方消失bug 7 months ago
qiuyt e86612240b 管理系统增加扫码的时候如果码关联关系找不到那就调用外网的阿里接口进行插入关联关系 8 months ago
wangwei ab3e5a7173 11/22 临时码表不存在去正式码表搜索1.0 8 months ago
yewj bbdf9c5302 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 8 months ago
yewj f89de74fb8 第三方产品信息修改 8 months ago
wangwei 9aa9c9b509 11/21 码明细插入批次号 生产日期 失效日期 8 months ago
qiuyt 764d430322 1、工位上货大码包装只加入下面一级码 一级码就直接加入 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
yewj 97f4c24dc1 单据处理数量,槽位绑定,扫码明细等 8 months ago
qiuyt 8ddb8d340c 1、单据上传统计界面开发
2、单据上传设置在呢个价论述时间定时设置 取消起始上传时间更新逻辑 无限循环处理有问题的单据
8 months ago
yewj 32851dfa59 关联关系修改,处方下载修改 8 months ago
yewj f469754e17 处方单分流,单据读取关联关系 8 months ago
qiuyt 122f698004 上传医保提示优化 8 months ago
yewj f6b2f78d46 代码备份 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
chenhc 9115551dfd feat: 修复 8 months ago
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