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 |
|
qyt
|
3813dd8295
|
仓库逻辑改变仓库详情的逻辑都改成仓库表（第一次更新）
|
9 months ago |
yewj
|
f42eaebbb6
|
代码备份
|
9 months ago |
|
yewj
|
afed3289bd
|
选择已完成单据问题
|
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 |
|
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 |
|
wangwei
|
df00fdc69e
|
10/15 基础数据 器械优化
|
9 months ago |
|
yewj
|
5387561d2b
|
器械工位上货等相关问题修改
|
9 months ago |
|
yewj
|
7f8a26354e
|
重复扫码相关问题
|
9 months ago |
zane
|
d7e6b20bcb
|
上下货类型
|
9 months ago |
|
wangwei
|
372d633d3b
|
10/12 bug优化1.0
|
9 months ago |
|
chenhc
|
0014b8b1d3
|
feat: 手动关联
|
9 months ago |
|
wangwei
|
aaed60e9cc
|
10/10 bug优化1.0
|
9 months ago |
|
zane
|
f72a821392
|
关联码
|
9 months ago |
|
yewj
|
932387a90f
|
新增不良产品信息库
|
9 months ago |
|
wangwei
|
b4217ac5d6
|
10/8 查询优化1.0
|
9 months ago |
|
yewj
|
84639dac58
|
适配平板修改
|
9 months ago |
|
yewj
|
673532e300
|
pda，平板修改
|
9 months ago |
|
yewj
|
3395c439d1
|
系统繁忙修改
|
10 months ago |
|
wangwei
|
c12798ad5d
|
9/29 页面优化 更改单据id为Long
|
10 months ago |
|
chenhc
|
88d147eb5d
|
feat: 产品记录页面
|
10 months ago |
|
wangwei
|
9b5e03278e
|
9/29 工位维护-上货工位优化1.0
|
10 months ago |
|
yewj
|
fdf1c2e178
|
添加产品系统繁忙
|
10 months ago |
|
wangwei
|
28bda3c70c
|
9/29 工位维护增加上货工位
|
10 months ago |
|
yewj
|
82b6b1ddf9
|
bug修改
|
10 months ago |
|
yewj
|
57fb77adda
|
代码备份
|
10 months ago |
|
yewj
|
7c6e8dc929
|
代码备份
|
10 months ago |
|
yewj
|
8ed250abe8
|
包装层级数量修改
|
10 months ago |
|
zane
|
adb7d0ed2c
|
上传关联2.0
|
10 months ago |
|
yewj
|
8b1cc5b0f9
|
sys_workplace_put_rel，io_split_fifo_inv_rel脚本
|
10 months ago |
|
yewj
|
2b0eab6452
|
工位上货接口独立
|
10 months ago |
|
wangwei
|
d9078fe7d8
|
9/27 优化页面查询条件1.0
|
10 months ago |
|
wangwei
|
73c5b8940c
|
9/27 xml位置改变
|
10 months ago |
|
wangwei
|
3de8e4aaa6
|
9/27 生成
|
10 months ago |
|
chenhc
|
93851eb11c
|
feat: 器械处方
|
10 months ago |
|
chenhc
|
1f565dc9a9
|
feat: 器械处方
|
10 months ago |
|
wangwei
|
d45ef6a53e
|
9/26 优化1.0
|
10 months ago |
|
wangwei
|
39b034ac50
|
9/26 增加工位类型
|
10 months ago |
|
zane
|
c565b37b4f
|
上传关联
|
10 months ago |
|
chenhc
|
d387a3e6be
|
feat: 初始化层级码关联关系
|
10 months ago |
|
chenhc
|
7d917318ca
|
feat: 修复分组
|
10 months ago |
|
wangwei
|
19362f7032
|
9/25 药品层级优化
|
10 months ago |
|
yewj
|
c530e04750
|
现场管理业务名称
|
10 months ago |
|
wangwei
|
820b698cbe
|
9/24 现场管理bug优化1.0
|
10 months ago |
|
chenhc
|
67e4600796
|
feat: 修复
|
10 months ago |
|
yewj
|
19cc9a46a6
|
代码备份
|
10 months ago |
|
chenhc
|
8346812955
|
feat: 修复
|
10 months ago |
|
chenhc
|
3d59c98962
|
feat: 修复
|
10 months ago |
|
yewj
|
ec6c04999a
|
关键字查询修改
|
10 months ago |
|
chenhc
|
47f1b6875d
|
feat: 工位上货选已完成单
|
10 months ago |
|
wangwei
|
415ec8729b
|
9/19 追溯码备份查询1.0
|
10 months ago |
|
wangwei
|
e53cfd2c25
|
9/118 现场管理工位作业 搜索字段优化
|
10 months ago |
|
yewj
|
ea8b6e3d31
|
代码备份
|
10 months ago |
|
wangwei
|
39a2b2ca54
|
9/18 拆零管理搜索字段优化
|
10 months ago |
|
chenhc
|
9fd7db20d7
|
feat: 定时设置结合业务
|
10 months ago |
|
wangwei
|
0b32274b65
|
9/18 字段查询优化
|
10 months ago |
|
wangwei
|
c612696cae
|
9/17 字段搜索优化1.0
|
10 months ago |
|
yewj
|
e881336059
|
单据配置相关修改
|
10 months ago |
|
yewj
|
079bbd5e22
|
新增第三方单据类型编码
|
10 months ago |
|
yewj
|
a394586976
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
yewj
|
47fcc01651
|
修改界面配置是否常用字段，修改数据库为线上数据库
|
10 months ago |
|
wangwei
|
e077eb262c
|
9/14 判断当前工位是在处理单据
|
10 months ago |
|
yewj
|
e83ea0388d
|
新增发货方
|
10 months ago |
|
wangwei
|
ed415e534f
|
9/11 业务类型增加收货方送货方
|
10 months ago |
|
chenhc
|
af48f10572
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
chenhc
|
4b43b43efa
|
fix: 修复原始单据
|
10 months ago |
|
yewj
|
41a3e51b1e
|
代码备份
|
10 months ago |
|
zane
|
d27586ab86
|
新增关键字搜索
|
10 months ago |
|
yewj
|
45931be879
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
yewj
|
d6e670ed0f
|
选择单据区分
|
10 months ago |
|
zane
|
db593cf1a3
|
新增关键字搜索
|
10 months ago |
|
wangwei
|
0469fac615
|
9/14 优化
|
10 months ago |
|
zane
|
14a83be21d
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
10 months ago |
|
zane
|
f99f2da6b6
|
新增关键字搜索
|
10 months ago |
|
wangwei
|
787e9f220c
|
9/14 优化
|
10 months ago |
|
zane
|
22933258ce
|
新增关键字搜索
|
10 months ago |
|
chenhc
|
80a1f3be28
|
fix: 修复
|
10 months ago |
|
yewj
|
6981fba035
|
代码备份
|
10 months ago |
|
chenhc
|
902be7b1b6
|
fix: 修复
|
10 months ago |
|
chenhc
|
d95a60639a
|
fix: 修复
|
10 months ago |
|
yewj
|
c2a369c1a9
|
bug修改
|
10 months ago |
|
chenhc
|
b401e60198
|
fix: 修复
|
10 months ago |
|
chenhc
|
483a136e34
|
fix: 修复
|
10 months ago |
|
yewj
|
6bee8dcc47
|
处理单据时显示工位存量和拆零存量
|
10 months ago |
|
chenhc
|
e571580a70
|
fix: 修复
|
10 months ago |
|
wangwei
|
b10849d785
|
9/11 youhua1.0
|
10 months ago |
|
wangwei
|
40913d3813
|
9/11 药品基础数据
|
10 months ago |
|
wangwei
|
4beefa4e05
|
9/11 药品字典优化
|
10 months ago |
|
wangwei
|
717ff55dd6
|
9/11 已完成处方修改
|
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 |
|
wangwei
|
9a9ae6dd51
|
9/9 查看常用业务类型和更多业务类型
|
10 months ago |
|
wangwei
|
94ff408b57
|
9/9 业务类型增加是否常用
|
10 months ago |
|
wangwei
|
645f311c70
|
9/9 业务类型增加顺序号
|
10 months ago |
|
wangwei
|
86c46125e0
|
9/9 根据当前用户工位查看单据
|
10 months ago |
|
wangwei
|
1698e7bcda
|
9/9 业务类类型字段增加
|
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
|
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 损耗出库库存修改
|
10 months ago |
|
zane
|
94abad9642
|
单据上传
|
10 months ago |
|
chenhc
|
b66f0d5fc2
|
fix: sql
|
10 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 |
