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
|
c6ad3e0bed
|
多码提交确认
|
8 months ago |
|
yewj
|
1b1474307d
|
处理单据确认
|
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 |
|
yewj
|
346a0b0413
|
工位上货扫码移除
|
8 months ago |
|
wangwei
|
4d04834a69
|
10/28 剔除码1.0
|
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 |
|
wangwei
|
df185518ed
|
10/25 bug 优化 1.0
|
9 months ago |
|
chenhc
|
906f15b300
|
feat: 上传多码融合
|
9 months ago |
|
wangwei
|
c992490c13
|
10/24 bug优化1.0
|
9 months ago |
|
wangwei
|
d5f3142c43
|
10/24 bug优化1.0
|
9 months ago |
|
yewj
|
e5fd1d64f9
|
代码备份
|
9 months ago |
|
chenhc
|
3c8db94c77
|
feat: 多码融合
|
9 months ago |
|
wangwei
|
0907e42e4e
|
10/23 bug优化1.0
|
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
|
fdb95857cc
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
9 months ago |
|
wangwei
|
3021ca2d16
|
10/22 优化1.0
|
9 months ago |
|
yewj
|
0b10eb6610
|
代码备份
|
9 months ago |
|
wangwei
|
f23db0fe4a
|
10/22 库存优化
|
9 months ago |
|
qyt
|
2df7c3fb94
|
Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z
|
9 months ago |
|
chenhc
|
a0dba60a33
|
feat: 码明细
|
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 |
|
yewj
|
9f46579a9d
|
查询码明细修改
|
9 months ago |
|
chenhc
|
a17b725415
|
feat: 拉取外网单据
|
9 months ago |
|
yewj
|
e3f53aabac
|
代码备份
|
9 months ago |
|
qyt
|
3813dd8295
|
仓库逻辑改变仓库详情的逻辑都改成仓库表（第一次更新）
|
9 months ago |
|
wangwei
|
d23572b7cf
|
10/21 同步单据修改
|
9 months ago |
|
yewj
|
5f915dffe2
|
工位上货问题
|
9 months ago |
|
yewj
|
f614074665
|
器械扫码拆零问题
|
9 months ago |
|
yewj
|
86ba1f0dfe
|
器械扫码拆零问题
|
9 months ago |
|
chenhc
|
43c5b1923f
|
feat: 修复
|
9 months ago |
|
chenhc
|
86f229fd69
|
feat: 修复
|
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 |
|
wangwei
|
3f2f2edf30
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
9 months ago |
|
chenhc
|
e66332e4fb
|
feat: 药品关联信息上下传输功能
|
9 months ago |
|
wangwei
|
2a1ff42fe7
|
10/17 代码备份1.0
|
9 months ago |
|
yewj
|
29bfdc9725
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
9 months ago |
|
yewj
|
f6fbc4272b
|
器械层级修改
|
9 months ago |
|
wangwei
|
61e784aca3
|
10/17 单据增加单据类型（器械/药品）基础数据器械响应优化
|
9 months ago |
|
chenhc
|
bfaae7675e
|
feat: 药品关联关系功能
|
9 months ago |
|
chenhc
|
dcfa320847
|
fix: 拉取外网药品关联信息
|
9 months ago |
|
yewj
|
d313d19f35
|
删除库存明细
|
9 months ago |
|
wangwei
|
df00fdc69e
|
10/15 基础数据 器械优化
|
9 months ago |
|
yewj
|
5387561d2b
|
器械工位上货等相关问题修改
|
9 months ago |
|
chenhc
|
23e199af6d
|
fix: 修复原始单据下载本地单据
|
9 months ago |
|
chenhc
|
77b0bb79ce
|
fix: 修复原始单据下载本地单据
|
9 months ago |
|
yewj
|
a250ce1700
|
备份
|
9 months ago |
|
chenhc
|
0c21bd46a3
|
fix: 修复
|
9 months ago |
|
qyt
|
a8b853ef96
|
Merge branch 'dev_fifo_z' of http://116.204.71.86:3000/UDI/udi-wms-java into dev_fifo_z
|
9 months ago |
|
qyt
|
8927680db7
|
1、增加流通层级默认值为1
|
9 months ago |
|
chenhc
|
432882d8ff
|
fix: 修复
|
9 months ago |
|
chenhc
|
e938cc0c7a
|
fix: 修复
|
9 months ago |
|
chenhc
|
2bb5f8b116
|
fix: 修复
|
9 months ago |
|
chenhc
|
dbf696db1e
|
feat: 手工、拼箱关联修改
|
9 months ago |
|
yewj
|
9782e2a47d
|
备份
|
9 months ago |
|
chenhc
|
18418fa8f0
|
feat: 手工、拼箱关联修改
|
9 months ago |
|
yewj
|
5edf979164
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
9 months ago |
|
yewj
|
7f8a26354e
|
重复扫码相关问题
|
9 months ago |
|
chenhc
|
f1f8847bfe
|
feat: 手工、拼箱关联修改
|
9 months ago |
|
chenhc
|
14ae99a760
|
feat: 拼箱关联
|
9 months ago |
zane
|
d7e6b20bcb
|
上下货类型
|
9 months ago |
|
wangwei
|
372d633d3b
|
10/12 bug优化1.0
|
9 months ago |
|
chenhc
|
59614c8fc1
|
feat: 拼箱关联
|
9 months ago |
|
zane
|
84d2f939ae
|
暂存
|
9 months ago |
|
wangwei
|
aaed60e9cc
|
10/10 bug优化1.0
|
9 months ago |
|
zane
|
d81671b20d
|
失效日期
|
9 months ago |
|
wangwei
|
125b6c9736
|
10/8 现场管理优化
|
9 months ago |
|
zane
|
f72a821392
|
关联码
|
9 months ago |
|
yewj
|
18a47639f5
|
产品过期提醒
|
9 months ago |
|
yewj
|
932387a90f
|
新增不良产品信息库
|
9 months ago |
|
chenhc
|
2884de554f
|
feat: 单据下载-器械
|
9 months ago |
|
zane
|
7c954014c5
|
关联码
|
9 months ago |
|
wangwei
|
b4217ac5d6
|
10/8 查询优化1.0
|
9 months ago |
|
yewj
|
3ee4a3291f
|
未上架拆零
|
9 months ago |
|
yewj
|
b7ff531f30
|
系统繁忙修改
|
9 months ago |
|
yewj
|
7839465aac
|
工位扣减库存扫码数量问题
|
9 months ago |
|
wangwei
|
c12798ad5d
|
9/29 页面优化 更改单据id为Long
|
9 months ago |
|
chenhc
|
7d4811ebb3
|
feat: 拆包失效进行损耗出库
|
9 months ago |
|
chenhc
|
6f92047212
|
feat: 产品记录页面
|
9 months ago |
|
chenhc
|
88d147eb5d
|
feat: 产品记录页面
|
9 months ago |
|
chenhc
|
c17bb88f8c
|
feat: 产品记录页面
|
9 months ago |
|
yewj
|
af07643adf
|
扫码校验
|
9 months ago |
|
wangwei
|
28bda3c70c
|
9/29 工位维护增加上货工位
|
9 months ago |
|
yewj
|
4d73efd7ac
|
工位库存，上货，拆零等相关修改
|
9 months ago |
|
yewj
|
38dcaae1e2
|
工位库存，上货，拆零等相关修改
|
9 months ago |
|
yewj
|
82b6b1ddf9
|
bug修改
|
9 months ago |
|
yewj
|
8ed250abe8
|
包装层级数量修改
|
9 months ago |
|
zane
|
1894cfec9a
|
上传关联2.0
|
9 months ago |
|
zane
|
adb7d0ed2c
|
上传关联2.0
|
9 months ago |
|
yewj
|
2b0eab6452
|
工位上货接口独立
|
9 months ago |
|
zane
|
3df1ede2c4
|
上传关联优化
|
9 months ago |
|
wangwei
|
73c5b8940c
|
9/27 xml位置改变
|
9 months ago |
|
wangwei
|
6b10bdf8e1
|
9/27
|
9 months ago |
|
wangwei
|
3de8e4aaa6
|
9/27 生成
|
9 months ago |
|
chenhc
|
93851eb11c
|
feat: 器械处方
|
9 months ago |
|
chenhc
|
1f565dc9a9
|
feat: 器械处方
|
9 months ago |
|
zane
|
e93c8bfb25
|
上传关联
|
9 months ago |
|
zane
|
00ec6eca85
|
上传关联
|
9 months ago |
|
zane
|
c565b37b4f
|
上传关联
|
9 months ago |
|
chenhc
|
dbe6477e09
|
feat: 器械处方
|
9 months ago |
|
chenhc
|
d387a3e6be
|
feat: 初始化层级码关联关系
|
9 months ago |
|
wangwei
|
55e7050e58
|
9/25 1.0
|
10 months ago |
|
wangwei
|
19362f7032
|
9/25 药品层级优化
|
10 months ago |
|
yewj
|
d4856b2df5
|
使用层级数量
|
10 months ago |
|
chenhc
|
dfcf62f1a8
|
feat: 修复
|
10 months ago |
|
wangwei
|
820b698cbe
|
9/24 现场管理bug优化1.0
|
10 months ago |
|
chenhc
|
dab3a664e5
|
feat: 修复
|
10 months ago |
|
chenhc
|
6af801c20a
|
feat: 修复
|
10 months ago |
|
chenhc
|
4ebf9eedf3
|
feat: 修复
|
10 months ago |
|
chenhc
|
67e4600796
|
feat: 修复
|
10 months ago |
|
yewj
|
06c84bcb14
|
工位上货问题，单据详情
|
10 months ago |
|
yewj
|
19cc9a46a6
|
代码备份
|
10 months ago |
|
yewj
|
ec6c04999a
|
关键字查询修改
|
10 months ago |
|
wangwei
|
415ec8729b
|
9/19 追溯码备份查询1.0
|
10 months ago |
|
yewj
|
01028cc67f
|
修改扫码单生成业务单逻辑
|
10 months ago |
|
wangwei
|
d56d8b99c6
|
9/18 现场管理优化1.0
|
10 months ago |
|
chenhc
|
661dd402cb
|
feat: 下载处方key模糊、修复分页接口
|
10 months ago |
|
chenhc
|
9fd7db20d7
|
feat: 定时设置结合业务
|
10 months ago |
|
chenhc
|
fa2ca710bd
|
fix: 三方单据查询分页增加模糊key
|
10 months ago |
|
yewj
|
e881336059
|
单据配置相关修改
|
10 months ago |
|
yewj
|
0c6a6341ef
|
单据上传相关修改
|
10 months ago |
|
yewj
|
3047f89cc1
|
代码备份
|
10 months ago |
|
wangwei
|
e077eb262c
|
9/14 判断当前工位是在处理单据
|
10 months ago |
|
yewj
|
5b42e35df6
|
代码备份
|
10 months ago |
|
chenhc
|
f1601e673f
|
fix: 修复原始单据
|
10 months ago |
|
chenhc
|
4b43b43efa
|
fix: 修复原始单据
|
10 months ago |
|
chenhc
|
a7b3ffced2
|
fix: 修复原始单据
|
10 months ago |
|
wangwei
|
609e7b9e84
|
9/14 工位优化
|
10 months ago |
|
wangwei
|
97484a6e10
|
9/14 youhua
|
10 months ago |
|
wangwei
|
787e9f220c
|
9/14 优化
|
10 months ago |
|
yewj
|
b42b4d272a
|
取消单据，提示修改
|
10 months ago |
|
yewj
|
db7acbb48c
|
处理单据相关修改
|
10 months ago |
|
yewj
|
5fc0d84bff
|
待处理单据
|
10 months ago |
|
yewj
|
79a2e44340
|
原始单据下载问题
|
10 months ago |
|
yewj
|
6981fba035
|
代码备份
|
10 months ago |
|
chenhc
|
902be7b1b6
|
fix: 修复
|
10 months ago |
|
chenhc
|
d95a60639a
|
fix: 修复
|
10 months ago |
|
chenhc
|
483a136e34
|
fix: 修复
|
10 months ago |
|
yewj
|
6bee8dcc47
|
处理单据时显示工位存量和拆零存量
|
10 months ago |
|
chenhc
|
e571580a70
|
fix: 修复
|
10 months ago |
|
wangwei
|
40913d3813
|
9/11 药品基础数据
|
10 months ago |
|
wangwei
|
717ff55dd6
|
9/11 已完成处方修改
|
10 months ago |
|
chenhc
|
50987f7f7e
|
fix: 修复
|
10 months ago |
|
chenhc
|
f4d932671d
|
fix: 原始单据分表出来
|
10 months ago |
|
yewj
|
642051dbb9
|
代码备份
|
10 months ago |
|
wangwei
|
0113ecb209
|
9/10 优化1.2
|
10 months ago |
|
wangwei
|
5c0fc021ec
|
9/10 优化1.0
|
10 months ago |
|
yewj
|
941a85db30
|
批量扫码问题
|
10 months ago |
|
yewj
|
177a2651dd
|
第三方产品信息选入
|
10 months ago |
|
zane
|
e7c1b4028f
|
单据批量下载
|
10 months ago |
|
wangwei
|
645f311c70
|
9/9 业务类型增加顺序号
|
10 months ago |
|
zane
|
1fc06149ec
|
单据批量下载
|
10 months ago |
|
yewj
|
71687a71fc
|
去除掉中间表
|
10 months ago |
|
zane
|
02e524b56f
|
单据下载
|
10 months ago |
|
wangwei
|
3fddf12cf3
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
wangwei
|
eeaa4e0a3e
|
9/9 优化
|
10 months ago |
|
zane
|
fd8cbc1e86
|
工位下的类型
|
10 months ago |
|
yewj
|
e7d2c6b460
|
第三方单据修改
|
10 months ago |
|
yewj
|
854e569282
|
独占库存修改
|
10 months ago |
|
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
|
6efe7321b4
|
批量扫码
|
10 months ago |
|
yewj
|
969afd4a6a
|
第三方单据下载问题
|
10 months ago |
|
yewj
|
a7747416c5
|
业务单生成扫码单问题，
|
10 months ago |
|
zane
|
a168f03590
|
拉取单据
|
10 months ago |
|
zane
|
2efc35861a
|
拉取单据
|
10 months ago |
|
yewj
|
0ffa77d1e0
|
代码备份
|
10 months ago |
|
zane
|
03b9171a75
|
单据
|
10 months ago |
|
wangwei
|
7e698fc720
|
9/6 优化
|
10 months ago |
|
wangwei
|
221a01ebc5
|
9/6 损耗明细
|
10 months ago |
|
zane
|
7ff581b4c1
|
单据异常处理
|
10 months ago |
|
chenhc
|
8e4ea95e41
|
fix: 用户info加工位信息
|
10 months ago |
|
wangwei
|
218c101a40
|
9/6 药品基础数据
|
10 months ago |
|
yewj
|
28764fc1ac
|
拆零bug
|
10 months ago |
|
yewj
|
5e2638f4ca
|
拆零逻辑修改
|
10 months ago |
|
yewj
|
4911c8ff35
|
bug修改
|
10 months ago |
|
yewj
|
212e41765f
|
损耗出库问题
|
10 months ago |
|
yewj
|
c02e98c783
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
yewj
|
5a731baf5d
|
损耗出库问题
|
10 months ago |
|
zane
|
fafd6afa2e
|
字典未对照单据异常
|
10 months ago |
|
yewj
|
fe6a7c18b1
|
bug修改
|
10 months ago |
|
wangwei
|
acc4863693
|
9/5 基础数据药品
|
10 months ago |
|
zane
|
b2b34206da
|
单据
|
10 months ago |
|
chenhc
|
c5007e249c
|
fix: 不做锁的互斥
|
10 months ago |
|
yewj
|
252a3a6106
|
自动赋码逻辑修改
|
10 months ago |
|
yewj
|
65d6d718c1
|
自动赋码逻辑修改
|
10 months ago |
|
yewj
|
c78b04188e
|
代码备份
|
10 months ago |
|
chenhc
|
2e77aa6bd5
|
fix: 原始转待处理修改
|
10 months ago |
|
yewj
|
82973f06be
|
处方单据时间问题
|
10 months ago |
|
yewj
|
8b76c7d458
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
yewj
|
b00841f3bf
|
单据上传
|
10 months ago |
|
wangwei
|
a99bbe942e
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
wangwei
|
a068acd71a
|
9/4 bug 修改
|
10 months ago |
|
yewj
|
78f87227f1
|
单据上传
|
10 months ago |
|
yewj
|
00788a0597
|
代码备份
|
10 months ago |
|
wangwei
|
85bee382c4
|
9/3 追溯码查询1.0
|
10 months ago |
|
yewj
|
affd4a9e8e
|
代码备份
|
10 months ago |
|
wangwei
|
0500733b55
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
wangwei
|
d3c9544dc1
|
9/2 药品关联
|
10 months ago |
|
zane
|
9c3d1b94ab
|
单据上传状态
|
10 months ago |
|
wangwei
|
f032261e1f
|
8/2 损耗出库库存修改
|
10 months ago |
|
zane
|
c313dba342
|
单据上传状态
|
10 months ago |
|
yewj
|
e83a0ecdb7
|
医保单据上传修改
|
10 months ago |
|
zane
|
a052a6582b
|
单据上传
|
10 months ago |
|
wangwei
|
0cb38e625f
|
9/2 下载处方信息
|
10 months ago |
|
yewj
|
59a762c5bf
|
单据上传与下载
|
10 months ago |
|
yewj
|
bcbcda9ebb
|
代码备份
|
10 months ago |
|
yewj
|
8ea1b42e7d
|
代码备份
|
10 months ago |
|
wangwei
|
27b1a4e5ee
|
8/31 损耗出库修改 业务类型增加 是否独占
|
10 months ago |
|
chenhc
|
ace5595719
|
fix: 是否自动赋码
|
10 months ago |
|
yewj
|
bb2d265e22
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
# src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java
|
10 months ago |
|
yewj
|
7a01a5c5ae
|
拆零损耗出库
|
10 months ago |
|
wangwei
|
2a4bee48eb
|
8/30 根据追溯码损耗出库
|
10 months ago |
|
yewj
|
a9c306c0a7
|
库存明细ID外键
|
10 months ago |
|
yewj
|
f864bd6503
|
新增码替换字段
|
10 months ago |
|
yewj
|
3c368f3311
|
存量库存修改
|
10 months ago |
|
wangwei
|
241f7901fc
|
8/30 损耗出库
|
10 months ago |
|
yewj
|
6bb1edad56
|
库存添加业务类型
|
10 months ago |
|
yewj
|
3b7b118370
|
1.待处理单据库存锁定修改，2.单据拆零出库锁定修改，3；单据上下货库存修改，4.上货后触发单据锁定
|
10 months ago |
|
wangwei
|
00210b6a6b
|
8/29 业务类型修改
|
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 |
|
chenhc
|
6f36a8cfec
|
fix: 修改
|
10 months ago |
|
yewj
|
f4d1ef4b9b
|
新增拆零销毁出库相关方法接口
|
10 months ago |
|
wangwei
|
7cfe54fa39
|
8/28 药品数据维护第三方药品
|
10 months ago |
|
chenhc
|
09e1f63cb1
|
fix: 修改
|
10 months ago |
|
chenhc
|
560e6eb318
|
fix: 修改
|
10 months ago |
|
yewj
|
7bfa3d94ba
|
代码备份
|
10 months ago |
|
zane
|
b3764923df
|
预警状态
|
10 months ago |
|
zane
|
75d81b507f
|
预警状态
|
10 months ago |
|
chenhc
|
204f95f610
|
fix: 库存预警修改
|
10 months ago |
|
zane
|
ddb549c621
|
库存预警
|
10 months ago |
