 dingjie
|
5a49a44693
|
数据回滚问题
|
2023-12-23 23:09:17 +08:00 |
 gmhao
|
df5d92ef99
|
新增二维码 状态
|
2023-12-23 21:33:04 +08:00 |
|
dingjie
|
8ae7102597
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 21:31:37 +08:00 |
|
dingjie
|
91943ddfb4
|
机具编码标签绑定
|
2023-12-23 21:31:33 +08:00 |
|
gmhao
|
ec1824b586
|
新增二维码 状态
|
2023-12-23 21:13:17 +08:00 |
|
dingjie
|
5897142cc5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 20:53:06 +08:00 |
|
dingjie
|
fa9ad0f28f
|
机具编码标签绑定
|
2023-12-23 20:52:59 +08:00 |
 bns_han
|
e9e96526d6
|
后台-退料申请与审核
|
2023-12-23 20:24:10 +08:00 |
|
bns_han
|
bc9dfc589e
|
后台-退料申请与审核
|
2023-12-23 20:17:03 +08:00 |
wlikett
|
419cf70b3b
|
领料申请管理2
|
2023-12-23 19:51:46 +08:00 |
zhouzy062
|
5aeed17564
|
前端问题修改
|
2023-12-23 19:42:57 +08:00 |
|
dingjie
|
b6bd220662
|
上传文件生成名称规则修改
|
2023-12-23 19:33:37 +08:00 |
|
dingjie
|
a47c83e0aa
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 18:50:28 +08:00 |
|
dingjie
|
83ac831e0a
|
机具修改
|
2023-12-23 18:50:18 +08:00 |
|
wlikett
|
fd12bca625
|
领料申请管理
|
2023-12-23 18:42:25 +08:00 |
sliang
|
3718c45b4d
|
工机具管理-库管员配置；维修班配置
|
2023-12-23 18:32:23 +08:00 |
|
sliang
|
aba4aeb58f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 18:30:42 +08:00 |
|
gmhao
|
19a23f3bf8
|
新增校验
|
2023-12-23 17:35:43 +08:00 |
|
gmhao
|
e8faf72541
|
新增校验
|
2023-12-23 17:02:17 +08:00 |
syruan
|
7b0c928309
|
修正判断逻辑
|
2023-12-23 16:48:05 +08:00 |
|
zhouzy062
|
3aa081ddd0
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2023-12-23 16:04:01 +08:00 |
|
zhouzy062
|
58bce3e6a3
|
新购机具代码提交
|
2023-12-23 16:03:15 +08:00 |
|
dingjie
|
c6c96dec3c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 15:58:09 +08:00 |
|
dingjie
|
d4a943ce46
|
新购入库模块代码修改
|
2023-12-23 15:57:50 +08:00 |
|
bns_han
|
a22ee17c23
|
后台-退料申请与审核
|
2023-12-23 15:55:22 +08:00 |
|
bns_han
|
49e1b410b6
|
后台-退料申请与审核
|
2023-12-23 15:36:12 +08:00 |
|
syruan
|
b87c914739
|
maCode修正
|
2023-12-23 15:24:52 +08:00 |
|
dingjie
|
8857257ec1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 14:32:05 +08:00 |
|
dingjie
|
c1075c9320
|
新购入库模块代码修改
|
2023-12-23 14:31:54 +08:00 |
|
sliang
|
133baa8f3f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 13:43:19 +08:00 |
|
syruan
|
eab80f6156
|
SQL异常处理
|
2023-12-23 13:33:03 +08:00 |
 13218645326
|
d18dc7f9c4
|
Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev
|
2023-12-23 13:27:12 +08:00 |
|
13218645326
|
cab2ceb199
|
退料申请
|
2023-12-23 13:27:04 +08:00 |
|
sliang
|
7e8e5b269b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 12:55:36 +08:00 |
|
dingjie
|
d3f7052535
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 11:45:53 +08:00 |
|
dingjie
|
52a96de545
|
新购入库模块代码修改
|
2023-12-23 11:45:38 +08:00 |
|
sliang
|
18a5ba85e9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 11:03:21 +08:00 |
|
bns_han
|
2265d0cebc
|
后台-退料申请与审核
|
2023-12-23 10:58:55 +08:00 |
|
sliang
|
d1fb47fa51
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 10:32:11 +08:00 |
|
dingjie
|
b23b0aa7eb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 10:31:53 +08:00 |
|
sliang
|
2629a01451
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 10:24:28 +08:00 |
|
bns_han
|
2380d97848
|
后台-退料申请与审核
|
2023-12-23 10:24:00 +08:00 |
|
dingjie
|
b721caef07
|
新购入库模块代码修改
|
2023-12-23 10:16:59 +08:00 |
|
sliang
|
bc7d1b914e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 21:23:42 +08:00 |
|
sliang
|
66aa9b717e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 21:23:32 +08:00 |
|
syruan
|
76cdd524f9
|
Merge remote-tracking branch 'devVPN/dev' into dev
|
2023-12-22 21:23:29 +08:00 |
|
syruan
|
86acb6308b
|
mapper修改
|
2023-12-22 21:23:00 +08:00 |
|
dingjie
|
35c6862e01
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 21:08:09 +08:00 |
|
dingjie
|
439536142a
|
新购入库模块代码修改
|
2023-12-22 21:07:56 +08:00 |
|
sliang
|
497a00493b
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
|
2023-12-22 20:42:29 +08:00 |