Commit Graph

2126 Commits (6efe7321b43bbf7b0613e64a785376fa69585d71)

Author SHA1 Message Date
yewj 3c4d1c16e1 新增损耗出库码表 1 year ago
yewj 1b214aafcb Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 983741a6ff 损耗出库添加库存 1 year ago
wangwei f5932c79e1 8/29 损耗日志 1 year ago
yewj f03fd0f1e1 损耗出库添加产品 1 year ago
chenhc 6f36a8cfec fix: 修改 1 year ago
yewj 004e6972f8 新增拆零销毁出库相关方法接口 1 year ago
yewj f4d1ef4b9b 新增拆零销毁出库相关方法接口 1 year ago
wangwei 7cfe54fa39 8/28 药品数据维护第三方药品 1 year ago
chenhc 489a1daefe fix: 修改 1 year ago
chenhc 09e1f63cb1 fix: 修改 1 year ago
chenhc 560e6eb318 fix: 修改 1 year ago
yewj 7bfa3d94ba 代码备份 1 year ago
wangwei 0511bbe428 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 8dd7213182 8/27 字段调整 1 year ago
zane b3764923df 预警状态 1 year ago
zane 75d81b507f 预警状态 1 year ago
wangwei d6d7f47144 8/27 打印工位 1 year ago
chenhc 204f95f610 fix: 库存预警修改 1 year ago
zane ddb549c621 库存预警 1 year ago
yewj c9360f27f9 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 18fd754388 新增拆零回退 1 year ago
zane 2d54324a76 库存预警 1 year ago
zane 42628fd6b7 库存预警 1 year ago
yewj 2e2ac0116e 生成库存统计表 1 year ago
yewj a40ad38414 补充库存字段 1 year ago
yewj 81da44c6a2 单据完成后处理 1 year ago
yewj daebc2787b 库存变更todo,还未加 1 year ago
yewj 5d9f5c6ab8 工位上货数量计算问题 1 year ago
yewj c14d32bf57 耗材字典使用单元,流通单元等配置修改 1 year ago
yewj 0c9c81bc49 操作码明细更新 1 year ago
yewj 5d37d96ee0 工位上货插入到库存表 1 year ago
yewj fa80a765a5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj 7542711f97 库存问题 1 year ago
wangwei 12ad4f6e00 8/26 追溯码查询 以及工位bug修改 1 year ago
yewj 8f0d7bf6dd 部门用户问题 1 year ago
yewj b27b4df7fa 代码备份 1 year ago
chenhc 02b06f6dbd fix: 自动分配库存预警修改 1 year ago
chenhc c9df2458cc fix: 单据库存预警字段 1 year ago
chenhc 5bccbd41cc fix: 自动分配工位存量到单据明细 1 year ago
yewj ccf16c7128 追溯码查询 1 year ago
wangwei 4a79d728e2 8/26 耗材加入工位预警数量 是否拆零 1 year ago
yewj 5e215abf0a 库存详情 1 year ago
zane 1aaa9bd2bf Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
zane 6a37fede1f 置顶 排序时间 1 year ago
yewj f77bd91177 插入到码表 1 year ago
yewj fa9a264df8 代码备份 1 year ago
yewj 5db5a8b63d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 47ea535377 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 6415acad80 8/25 业务类型关联第三方单据 1 year ago
chenhc d83ab87193 fix: 修复 1 year ago
chenhc 445514e2cc fix: 修复 1 year ago
chenhc 1738822d07 feat: 自动过滤用户工位列表 1 year ago
yewj 201d03bf4e 扫码作业问题 1 year ago
chenhc 52b08c7afc feat: 工位分页排序修改 1 year ago
yewj 67123a1011 扫码作业问题 1 year ago
yewj b1eca2aab3 代码备份 1 year ago
yewj 4dac4209af 后端相关修改 1 year ago
yewj 43ecb66850 单据流程修改 1 year ago
chenhc 840f411779 feat: 单据备注字段响应出去 1 year ago
chenhc 1360a8463c feat: 单据备注字段 1 year ago
yewj d71bb120f8 单据流程修改 1 year ago
wangwei a0d22dbc6c 8/23 采集工位根据用户搜索 1 year ago
wangwei 00bde6626c Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj b424a12df9 扫码问题修改 1 year ago
chenhc 8d06717f05 feat: 扫码单减一删除biz 1 year ago
yewj 34a75705fe 代码备份 1 year ago
wangwei e597b19779 8/22 工位优化 1 year ago
yewj 5c8f6a7d00 正在处理单据 1 year ago
yewj e7fbdab3c0 拆零整取数量重新计算 1 year ago
yewj 9609d4a343 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 6ae6c1c329 8/22 现场管理工位调整,单据 1 year ago
chenhc 062919ccfa feat: 处理单据选择单据类型 1 year ago
yewj ad9ee6fd7a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
yewj f79c6de737 数据初始化计算计量单元数量 1 year ago
chenhc 082f302507 feat: 器械参数设置 1 year ago
yewj 4f5b4282e1 代码备份 1 year ago
chenhc 88513a51f4 feat: 修改 1 year ago
chenhc 350703e9f5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei cdd330787d ,, 1 year ago
chenhc 1150a2bec9 feat: 修改 1 year ago
wangwei f8cabf42ec 8/21 工查询优化 1 year ago
wangwei 64489e8740 单据类型,工位删除判断 1 year ago
chenhc 1e2282ab49 feat: 修改 1 year ago
wangwei 1bb1291753 8/20 工位绑定单据类型 1 year ago
anthonywj 5e1d1e51e2 代码备份 1 year ago
chenhc 91a200d439 feat: 修改 1 year ago
anthonywj ec0cadbe21 代码备份 1 year ago
anthonywj e04b28efe1 代码备份 1 year ago
chenhc 2284b641b7 feat: 修改 1 year ago
wangwei fb4ec1218d 8/19 响应工位code 1 year ago
anthonywj 1a3d5dbc9a 代码备份 1 year ago
anthonywj 44b8a8d04b 代码备份 1 year ago
anthonywj 8f0d0a8aad Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
chenhc 5db06d994c feat: 修改 1 year ago
anthonywj 3fe4496e79 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
chenhc 243a6c3be9 feat: 修改 1 year ago
anthonywj e56d3770b6 代码备份 1 year ago
anthonywj 9ee2f38b05 代码备份 1 year ago
anthonywj 0d2db0eb60 单据校验修改 1 year ago
anthonywj dce16042f0 测试数据 1 year ago
anthonywj 0e0c19f095 bug修改 1 year ago
wangwei 8abe46cd10 优化 绑定工位 1 year ago
anthonywj 5fae2eb944 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
anthonywj f32ac0d5a7 单据生成问题 1 year ago
chenhc 317cc8e65c feat: 修改现场作业分页接口key增加模糊字段 1 year ago
wangwei fed1c4174d 调整工位单据类型维护 1.0 8/17 1 year ago
anthonywj b545ccd651 手动扫码 1 year ago
anthonywj 5e7af56b93 自动拆零查询详情 1 year ago
anthonywj e9b939e99d 单据拆零赋码优化修改 1 year ago
wangwei 7a219014e1 7/11 优化工位 1 year ago
anthonywj ed03b900fd 拆零上货入库数量计算问题,获取下一单据 1 year ago
wangwei fccf06cb0e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 25111c05cc 修改药品第一次选入流通失效 1 year ago
anthonywj 21e3e4e4d7 自动拆零问题 1 year ago
chenhc ab91277787 feat: 页面修改-业务类型、来源系统 1 year ago
wangwei 595651c193 1.2 增加往来单位类型 1 year ago
wangwei c80ba75d39 小优化 1 year ago
wangwei 0ede93fd8d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei e16769409f 8/16 code 1 year ago
anthonywj 70c109e0ee Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
anthonywj d79001655c 代码备份 1 year ago
wangwei 67726020ec 8/15 搜索用户加入仓库字段 1 year ago
anthonywj dcd227d367 校验方式修改,1.三期,无三期,扫码单生成业务单,等一些功能修改 1 year ago
chenhc 08b714b43b feat: 单据in查询 1 year ago
chenhc 76c9764465 feat: 单据in查询 1 year ago
anthonywj 4cbd788597 备份 1 year ago
wangwei c6859d461f 8-15 工位管理 1.0 1 year ago
anthonywj 3ee4e9caf9 单据详情接口修改 1 year ago
anthonywj 6b60cc0244 代码备份 1 year ago
wangwei b2983b6c77 工位搜索 1 year ago
wangwei 0a28aa21f6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 4db6d15acf 工位管理 1 year ago
chenhc 2ff822c07a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 904e8a9950 8/14 工位单据管理 1 year 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
1 year ago
chenhc a5c6d5b44e feat: 首页复制 1 year ago
chenhc 4cfe42b996 feat: 首页复制 1 year ago
anthonywj fda2478831 切换分支备份 1 year ago
chenhc c268e0d067 feat: 库存预警 1 year ago
anthonywj b481843d24 切换分支备份 1 year ago
anthonywj 5af357d158 专为平潭写的删除所有科室出库单据的接口 1 year ago
anthonywj b30a908894 重写采集点代码 1 year ago
anthonywj 9278b88162 采集点代码生成 1 year ago
anthonywj 8f67e20d19 缺了个预出库队列校验 1 year ago
anthonywj bae3fb9c30 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
anthonywj d4e2b85982 拆零优化 1 year ago
wangwei b757ab2ffb 8/12 药品字段数据 1 year ago
anthonywj e3410ca4c2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 1 year ago
wangwei 95cd6628f5 8/9 药品管理字段优化,生成单据的时候设置产品类型,响应字段,带票出入库根据订单号分组过滤 1 year ago