mashuai
|
eda8eac15d
|
权限
|
2024-05-08 18:43:46 +08:00 |
mashuai
|
99761fb49c
|
权限
|
2024-05-08 18:23:47 +08:00 |
BianLzhaoMin
|
f6c1bdb1c7
|
冲突合并
|
2024-05-07 16:38:53 +08:00 |
liang.chao
|
8b5519223f
|
测试问题bug修改
|
2024-05-07 16:29:36 +08:00 |
mashuai
|
75d2b02422
|
bug
|
2024-05-06 18:20:45 +08:00 |
liang.chao
|
25ad01ce71
|
bug修改提交
|
2024-05-06 17:59:30 +08:00 |
liang.chao
|
0cce5cc793
|
退料审核代码提交
|
2024-05-06 17:07:03 +08:00 |
15856
|
40736e1c85
|
催办,退料报废,维修报废,预报废审核,报废审核
|
2024-05-06 10:35:08 +08:00 |
mashuai
|
4c8a65cd54
|
大屏
|
2024-05-06 10:04:58 +08:00 |
BianLzhaoMin
|
688599a5b0
|
宁夏 冲突合并
|
2024-05-06 09:48:15 +08:00 |
liang.chao
|
52745e9a4e
|
退料审核代码提交
|
2024-05-06 09:42:49 +08:00 |
15856
|
834faeee43
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-30 17:51:44 +08:00 |
liang.chao
|
bc8420e094
|
bug修改提交
|
2024-04-30 16:43:40 +08:00 |
mashuai
|
1ed94a6706
|
bug
|
2024-04-30 15:14:27 +08:00 |
liang.chao
|
1030c78305
|
app领料申请详情bug提交
|
2024-04-30 14:09:40 +08:00 |
15856
|
1419b8c32d
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-30 13:11:10 +08:00 |
mashuai
|
f23b73106a
|
bug
|
2024-04-30 11:29:00 +08:00 |
liang.chao
|
6b002958d6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-30 11:23:54 +08:00 |
liang.chao
|
ffe7c67c6f
|
重庆领料审核修改后无数据bug
|
2024-04-30 11:23:49 +08:00 |
15856
|
bbf5d988f3
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-30 10:26:55 +08:00 |
liang.chao
|
763c003c34
|
新购验收查询接口添加
|
2024-04-30 09:09:34 +08:00 |
mashuai
|
d1ed28a088
|
bug
|
2024-04-29 17:42:02 +08:00 |
mashuai
|
d58c1b788d
|
bug
|
2024-04-29 16:52:51 +08:00 |
mashuai
|
4f9cb5e37e
|
宁夏大屏二级页面
|
2024-04-29 14:38:15 +08:00 |
15856
|
bad5c11bdc
|
Merge remote-tracking branch 'origin/dev' into dev-cq-bug
|
2024-04-28 16:41:10 +08:00 |
15856
|
660d90550a
|
Bug修复
|
2024-04-28 16:23:43 +08:00 |
liang.chao
|
c2aaa44f1b
|
app联调代码提交
|
2024-04-28 16:16:29 +08:00 |
liang.chao
|
bf0992137d
|
成套机具和退料申请当前在用量代码提交
|
2024-04-26 17:00:29 +08:00 |
15856
|
5051b6ae92
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-25 16:47:32 +08:00 |
15856
|
14822542ce
|
Bug修复
|
2024-04-25 16:43:56 +08:00 |
15856
|
090fc6c17d
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-25 16:42:58 +08:00 |
liang.chao
|
d293399415
|
成套机具代码提交
|
2024-04-25 16:30:04 +08:00 |
mashuai
|
0e681358a9
|
bug
|
2024-04-25 15:52:01 +08:00 |
mashuai
|
ff893914d9
|
bug修改
|
2024-04-25 14:51:11 +08:00 |
mashuai
|
62aeaf6cfd
|
bug修改
|
2024-04-25 13:08:53 +08:00 |
liang.chao
|
3ac38557af
|
成套机具代码提交
|
2024-04-24 17:59:17 +08:00 |
liang.chao
|
82e8a6db4a
|
退料审核代码提交
|
2024-04-24 14:05:18 +08:00 |
liang.chao
|
3fedcde616
|
sql提交
|
2024-04-23 09:35:44 +08:00 |
liang.chao
|
62f2330ffb
|
成套机具代码提交
|
2024-04-23 09:19:37 +08:00 |
csyue
|
f94470a742
|
测试app问题项修改
|
2024-04-22 18:58:46 +08:00 |
liang.chao
|
b4c3540fb5
|
退料审核代码提交
|
2024-04-22 11:19:06 +08:00 |
liang.chao
|
b1fee78651
|
bug修改
|
2024-04-20 17:29:05 +08:00 |
mashuai
|
e9deecdee5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-20 16:58:45 +08:00 |
mashuai
|
f1a3e8839b
|
bug
|
2024-04-20 16:58:38 +08:00 |
hayu
|
c180ad60e7
|
测试问题修改
|
2024-04-20 16:58:15 +08:00 |
mashuai
|
07c77c5ad3
|
bug
|
2024-04-20 16:01:30 +08:00 |
sxu
|
ff93691d19
|
回滚错误提交
|
2024-04-20 14:29:59 +08:00 |
sxu
|
00a634cd0b
|
fix conflict
|
2024-04-20 14:21:17 +08:00 |
sxu
|
7126f3e744
|
往来单位状态
|
2024-04-20 14:18:17 +08:00 |
sxu
|
43ecf26853
|
解绑问题
|
2024-04-20 14:00:22 +08:00 |
mashuai
|
264bd77a41
|
bug
|
2024-04-20 13:55:53 +08:00 |
sxu
|
f609921ada
|
标签绑定历史的排序问题
|
2024-04-20 13:03:41 +08:00 |
hayu
|
54cef0f824
|
任务单号获取修改
|
2024-04-20 11:23:08 +08:00 |
liang.chao
|
6207d42ee5
|
重庆机具问题提交
|
2024-04-20 10:42:49 +08:00 |
mashuai
|
9e9fb2da60
|
名称重复性校验
|
2024-04-18 18:14:09 +08:00 |
mashuai
|
4dc7d58e72
|
fix
|
2024-04-18 17:27:47 +08:00 |
liang.chao
|
8ca8b57e9d
|
退料审核代码提交
|
2024-04-17 11:11:55 +08:00 |
hayu
|
82a5bf2cee
|
往来单位列表创建时间倒叙
|
2024-04-17 10:45:01 +08:00 |
mashuai
|
b0e00b40a3
|
FIX
|
2024-04-17 10:38:02 +08:00 |
liang.chao
|
9a7e4f0dc2
|
领料管理页面展示bug
|
2024-04-17 10:26:01 +08:00 |
liang.chao
|
77c6616c64
|
退料审核代码提交
|
2024-04-15 16:42:26 +08:00 |
liang.chao
|
09dd56414a
|
退料接收撤回代码提交
|
2024-04-15 16:03:44 +08:00 |
csyue
|
f17a656374
|
int类型变量命名
|
2024-04-15 15:42:23 +08:00 |
liang.chao
|
1ecf314a2a
|
bug修改
|
2024-04-12 17:18:48 +08:00 |
liang.chao
|
2ee6e711c1
|
bug修改
|
2024-04-11 18:00:57 +08:00 |
mashuai
|
d98daff25c
|
fix:模糊查询,分页功能优化
|
2024-04-11 13:06:32 +08:00 |
hayu
|
1784251cf3
|
功能优化
|
2024-04-11 10:40:04 +08:00 |
hayu
|
5da7fcdbad
|
功能优化
|
2024-04-10 18:24:20 +08:00 |
liang.chao
|
93139ffd5a
|
bug及退料接收代码提交
|
2024-04-10 17:48:09 +08:00 |
mashuai
|
5c1bf635a8
|
fix
|
2024-04-10 16:08:19 +08:00 |
syruan
|
1dbfb3f562
|
优化import引用,新增重庆领料确认接口
|
2024-04-07 13:44:14 +08:00 |
liang.chao
|
e0b9cd2ab5
|
退料接收后台代码提交
|
2024-04-07 09:43:24 +08:00 |
liang.chao
|
902c5015ac
|
bug提交
|
2024-04-03 17:20:33 +08:00 |
liang.chao
|
8592abb9b4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-03 14:08:29 +08:00 |
liang.chao
|
c96a108d89
|
退料申请表数据问题修改
|
2024-04-03 14:08:22 +08:00 |
hayu
|
dba22d1477
|
厂家规格型号添加及机具仓储状态查询修改
|
2024-04-03 14:07:26 +08:00 |
liang.chao
|
6fd2b89fe8
|
退料申请表数据问题修改
|
2024-04-02 15:23:56 +08:00 |
liang.chao
|
d77b56c106
|
退料申请表数据问题修改
|
2024-04-02 15:20:12 +08:00 |
liang.chao
|
111ac4ab8f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-02 13:58:59 +08:00 |
liang.chao
|
1c7b74efc9
|
退料申请表数据问题修改
|
2024-04-02 13:57:55 +08:00 |
hayu
|
e1e8a47e06
|
问题修复
|
2024-04-02 13:57:31 +08:00 |
liang.chao
|
6b029e51ef
|
退料申请表数据问题修改
|
2024-04-01 15:43:18 +08:00 |
liang.chao
|
5fd5f36411
|
退料申请表数据问题修改
|
2024-04-01 10:22:28 +08:00 |
liang.chao
|
026598a082
|
领料出库代码提交
|
2024-03-29 17:48:02 +08:00 |
liang.chao
|
759a4e22ff
|
领料出库代码提交
|
2024-03-28 18:11:48 +08:00 |
liang.chao
|
0f4ae97bad
|
退料出库代码提交
|
2024-03-27 18:15:32 +08:00 |
syruan
|
518bb466e6
|
领料出库接口
|
2024-03-25 17:26:10 +08:00 |
liang.chao
|
f42e2210ba
|
bug修改
|
2024-03-25 15:24:02 +08:00 |
hayu
|
c96e26c635
|
功能修复
|
2024-03-22 18:00:57 +08:00 |
liang.chao
|
3e32f0087d
|
bug修改
|
2024-03-22 17:38:48 +08:00 |
syruan
|
5a01e0bb4d
|
重庆机具退料新接口,优化代码结构
|
2024-03-22 15:23:57 +08:00 |
liang.chao
|
e2ce07dbd7
|
退料申请表数据问题修改
|
2024-03-21 11:29:39 +08:00 |
liang.chao
|
be12de782c
|
退料申请表数据问题修改
|
2024-03-20 13:24:45 +08:00 |
syruan
|
1efd3230f8
|
修改
|
2024-03-19 17:06:58 +08:00 |
liang.chao
|
56292de5dd
|
退料申请表数据问题修改
|
2024-03-18 16:04:29 +08:00 |
syruan
|
78b6f03bb3
|
领料审批流
|
2024-03-18 15:30:37 +08:00 |
bns_han
|
5b4914da1d
|
功能完善
|
2024-03-18 14:04:28 +08:00 |
liang.chao
|
e31aaad942
|
退料申请表数据问题修改
|
2024-03-16 18:44:04 +08:00 |
liang.chao
|
270d3ae2f8
|
重庆领料申请代码提交
|
2024-03-16 15:33:49 +08:00 |
1539530615@qq.com
|
beb33397a8
|
问题修改
|
2024-03-15 18:00:23 +08:00 |
syruan
|
45d26cf0d4
|
逻辑优化,魔法值抽取,NULL异常处理,冗余装箱去除
|
2024-03-15 16:40:56 +08:00 |
syruan
|
ca1980fdd6
|
优化导入,格式化时间,新增删除接口
|
2024-03-14 13:36:51 +08:00 |
liang.chao
|
a9627e18d2
|
退料申请表数据问题修改
|
2024-03-13 20:10:57 +08:00 |
liang.chao
|
9b5df3009b
|
退料申请表数据问题修改
|
2024-03-13 18:20:45 +08:00 |
liang.chao
|
99ff64473d
|
退料申请表数据问题修改
|
2024-03-13 10:56:43 +08:00 |
liang.chao
|
c1bc517820
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-11 18:46:03 +08:00 |
liang.chao
|
5623ac3199
|
退料申请表数据问题修改
|
2024-03-11 18:45:55 +08:00 |
1539530615@qq.com
|
a6065ec289
|
问题修改
|
2024-03-11 17:35:30 +08:00 |
liang.chao
|
4c61c18d63
|
退料申请表数据问题修改
|
2024-03-08 10:44:19 +08:00 |
liang.chao
|
1f8da0f8e9
|
退料申请表数据问题修改
|
2024-03-07 17:57:42 +08:00 |
liang.chao
|
a98d4dc800
|
退料申请表数据问题修改
|
2024-03-07 17:43:34 +08:00 |
liang.chao
|
0fffbb2433
|
退料申请表数据问题修改
|
2024-03-07 16:31:19 +08:00 |
liang.chao
|
f26108e284
|
退料申请表数据问题修改
|
2024-03-07 16:30:39 +08:00 |
1539530615@qq.com
|
8efb73bd59
|
导出代码提交
|
2024-03-06 18:08:29 +08:00 |
bns_han
|
14dedcf440
|
功能完善
|
2024-03-06 17:59:51 +08:00 |
liang.chao
|
b7212f162b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-06 08:57:54 +08:00 |
bns_han
|
a3e922936f
|
问题修复及综合查询
|
2024-03-05 18:41:35 +08:00 |
liang.chao
|
87dcee911f
|
二维码绑定和工地直转管理
|
2024-03-05 16:53:10 +08:00 |
1539530615@qq.com
|
05e3e10f17
|
二维码代码提交
|
2024-03-04 18:17:27 +08:00 |
1539530615@qq.com
|
60e10fcdb5
|
二维码代码提交
|
2024-03-04 16:40:13 +08:00 |
1539530615@qq.com
|
3bbcd5f634
|
二级库、修试入库驳回代码提交
|
2024-03-01 17:57:05 +08:00 |
liang.chao
|
242b86514e
|
领料申请查看按钮数据展示
|
2024-03-01 17:32:41 +08:00 |
liang.chao
|
738706a03c
|
1
|
2024-03-01 16:03:29 +08:00 |
liang.chao
|
32b9538771
|
退料审核通过和驳回逻辑提交
|
2024-02-29 19:24:27 +08:00 |
1539530615@qq.com
|
82c2a32a17
|
结算代码提交
|
2024-02-28 17:03:22 +08:00 |
liang.chao
|
a658f82915
|
rfid绑定和注册配置默认角色
|
2024-02-28 13:52:12 +08:00 |
1539530615@qq.com
|
8b1ecec6c1
|
结算代码提交
|
2024-02-27 17:16:51 +08:00 |
liang.chao
|
5b0e807b29
|
退料申请表数据问题修改
|
2024-02-27 16:02:01 +08:00 |
liang.chao
|
2b8f984cd8
|
退料申请表数据问题修改
|
2024-02-27 14:34:44 +08:00 |
liang.chao
|
747640caba
|
退料申请表数据问题修改
|
2024-02-27 13:20:31 +08:00 |
bns_han
|
cb2d8a551a
|
综合查询
|
2024-02-26 19:28:18 +08:00 |
liang.chao
|
d0068ab35d
|
退料申请、管理数据权限问题
|
2024-02-26 09:03:07 +08:00 |
liang.chao
|
baa645f36b
|
退料申请表数据问题修改
|
2024-02-23 17:26:16 +08:00 |
1539530615@qq.com
|
7bbad756b1
|
结算代码提交
|
2024-02-23 11:13:41 +08:00 |
bns_han
|
bd05a25423
|
功能完善
|
2024-02-23 10:31:25 +08:00 |
liang.chao
|
9ca45416b3
|
领料申请和管理数据隔离
|
2024-02-22 17:02:04 +08:00 |
liang.chao
|
20915ca52c
|
注册问题修改
|
2024-02-22 10:38:26 +08:00 |
liang.chao
|
98339ff568
|
退料审核通过
|
2024-02-21 20:22:34 +08:00 |
liang.chao
|
fc31e413c9
|
领料申请通过流程
|
2024-02-21 19:24:08 +08:00 |
bns_han
|
12ef28f592
|
功能完善
|
2024-02-21 18:26:53 +08:00 |
bns_han
|
3474556833
|
功能完善
|
2024-02-20 18:09:36 +08:00 |
liang.chao
|
5dd287a0b7
|
南网注册和领料数据权限修改
|
2024-02-20 18:04:13 +08:00 |
1539530615@qq.com
|
e900a0c3fe
|
领料申请代码提交
|
2024-02-20 13:57:26 +08:00 |
liang.chao
|
c4630625d3
|
领料申请通过和驳回逻辑修改
|
2024-02-19 17:48:42 +08:00 |
bns_han
|
82a3371114
|
综合查询--工程在用查询
|
2024-02-18 17:31:32 +08:00 |
liang.chao
|
ac5f82ea3f
|
新购器具绑定rfidCode
|
2024-02-18 17:19:56 +08:00 |
bns_han
|
b0835e5473
|
功能完善
|
2024-02-18 11:10:28 +08:00 |
bns_han
|
1ef299d409
|
Merge remote-tracking branch 'origin/test' into dev
|
2024-02-18 10:55:08 +08:00 |
bns_han
|
ab4ba2cab8
|
功能完善
|
2024-02-18 10:50:30 +08:00 |
bns_han
|
26266f1399
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/GlobalConstants.java
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseOutDetailsService.java
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
|
2024-02-18 10:47:20 +08:00 |
1539530615@qq.com
|
0b5bc3ec52
|
修饰管理代码提交
|
2024-02-18 09:36:59 +08:00 |
liang.chao
|
71e0bc45e5
|
RFID编码入库
|
2024-02-01 10:42:01 +08:00 |
bns_han
|
49b4ae203b
|
代码规范
|
2024-01-31 14:10:59 +08:00 |
zhouzy062
|
2ed5a78cec
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-01-31 13:57:12 +08:00 |
1539530615@qq.com
|
bd6e623737
|
代码规范修改
|
2024-01-30 14:10:58 +08:00 |
zhouzy062
|
c1dc8fe5ec
|
Merge branch 'dev' into test
|
2024-01-30 13:57:31 +08:00 |
1539530615@qq.com
|
8bf9558fc5
|
问题修改
|
2024-01-30 13:21:41 +08:00 |
1539530615@qq.com
|
e1dc6d5512
|
Merge branch 'dev' into test
|
2024-01-29 17:59:12 +08:00 |
1539530615@qq.com
|
def6b77903
|
问题修改
|
2024-01-29 17:36:17 +08:00 |
bns_han
|
9e133cacc4
|
功能完善
|
2024-01-29 16:51:39 +08:00 |
bns_han
|
a5a1a16b28
|
功能完善
|
2024-01-29 16:49:57 +08:00 |
bns_han
|
173a44055f
|
功能完善
|
2024-01-29 16:01:02 +08:00 |
bns_han
|
8d8101441e
|
功能完善
|
2024-01-29 15:59:43 +08:00 |
bns_han
|
008bbc2f28
|
功能完善
|
2024-01-26 18:38:50 +08:00 |
1539530615@qq.com
|
3ed2f429a8
|
Merge branch 'dev' into test
|
2024-01-26 13:04:22 +08:00 |
1539530615@qq.com
|
1839e0537c
|
报废审核驳回修改
|
2024-01-26 13:03:26 +08:00 |
bns_han
|
57130c2559
|
功能完善
|
2024-01-26 11:27:27 +08:00 |
1539530615@qq.com
|
83dd51fb1c
|
Merge branch 'dev' into test
|
2024-01-25 13:16:35 +08:00 |
1539530615@qq.com
|
e62aa0f71c
|
维修审核驳回修改
|
2024-01-25 13:16:01 +08:00 |
liang.chao
|
e0c1718699
|
Merge branch 'dev' into test
|
2024-01-24 19:32:59 +08:00 |
1539530615@qq.com
|
214b92688b
|
漏洞修改
|
2024-01-24 19:27:55 +08:00 |
liang.chao
|
07ab9b64f1
|
Merge branch 'dev' into test
|
2024-01-24 18:44:39 +08:00 |
liang.chao
|
b7f2c3ba4c
|
领料审核通过
|
2024-01-24 18:44:10 +08:00 |
bns_han
|
96020c4510
|
功能完善
|
2024-01-24 18:33:38 +08:00 |
1539530615@qq.com
|
24c927baa2
|
维修审核修改
|
2024-01-24 18:23:16 +08:00 |
1539530615@qq.com
|
f8e8651894
|
维修修改
|
2024-01-24 16:13:32 +08:00 |
1539530615@qq.com
|
7370cab29a
|
维修修改
|
2024-01-24 14:19:18 +08:00 |
1539530615@qq.com
|
f20bb2ee9b
|
试验检验审核驳回修改
|
2024-01-24 11:16:21 +08:00 |
bns_han
|
fdb6a9e329
|
功能完善
|
2024-01-24 09:59:58 +08:00 |
1539530615@qq.com
|
be37865f2d
|
工机具图片上传修改
|
2024-01-23 13:47:10 +08:00 |
liang.chao
|
bfd206a0b2
|
代码规范提交
|
2024-01-23 09:32:21 +08:00 |
1539530615@qq.com
|
ffbe56adb5
|
app按钮修改
|
2024-01-23 09:20:54 +08:00 |
bns_han
|
b333348e34
|
功能完善
|
2024-01-22 21:21:48 +08:00 |
liang.chao
|
268c5321e4
|
代码更新
|
2024-01-22 21:11:27 +08:00 |
bns_han
|
8472f12a30
|
功能完善
|
2024-01-22 21:02:51 +08:00 |
liang.chao
|
b5518394da
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-22 20:29:50 +08:00 |
bns_han
|
968d639582
|
功能完善
|
2024-01-22 20:23:30 +08:00 |
liang.chao
|
30792c9ceb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-22 20:03:13 +08:00 |
liang.chao
|
76c079249f
|
配置更新
|
2024-01-22 20:03:01 +08:00 |
bns_han
|
25334526a5
|
功能完善
|
2024-01-22 19:56:33 +08:00 |
1539530615@qq.com
|
8e015c9bc6
|
领料出库处理提交
|
2024-01-22 19:55:27 +08:00 |
bns_han
|
62502471e7
|
功能完善
|
2024-01-22 18:47:05 +08:00 |
1539530615@qq.com
|
bc72e60a58
|
领料出库处理提交
|
2024-01-22 18:45:49 +08:00 |
bns_han
|
cf0d751327
|
功能完善
|
2024-01-22 18:25:23 +08:00 |
liang.chao
|
c1f3d612e6
|
代码还原
|
2024-01-22 17:42:47 +08:00 |
1539530615@qq.com
|
faf1b88628
|
代码规范修改提交
|
2024-01-22 15:27:57 +08:00 |
liang.chao
|
a1ae4cc155
|
系统bug修改
|
2024-01-22 14:56:07 +08:00 |
1539530615@qq.com
|
338f5c7fc6
|
代码规范修改提交
|
2024-01-22 14:46:44 +08:00 |
liang.chao
|
da293da762
|
领料分页bug修改
|
2024-01-22 11:08:22 +08:00 |
liang.chao
|
97b52206ba
|
代码规范修改
|
2024-01-22 10:25:58 +08:00 |