Commit Graph

1158 Commits (6cfb26207532de11f41c18d35fbd68ea3e2900cb)

Author SHA1 Message Date
wangwei e6e0ece77a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei 781b8faebb 9/9 药品层级 设置 10 months ago
yewj a7747416c5 业务单生成扫码单问题, 10 months ago
wangwei 7e698fc720 9/6 优化 10 months ago
zane 7ff581b4c1 单据异常处理 10 months ago
zane 362e0c05ae 单据异常 10 months ago
yewj fe6a7c18b1 bug修改 10 months ago
wangwei acc4863693 9/5 基础数据药品 10 months ago
wangwei 40e1e228c5 增加字段 10 months ago
zane 44a924973e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 10 months ago
wangwei a068acd71a 9/4 bug 修改 10 months ago
yewj 00788a0597 代码备份 10 months ago
zane a750f65344 搜索bug 10 months ago
wangwei f032261e1f 8/2 损耗出库库存修改 11 months ago
zane 94abad9642 单据上传 11 months ago
chenhc b66f0d5fc2 fix: sql 11 months ago
yewj bcbcda9ebb 代码备份 11 months ago
wangwei 1b36ce9bb2 8/91 优化 11 months ago
wangwei 27b1a4e5ee 8/31 损耗出库修改 业务类型增加 是否独占 11 months ago
chenhc ace5595719 fix: 是否自动赋码 11 months ago
zane 30aba260ec 调整排序 11 months ago
zane cf72ed2ed4 存量预警 11 months ago
zane 140e051cd6 存量预警 11 months ago
zane 21e6d2e9c1 存量预警 11 months ago
zane 0ea707ba79 存量预警 11 months ago
wangwei 241f7901fc 8/30 损耗出库 11 months ago
yewj 3b7b118370 1.待处理单据库存锁定修改,2.单据拆零出库锁定修改,3;单据上下货库存修改,4.上货后触发单据锁定 11 months ago
zane 550d22f90a 搜索 11 months ago
zane 67f5f5c2bc 业务类型 11 months ago
wangwei 00210b6a6b 8/29 业务类型修改 11 months ago
yewj 3c4d1c16e1 新增损耗出库码表 11 months ago
wangwei f5932c79e1 8/29 损耗日志 11 months ago
yewj f4d1ef4b9b 新增拆零销毁出库相关方法接口 11 months ago
wangwei 7cfe54fa39 8/28 药品数据维护第三方药品 11 months ago
chenhc 489a1daefe fix: 修改 11 months ago
chenhc 560e6eb318 fix: 修改 11 months ago
wangwei 8dd7213182 8/27 字段调整 11 months ago
chenhc 204f95f610 fix: 库存预警修改 11 months ago
zane 42628fd6b7 库存预警 11 months ago
yewj c14d32bf57 耗材字典使用单元,流通单元等配置修改 11 months ago
yewj fa80a765a5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
yewj 7542711f97 库存问题 11 months ago
wangwei 12ad4f6e00 8/26 追溯码查询 以及工位bug修改 11 months ago
chenhc c9df2458cc fix: 单据库存预警字段 11 months ago
chenhc 5bccbd41cc fix: 自动分配工位存量到单据明细 11 months ago
wangwei 4a79d728e2 8/26 耗材加入工位预警数量 是否拆零 11 months ago
zane 6a37fede1f 置顶 排序时间 11 months ago
wangwei 47ea535377 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 6415acad80 8/25 业务类型关联第三方单据 11 months ago
chenhc 52b08c7afc feat: 工位分页排序修改 11 months ago
yewj 67123a1011 扫码作业问题 11 months ago
yewj b1eca2aab3 代码备份 11 months ago
yewj 4dac4209af 后端相关修改 11 months ago
chenhc 1360a8463c feat: 单据备注字段 11 months ago
yewj d71bb120f8 单据流程修改 11 months ago
wangwei a0d22dbc6c 8/23 采集工位根据用户搜索 11 months ago
wangwei 00bde6626c Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
yewj b424a12df9 扫码问题修改 11 months ago
yewj 34a75705fe 代码备份 11 months ago
wangwei e597b19779 8/22 工位优化 11 months ago
yewj 5c8f6a7d00 正在处理单据 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 ad9ee6fd7a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
yewj f79c6de737 数据初始化计算计量单元数量 11 months ago
chenhc 082f302507 feat: 器械参数设置 11 months ago
yewj 4f5b4282e1 代码备份 11 months ago
chenhc 88513a51f4 feat: 修改 11 months ago
chenhc 1150a2bec9 feat: 修改 11 months ago
wangwei f8cabf42ec 8/21 工查询优化 11 months ago
wangwei 64489e8740 单据类型,工位删除判断 11 months ago
chenhc 1e2282ab49 feat: 修改 11 months ago
wangwei 1bb1291753 8/20 工位绑定单据类型 11 months ago
anthonywj e04b28efe1 代码备份 11 months ago
wangwei fb4ec1218d 8/19 响应工位code 11 months ago
chenhc 243a6c3be9 feat: 修改 11 months ago
anthonywj dce16042f0 测试数据 11 months ago
anthonywj 0e0c19f095 bug修改 11 months ago
chenhc 317cc8e65c feat: 修改现场作业分页接口key增加模糊字段 11 months ago
anthonywj e9b939e99d 单据拆零赋码优化修改 11 months ago
wangwei fccf06cb0e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 25111c05cc 修改药品第一次选入流通失效 11 months ago
chenhc ab91277787 feat: 页面修改-业务类型、来源系统 11 months ago
wangwei 595651c193 1.2 增加往来单位类型 11 months ago
wangwei 67726020ec 8/15 搜索用户加入仓库字段 11 months ago
anthonywj dcd227d367 校验方式修改,1.三期,无三期,扫码单生成业务单,等一些功能修改 11 months ago
chenhc 08b714b43b feat: 单据in查询 11 months ago
chenhc 76c9764465 feat: 单据in查询 11 months ago
wangwei c6859d461f 8-15 工位管理 1.0 11 months ago
anthonywj 3ee4e9caf9 单据详情接口修改 11 months ago
anthonywj 6b60cc0244 代码备份 11 months ago
wangwei b2983b6c77 工位搜索 11 months ago
wangwei 0a28aa21f6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 4db6d15acf 工位管理 11 months ago
chenhc 2ff822c07a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 904e8a9950 8/14 工位单据管理 11 months ago
chenhc b697699668 Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo_z
# Conflicts:
#	src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
#	src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
#	src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
#	src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
#	src/main/java/com/glxp/api/res/inv/InvProductResponse.java
#	src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
#	src/main/resources/application-dev.yml
#	src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
#	src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
#	src/main/resources/mybatis/mapper/inv/invProductDao.xml
#	src/main/resources/schemas/schema_v2.4.sql
11 months ago
chenhc 4cfe42b996 feat: 首页复制 11 months ago
chenhc c268e0d067 feat: 库存预警 11 months ago