Commit Graph

2035 Commits (6bb1edad565c1f1b191c5aaba0ca8fc8f142c92a)

Author SHA1 Message Date
wangwei 4a79d728e2 8/26 耗材加入工位预警数量 是否拆零 11 months ago
yewj 5e215abf0a 库存详情 11 months ago
zane 1aaa9bd2bf Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
zane 6a37fede1f 置顶 排序时间 11 months ago
yewj f77bd91177 插入到码表 11 months ago
yewj fa9a264df8 代码备份 11 months ago
yewj 5db5a8b63d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 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 d83ab87193 fix: 修复 11 months ago
chenhc 445514e2cc fix: 修复 11 months ago
chenhc 1738822d07 feat: 自动过滤用户工位列表 11 months ago
yewj 201d03bf4e 扫码作业问题 11 months ago
chenhc 52b08c7afc feat: 工位分页排序修改 11 months ago
yewj 67123a1011 扫码作业问题 11 months ago
yewj b1eca2aab3 代码备份 11 months ago
yewj 4dac4209af 后端相关修改 11 months ago
yewj 43ecb66850 单据流程修改 11 months ago
chenhc 840f411779 feat: 单据备注字段响应出去 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
chenhc 8d06717f05 feat: 扫码单减一删除biz 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
chenhc 062919ccfa feat: 处理单据选择单据类型 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 350703e9f5 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei cdd330787d ,, 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 5e1d1e51e2 代码备份 11 months ago
chenhc 91a200d439 feat: 修改 11 months ago
anthonywj ec0cadbe21 代码备份 11 months ago
anthonywj e04b28efe1 代码备份 11 months ago
chenhc 2284b641b7 feat: 修改 11 months ago
wangwei fb4ec1218d 8/19 响应工位code 11 months ago
anthonywj 1a3d5dbc9a 代码备份 11 months ago
anthonywj 44b8a8d04b 代码备份 11 months ago
anthonywj 8f0d0a8aad Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
chenhc 5db06d994c feat: 修改 11 months ago
anthonywj 3fe4496e79 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
chenhc 243a6c3be9 feat: 修改 11 months ago
anthonywj e56d3770b6 代码备份 11 months ago
anthonywj 9ee2f38b05 代码备份 11 months ago
anthonywj 0d2db0eb60 单据校验修改 11 months ago
anthonywj dce16042f0 测试数据 11 months ago
anthonywj 0e0c19f095 bug修改 11 months ago
wangwei 8abe46cd10 优化 绑定工位 11 months ago
anthonywj 5fae2eb944 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
anthonywj f32ac0d5a7 单据生成问题 11 months ago
chenhc 317cc8e65c feat: 修改现场作业分页接口key增加模糊字段 11 months ago
wangwei fed1c4174d 调整工位单据类型维护 1.0 8/17 11 months ago
anthonywj b545ccd651 手动扫码 11 months ago
anthonywj 5e7af56b93 自动拆零查询详情 11 months ago
anthonywj e9b939e99d 单据拆零赋码优化修改 11 months ago
wangwei 7a219014e1 7/11 优化工位 11 months ago
anthonywj ed03b900fd 拆零上货入库数量计算问题,获取下一单据 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
anthonywj 21e3e4e4d7 自动拆零问题 11 months ago
chenhc ab91277787 feat: 页面修改-业务类型、来源系统 11 months ago
wangwei 595651c193 1.2 增加往来单位类型 11 months ago
wangwei c80ba75d39 小优化 11 months ago
wangwei 0ede93fd8d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei e16769409f 8/16 code 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
chenhc 08b714b43b feat: 单据in查询 11 months ago
chenhc 76c9764465 feat: 单据in查询 11 months ago
anthonywj 4cbd788597 备份 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 a5c6d5b44e feat: 首页复制 11 months ago
chenhc 4cfe42b996 feat: 首页复制 11 months ago
anthonywj fda2478831 切换分支备份 11 months ago
chenhc c268e0d067 feat: 库存预警 11 months ago
anthonywj b481843d24 切换分支备份 11 months ago