 dingjie
|
f5d239e879
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-24 00:39:38 +08:00 |
|
dingjie
|
f4a5421257
|
机具设备管理模糊搜索
|
2023-12-24 00:39:26 +08:00 |
syruan
|
a83d09f0d4
|
Merge remote-tracking branch 'devVPN/dev' into dev
|
2023-12-24 00:33:27 +08:00 |
 bns_han
|
69d37909db
|
app-退料接收
|
2023-12-24 00:32:10 +08:00 |
|
syruan
|
f0254a5f3d
|
QRCODE判断修正
|
2023-12-24 00:31:04 +08:00 |
sliang
|
c0a7eebdda
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 23:33:59 +08:00 |
 cwchen
|
726fc6d996
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 23:17:43 +08:00 |
|
cwchen
|
5ae2f1679f
|
大屏接口修改
|
2023-12-23 23:17:12 +08:00 |
 gmhao
|
0ad1ac019d
|
修改往来单位
|
2023-12-23 22:52:36 +08:00 |
|
sliang
|
11aef851d9
|
工机具管理-库管员配置；维修班配置
|
2023-12-23 21:49:43 +08:00 |
|
gmhao
|
df5d92ef99
|
新增二维码 状态
|
2023-12-23 21:33:04 +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 |
|
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 |
|
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 |
|
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
|
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 |
|
sliang
|
7e8e5b269b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-23 12:55:36 +08:00 |
|
dingjie
|
52a96de545
|
新购入库模块代码修改
|
2023-12-23 11:45:38 +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 |
|
sliang
|
bc7d1b914e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-22 21:23:42 +08:00 |
|
syruan
|
86acb6308b
|
mapper修改
|
2023-12-22 21:23:00 +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 |
|
syruan
|
7f73c243f5
|
支持工程与往来单位及协议修改
|
2023-12-22 20:27:35 +08:00 |
|
sliang
|
621fe5a27a
|
获取领料申请-详情列表
|
2023-12-22 20:17:22 +08:00 |
|
dingjie
|
a18aff4d23
|
新购模块代码修改
|
2023-12-22 19:14:59 +08:00 |
|
gmhao
|
689abd905d
|
设备标签二改 新增下拉框
|
2023-12-22 18:49:20 +08:00 |
 liuchuan
|
0abdca2751
|
后台代码提交
|
2023-12-22 17:59:58 +08:00 |
|
gmhao
|
2495ce88f5
|
设备标签二改 新增下拉框
|
2023-12-22 17:07:32 +08:00 |
|
syruan
|
04d79ac8b0
|
完善领料申请修改逻辑
|
2023-12-22 16:24:25 +08:00 |
|
syruan
|
3e1839ce64
|
合并分支，处理冲突异常
|
2023-12-22 15:21:18 +08:00 |
|
syruan
|
bf0c462853
|
删除领料明细接口提交
|
2023-12-22 15:10:27 +08:00 |
|
sliang
|
6d642b7edf
|
获取领料申请-详情列表
|
2023-12-22 14:48:58 +08:00 |
|
bns_han
|
7f1e051e42
|
后台-退料申请与审核
|
2023-12-22 14:13:53 +08:00 |
|
gmhao
|
54eed165b5
|
设备标签缺陷
|
2023-12-22 13:56:28 +08:00 |