 liuchuan
|
7e2564fe06
|
后台代码提交
|
2023-12-24 12:03:43 +08:00 |
 bns_han
|
3da3fea251
|
app-退料接收
|
2023-12-24 10:59:18 +08:00 |
|
bns_han
|
9c134fde80
|
app-退料接收
|
2023-12-24 09:56:38 +08:00 |
|
bns_han
|
29112420e5
|
app-退料接收
|
2023-12-24 01:53:20 +08:00 |
syruan
|
7e06bc88b2
|
时间格式序列化
|
2023-12-24 01:51:42 +08:00 |
|
bns_han
|
f7501db4a5
|
app-退料接收
|
2023-12-24 01:29:03 +08:00 |
 cwchen
|
a9c0ee9585
|
大屏接口修改
|
2023-12-24 00:52:17 +08:00 |
sliang
|
950f125032
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-24 00:48:06 +08:00 |
|
sliang
|
06222113d5
|
工机具管理-库管员配置；维修班配置
|
2023-12-24 00:47:55 +08:00 |
|
bns_han
|
83d624bec2
|
app-退料接收
|
2023-12-24 00:47:35 +08:00 |
|
bns_han
|
d5a90a5b64
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-24 00:46:19 +08:00 |
|
bns_han
|
69097feb30
|
app-退料接收
|
2023-12-24 00:46:08 +08:00 |
 dingjie
|
17a9c7d8a0
|
机具设备管理模糊搜索
|
2023-12-24 00:44:11 +08:00 |
|
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 |
|
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 |
|
bns_han
|
d10f4ab05a
|
移动-退料审核修改
|
2023-12-21 14:14:05 +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 |
|
bns_han
|
aa8d460a0a
|
移动-退料审核修改
|
2023-12-21 10:39:12 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
syruan
|
d73fe10073
|
领料出库接口提交
|
2023-12-17 18:01:20 +08:00 |
|
cwchen
|
ce490e7ebd
|
大屏接口修改
|
2023-12-17 16:19:32 +08:00 |
|
cwchen
|
92f726fee7
|
修试入库
|
2023-12-17 16:10:04 +08:00 |
|
cwchen
|
fad9414a7b
|
base修试入库接口迁移
|
2023-12-17 13:23:18 +08:00 |
|
liuchuan
|
c9e54bfb07
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-17 10:57:03 +08:00 |
|
cwchen
|
103cf80ceb
|
修试入库接口
|
2023-12-16 21:27:14 +08:00 |
|
liuchuan
|
0533581024
|
后台维修代码提交
|
2023-12-16 21:12:55 +08:00 |
|
liuchuan
|
8f71aa835e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-16 21:11:02 +08:00 |
|
dingjie
|
ef3264da2b
|
新购验收部分
|
2023-12-16 20:55:40 +08:00 |
|
dingjie
|
ee9d9e3a96
|
协议修改模块位置
|
2023-12-16 20:52:13 +08:00 |
|
sliang
|
8fe72fc067
|
工机具管理-库管员配置；维修班配置
|
2023-12-16 20:41:20 +08:00 |
|
liuchuan
|
de23009487
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-16 18:08:52 +08:00 |
|
gmhao
|
28febdf604
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-16 17:22:27 +08:00 |
|
cwchen
|
52cebd38f3
|
大屏
|
2023-12-16 14:30:02 +08:00 |
|
cwchen
|
9edf649b72
|
大屏
|
2023-12-16 13:01:37 +08:00 |
|
dingjie
|
5906f6cc50
|
新购验收部分
|
2023-12-15 21:07:27 +08:00 |
|
syruan
|
2998d5d53a
|
六位验证码生成方式重写，BUG冲突解决
|
2023-12-15 21:04:09 +08:00 |
|
gmhao
|
f683888b85
|
资产属性配置
|
2023-12-15 18:59:41 +08:00 |
|
dingjie
|
bff82919e2
|
新购验收部分
|
2023-12-15 15:29:41 +08:00 |
|
gmhao
|
640ff3b15e
|
基础管理修改
|
2023-12-15 14:03:03 +08:00 |
|
liuchuan
|
fc1d70a0bf
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-15 13:44:57 +08:00 |
|
dingjie
|
baa3831c51
|
新购验收部分
|
2023-12-15 09:16:47 +08:00 |
|
liuchuan
|
007b2a9220
|
后台维修代码提交
|
2023-12-14 17:25:17 +08:00 |
|
liuchuan
|
84b27e2e19
|
app首页代码提交
|
2023-12-14 16:01:48 +08:00 |
|
dingjie
|
171bea8437
|
任务冲突修改
|
2023-12-14 09:37:38 +08:00 |
|
syruan
|
76f5e2d65f
|
机具领料申请接口及业务逻辑的开发
|
2023-12-13 19:29:50 +08:00 |
|
dingjie
|
106bcfb26e
|
配件管理
|
2023-12-13 15:36:23 +08:00 |
|
dingjie
|
79f5ae3888
|
代码问题修改
|
2023-12-13 10:49:57 +08:00 |
|
gmhao
|
5cb4514baa
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-12 17:28:08 +08:00 |
|
gmhao
|
bffa02c5c7
|
基础管理
|
2023-12-12 17:27:53 +08:00 |
|
dingjie
|
5eedbacdb5
|
基础服务管理模块
|
2023-12-12 16:58:45 +08:00 |
|
gmhao
|
0190ebfad0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-11 16:19:01 +08:00 |
|
gmhao
|
98d96651e8
|
数据字典表
|
2023-12-11 16:08:36 +08:00 |
|
gmhao
|
8ce8c4cb6b
|
数据字典表
|
2023-12-11 16:06:14 +08:00 |
|
cwchen
|
97b44440fd
|
大屏
|
2023-12-11 15:47:13 +08:00 |
|
gmhao
|
c42f4d6e63
|
数据字典表
|
2023-12-11 13:59:25 +08:00 |
|
gmhao
|
ac3db129cc
|
删除错表
|
2023-12-11 13:45:09 +08:00 |
|
gmhao
|
f56f591417
|
字典表
|
2023-12-11 12:53:49 +08:00 |
|
dingjie
|
b86632443c
|
业务代码提交
|
2023-12-10 17:35:50 +08:00 |
|
dingjie
|
4d285e4d8c
|
项目配置问题处理
|
2023-12-08 15:45:04 +08:00 |
|
dingjie
|
05864d6392
|
项目配置问题处理
|
2023-12-08 09:51:56 +08:00 |
|
dingjie
|
cc950fb2b3
|
项目启动问题处理
|
2023-12-07 13:38:50 +08:00 |
 zfhai
|
2e319885b2
|
新增
|
2023-11-30 20:15:53 +08:00 |
 bonus
|
8920821ac5
|
项目第一次上传git
|
2023-11-28 20:33:38 +08:00 |