Commit Graph

757 Commits (50f92a5efb8cbaf5b84439c60f9be66630eff1be)

Author SHA1 Message Date
chenhc b58e4aae8c fix:优化关联关系 8 months ago
wangwei d2d57a13ee 11/7 货架管理1.1 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
chenhc 0e441c3bda feat: 码明细到国家同步库 8 months ago
yewj 4bb3ffb274 平板工位上货问题 8 months ago
wangwei 63c1f5f351 10/31 上货工位增加货位 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
yewj b183c8c519 工位添加格子编码 8 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
8 months ago
yewj f08e86703a 单据处理相关修改,代码备份 8 months ago
chenhc 67d6056b66 feat: 上传多码融合 8 months ago
wangwei c992490c13 10/24 bug优化1.0 8 months ago
chenhc e03511d6b8 feat: 多码融合 8 months ago
chenhc 93cf1636f3 feat: 多码融合 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
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
chenhc e66332e4fb feat: 药品关联信息上下传输功能 9 months ago
wangwei 61e784aca3 10/17 单据增加单据类型(器械/药品)基础数据器械响应优化 9 months ago
qyt fa02aaa439 1、耗材字典信息表 备注有误修改 9 months ago
chenhc dbf696db1e feat: 手工、拼箱关联修改 9 months ago
yewj 9782e2a47d 备份 9 months ago
chenhc 14ae99a760 feat: 拼箱关联 9 months ago
zane 84d2f939ae 暂存 9 months ago
yewj 932387a90f 新增不良产品信息库 9 months ago
wangwei b4217ac5d6 10/8 查询优化1.0 9 months ago
yewj 3395c439d1 系统繁忙修改 9 months ago
wangwei c12798ad5d 9/29 页面优化 更改单据id为Long 9 months ago
chenhc 7d4811ebb3 feat: 拆包失效进行损耗出库 9 months ago
wangwei 9b5e03278e 9/29 工位维护-上货工位优化1.0 9 months ago
wangwei 28bda3c70c 9/29 工位维护增加上货工位 9 months ago
yewj 8ed250abe8 包装层级数量修改 9 months ago
zane adb7d0ed2c 上传关联2.0 9 months ago
yewj 2b0eab6452 工位上货接口独立 9 months ago
chenhc 93851eb11c feat: 器械处方 9 months ago
chenhc 1f565dc9a9 feat: 器械处方 9 months ago
wangwei 39b034ac50 9/26 增加工位类型 9 months ago
zane c565b37b4f 上传关联 9 months ago
wangwei f43ff8d1f4 9/26 业务类型增加出入库方式1.0 9 months ago
chenhc d387a3e6be feat: 初始化层级码关联关系 9 months ago
chenhc 67e4600796 feat: 修复 9 months ago
wangwei 415ec8729b 9/19 追溯码备份查询1.0 10 months ago
chenhc 9fd7db20d7 feat: 定时设置结合业务 10 months ago
yewj e881336059 单据配置相关修改 10 months ago
yewj 079bbd5e22 新增第三方单据类型编码 10 months ago
yewj 47fcc01651 修改界面配置是否常用字段,修改数据库为线上数据库 10 months ago
wangwei ed415e534f 9/11 业务类型增加收货方送货方 10 months ago
yewj 41a3e51b1e 代码备份 10 months ago
wangwei 0469fac615 9/14 优化 10 months ago
yewj a96d25b8bc 代码备份 10 months ago
chenhc 483a136e34 fix: 修复 10 months ago
yewj 8050f09f3f 单据详情添加备用字段 10 months ago
yewj 6bee8dcc47 处理单据时显示工位存量和拆零存量 10 months ago
wangwei 717ff55dd6 9/11 已完成处方修改 10 months ago
chenhc 50987f7f7e fix: 修复 10 months ago
yewj 574667c0ea Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj cd579e1249 删除unitTittle 10 months ago
chenhc f4d932671d fix: 原始单据分表出来 10 months ago
yewj 642051dbb9 代码备份 10 months ago
wangwei 5c0fc021ec 9/10 优化1.0 10 months ago
yewj 941a85db30 批量扫码问题 10 months ago
wangwei 94ff408b57 9/9 业务类型增加是否常用 10 months ago
wangwei 645f311c70 9/9 业务类型增加顺序号 10 months ago
yewj 71687a71fc 去除掉中间表 10 months ago
wangwei 1698e7bcda 9/9 业务类类型字段增加 10 months ago
zane fafd6afa2e 字典未对照单据异常 10 months ago
wangwei acc4863693 9/5 基础数据药品 10 months ago
zane 136334c444 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
zane b2b34206da 单据 10 months ago
wangwei e38fe7250b Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei 3157887c6a 增加第三方产品 制剂规格和制剂单位 10 months ago
wangwei 12070e3c36 9/5 第三方产品增加制剂规格和制剂单位 10 months ago
yewj 65d6d718c1 自动赋码逻辑修改 10 months ago
yewj 00788a0597 代码备份 10 months ago
wangwei f032261e1f 8/2 损耗出库库存修改 10 months ago
zane 94abad9642 单据上传 10 months ago
yewj e83a0ecdb7 医保单据上传修改 10 months ago
yewj bcbcda9ebb 代码备份 10 months ago
wangwei 1b36ce9bb2 8/91 优化 10 months ago
wangwei 27b1a4e5ee 8/31 损耗出库修改 业务类型增加 是否独占 10 months ago
chenhc ace5595719 fix: 是否自动赋码 10 months ago
yewj a9c306c0a7 库存明细ID外键 10 months ago
yewj f864bd6503 新增码替换字段 10 months ago
wangwei 241f7901fc 8/30 损耗出库 10 months ago
yewj 6bb1edad56 库存添加业务类型 10 months ago
yewj 3b7b118370 1.待处理单据库存锁定修改,2.单据拆零出库锁定修改,3;单据上下货库存修改,4.上货后触发单据锁定 10 months ago
yewj e80fe8c083 库存添加字段 10 months ago
wangwei 00210b6a6b 8/29 业务类型修改 10 months ago
yewj 60e7d28ed0 损耗出库方式损耗方式:1:库存选入;2:扫码添加 10 months ago
yewj b0248b2642 新增库存选入与扫码添加接口 10 months ago
yewj 3c4d1c16e1 新增损耗出库码表 10 months ago
yewj 1b214aafcb Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj 983741a6ff 损耗出库添加库存 10 months ago
wangwei f5932c79e1 8/29 损耗日志 10 months ago
yewj f03fd0f1e1 损耗出库添加产品 10 months ago
yewj 004e6972f8 新增拆零销毁出库相关方法接口 10 months ago
yewj f4d1ef4b9b 新增拆零销毁出库相关方法接口 10 months ago
wangwei 7cfe54fa39 8/28 药品数据维护第三方药品 10 months ago
chenhc 204f95f610 fix: 库存预警修改 10 months ago
zane 42628fd6b7 库存预警 10 months ago
yewj 2e2ac0116e 生成库存统计表 10 months ago
yewj a40ad38414 补充库存字段 10 months ago
yewj c14d32bf57 耗材字典使用单元,流通单元等配置修改 10 months ago
yewj 0c9c81bc49 操作码明细更新 10 months ago
yewj fa80a765a5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
yewj 7542711f97 库存问题 10 months ago
wangwei 12ad4f6e00 8/26 追溯码查询 以及工位bug修改 10 months ago
chenhc c9df2458cc fix: 单据库存预警字段 10 months ago
chenhc 5bccbd41cc fix: 自动分配工位存量到单据明细 10 months ago
wangwei 4a79d728e2 8/26 耗材加入工位预警数量 是否拆零 10 months ago
yewj 5e215abf0a 库存详情 10 months ago
zane 6a37fede1f 置顶 排序时间 10 months ago
yewj 201d03bf4e 扫码作业问题 10 months ago
yewj b1eca2aab3 代码备份 11 months ago
yewj 4dac4209af 后端相关修改 11 months ago
chenhc 1360a8463c feat: 单据备注字段 11 months ago
yewj d71bb120f8 单据流程修改 11 months ago
yewj e7fbdab3c0 拆零整取数量重新计算 11 months ago
yewj 9609d4a343 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 6ae6c1c329 8/22 现场管理工位调整,单据 11 months ago
yewj f79c6de737 数据初始化计算计量单元数量 11 months ago
chenhc 88513a51f4 feat: 修改 11 months ago
chenhc 1150a2bec9 feat: 修改 11 months ago
wangwei 1bb1291753 8/20 工位绑定单据类型 11 months ago
anthonywj e04b28efe1 代码备份 11 months ago
chenhc 2284b641b7 feat: 修改 11 months ago
anthonywj 1a3d5dbc9a 代码备份 11 months ago
anthonywj 44b8a8d04b 代码备份 11 months ago
chenhc 243a6c3be9 feat: 修改 11 months ago
wangwei 8abe46cd10 优化 绑定工位 11 months ago
anthonywj f32ac0d5a7 单据生成问题 11 months ago
wangwei fed1c4174d 调整工位单据类型维护 1.0 8/17 11 months ago
anthonywj 5e7af56b93 自动拆零查询详情 11 months ago
anthonywj e9b939e99d 单据拆零赋码优化修改 11 months ago
wangwei 7a219014e1 7/11 优化工位 11 months ago
anthonywj 21e3e4e4d7 自动拆零问题 11 months ago
wangwei 595651c193 1.2 增加往来单位类型 11 months ago
anthonywj 70c109e0ee Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
anthonywj d79001655c 代码备份 11 months ago
wangwei 67726020ec 8/15 搜索用户加入仓库字段 11 months ago
anthonywj dcd227d367 校验方式修改,1.三期,无三期,扫码单生成业务单,等一些功能修改 11 months ago
anthonywj 4cbd788597 备份 11 months ago
anthonywj 6b60cc0244 代码备份 11 months ago