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 |
|
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 |
 cwchen
|
d51ec0bbf3
|
统一下拉选-设备树添加company_id
|
2023-12-22 16:17:57 +08:00 |
 bns_han
|
b71ca1e957
|
后台-退料申请与审核
|
2023-12-22 15:57:59 +08:00 |
|
bns_han
|
5275483a0e
|
后台-退料申请与审核
|
2023-12-22 15:57:10 +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 |
|
cwchen
|
54a6c380d0
|
修试入库
|
2023-12-22 13:43:58 +08:00 |
|
cwchen
|
f92c7f4489
|
修试入库
|
2023-12-22 13:40:46 +08:00 |
|
cwchen
|
1bbfc1dd73
|
修试入库
|
2023-12-22 12:32:01 +08:00 |
|
cwchen
|
308d8e343c
|
修试入库
|
2023-12-22 11:21:10 +08:00 |
|
bns_han
|
8d7e961f80
|
后台-退料申请与审核
|
2023-12-22 11:05:45 +08:00 |
|
cwchen
|
f7ef5c629e
|
修试入库修改
|
2023-12-22 10:03:23 +08:00 |
|
bns_han
|
a4850f1d40
|
后台-退料申请与审核
|
2023-12-22 00:16:53 +08:00 |
|
bns_han
|
a428cf7658
|
后台-退料申请与审核
|
2023-12-22 00:13:15 +08:00 |
|
dingjie
|
2380e9a695
|
配置文件修改
|
2023-12-21 20:29:12 +08:00 |
|
dingjie
|
1e77850c42
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-21 20:28:46 +08:00 |
|
dingjie
|
881b8b80df
|
新购验收模块
|
2023-12-21 20:28:01 +08:00 |
|
liuchuan
|
04bb0c890f
|
后台维修代码提交
|
2023-12-21 20:24:45 +08:00 |
|
bns_han
|
5564d3d391
|
后台-退料申请
|
2023-12-21 20:17:36 +08:00 |
|
sliang
|
b19a375a4b
|
工机具管理-库管员配置；维修班配置
|
2023-12-21 18:35:36 +08:00 |
|
gmhao
|
3a5e6f503a
|
修改
|
2023-12-21 18:09:56 +08:00 |
|
cwchen
|
31ffacfc04
|
下拉选-设备类型树修改
|
2023-12-21 16:34:28 +08:00 |
|
cwchen
|
7d27c34072
|
下拉选修改
|
2023-12-21 16:24:46 +08:00 |
|
bns_han
|
e87c50518f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-21 14:14:19 +08:00 |
|
bns_han
|
d10f4ab05a
|
移动-退料审核修改
|
2023-12-21 14:14:05 +08:00 |
|
dingjie
|
debe5f88a2
|
文件上传大小限制修改
|
2023-12-21 14:13:03 +08:00 |
|
bns_han
|
938350aa7a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-21 13:31:39 +08:00 |
|
bns_han
|
b13f6e787f
|
移动-退料审核修改
|
2023-12-21 13:31:29 +08:00 |
|
cwchen
|
f689436364
|
大屏添加接口
|
2023-12-21 13:26:41 +08:00 |
|
syruan
|
2f6f9ec862
|
申领任务删除
|
2023-12-21 12:04:38 +08:00 |
|
cwchen
|
4524eb173f
|
统一接口修改
|
2023-12-21 11:12:12 +08:00 |
|
bns_han
|
a81d364588
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-21 10:39:24 +08:00 |
|
bns_han
|
aa8d460a0a
|
移动-退料审核修改
|
2023-12-21 10:39:12 +08:00 |
|
cwchen
|
cce08da6a2
|
统一下拉选
|
2023-12-21 10:20:50 +08:00 |
|
cwchen
|
455ab5e30b
|
统一下拉选
|
2023-12-20 21:16:17 +08:00 |
|
gmhao
|
79deb5a9d9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-20 20:35:55 +08:00 |
|
gmhao
|
c568a0d9c4
|
修改
|
2023-12-20 20:35:28 +08:00 |
|
dingjie
|
810b8b926a
|
修改类型图片
|
2023-12-20 20:35:03 +08:00 |
|
dingjie
|
a729039137
|
仓储管理模块修改
|
2023-12-20 20:28:42 +08:00 |
|
dingjie
|
4abf71e754
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-20 20:02:56 +08:00 |
|
dingjie
|
f6566e60f8
|
报错修改
|
2023-12-20 20:02:45 +08:00 |
|
sliang
|
f5d0deb4c8
|
工机具管理-库管员配置；维修班配置
|
2023-12-20 19:59:50 +08:00 |
|
bns_han
|
d543013f30
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-20 19:47:35 +08:00 |
|
bns_han
|
a94970c615
|
移动-退料申请修改
|
2023-12-20 19:47:26 +08:00 |
|
dingjie
|
6d2796d22b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-20 18:49:18 +08:00 |
|
dingjie
|
79c261b235
|
标签绑定新增
|
2023-12-20 18:49:09 +08:00 |
|
cwchen
|
c6875f0f8b
|
下拉选
|
2023-12-20 18:09:46 +08:00 |
|
bns_han
|
5ecdc9261a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-20 17:04:42 +08:00 |
|
bns_han
|
2270002805
|
移动-退料申请请求方式修改
|
2023-12-20 17:04:29 +08:00 |
|
dingjie
|
b1aa7bef5d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-20 16:08:23 +08:00 |
|
dingjie
|
c080856e14
|
文件上传路径跨域修改
|
2023-12-20 16:08:03 +08:00 |
|
cwchen
|
7e5b48872f
|
统一-下拉选
|
2023-12-20 15:32:26 +08:00 |
|
liuchuan
|
fc0d7cac8a
|
后台维修代码提交
|
2023-12-20 15:14:55 +08:00 |
|
bns_han
|
50f8c0b524
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-20 14:41:03 +08:00 |
|
bns_han
|
e5cbbafb14
|
移动-退料申请详情请求方式修改
|
2023-12-20 14:39:09 +08:00 |
|
dingjie
|
7e85418e31
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-20 14:17:02 +08:00 |
|
dingjie
|
36a3cb8268
|
文件上传路径修改
|
2023-12-20 14:16:48 +08:00 |
|
cwchen
|
2353347114
|
大屏接口修改
|
2023-12-20 13:58:18 +08:00 |
|
cwchen
|
cd210bcebe
|
大屏-常量修改
|
2023-12-20 13:16:58 +08:00 |
|
gmhao
|
afdddd648d
|
排序 资产属性
|
2023-12-19 10:09:47 +08:00 |
|
sliang
|
b6f46c6b4f
|
工机具管理-库管员配置；维修班配置
|
2023-12-19 09:58:39 +08:00 |
|
gmhao
|
c63a3cf187
|
领量管理
|
2023-12-19 09:44:55 +08:00 |
|
dingjie
|
412b095e8f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-19 09:01:30 +08:00 |
|
dingjie
|
942ec67479
|
审核模块
|
2023-12-19 09:01:17 +08:00 |
|
syruan
|
86575d4056
|
领料申请逻辑完善
|
2023-12-19 04:17:18 +08:00 |
|
gmhao
|
ba61838d2c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-19 01:48:54 +08:00 |
|
gmhao
|
0e6b525cbd
|
修改
|
2023-12-19 01:48:17 +08:00 |
|
gmhao
|
d435d728e7
|
修改
|
2023-12-19 01:38:17 +08:00 |
|
syruan
|
9fa8b537c9
|
领料申请逻辑完善
|
2023-12-19 00:53:49 +08:00 |
|
gmhao
|
e5b6e555e5
|
基礎
|
2023-12-19 00:31:13 +08:00 |
|
gmhao
|
493a186ebc
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-18 21:35:34 +08:00 |
|
liuchuan
|
e9ddb918e3
|
后台维修代码提交
|
2023-12-18 21:30:04 +08:00 |
|
sliang
|
9d5ca4a462
|
工机具管理-库管员配置；维修班配置
|
2023-12-18 21:26:40 +08:00 |
|
liuchuan
|
d62ed9f26b
|
后台维修代码提交
|
2023-12-18 17:59:46 +08:00 |
|
liuchuan
|
48008bcf69
|
后台维修代码提交
|
2023-12-18 16:20:21 +08:00 |
|
liuchuan
|
b49dcb447d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-18 16:19:43 +08:00 |
|
dingjie
|
c4e3627aa1
|
仓储模块修改
|
2023-12-18 15:39:15 +08:00 |
|
sliang
|
58fe071b38
|
工机具管理-库管员配置；维修班配置
|
2023-12-18 13:08:34 +08:00 |
|
gmhao
|
ffb442aaec
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-18 09:40:01 +08:00 |
|
cwchen
|
f9f603dfd9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-18 09:33:38 +08:00 |
|
bns_han
|
6c5d6fa6ea
|
移动退料审核
|
2023-12-17 20:04:38 +08:00 |
|
bns_han
|
e9cfbe9f29
|
移动退料申请，后台部分系统管理
|
2023-12-17 19:43:10 +08:00 |
|
liuchuan
|
eba9de34e8
|
后台维修代码提交
|
2023-12-17 18:50:22 +08:00 |
|
liuchuan
|
c0e2037689
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-17 18:49:05 +08:00 |
|
cwchen
|
698e38e812
|
大屏
|
2023-12-17 18:45:35 +08:00 |