 15856
|
14822542ce
|
Bug修复
|
2024-04-25 16:43:56 +08:00 |
 mashuai
|
0e681358a9
|
bug
|
2024-04-25 15:52:01 +08:00 |
liang.chao
|
82e8a6db4a
|
退料审核代码提交
|
2024-04-24 14:05:18 +08:00 |
|
liang.chao
|
5490fd2e8f
|
成套抱杆机具验收
|
2024-04-23 17:36:00 +08:00 |
|
liang.chao
|
62f2330ffb
|
成套机具代码提交
|
2024-04-23 09:19:37 +08:00 |
 csyue
|
f94470a742
|
测试app问题项修改
|
2024-04-22 18:58:46 +08:00 |
|
mashuai
|
f175c44ba1
|
整套抱杆
|
2024-04-22 11:28:36 +08:00 |
|
mashuai
|
a10c3dd8a7
|
bug
|
2024-04-22 10:20:29 +08:00 |
|
liang.chao
|
b1fee78651
|
bug修改
|
2024-04-20 17:29:05 +08:00 |
 hayu
|
c180ad60e7
|
测试问题修改
|
2024-04-20 16:58:15 +08:00 |
|
mashuai
|
07c77c5ad3
|
bug
|
2024-04-20 16:01:30 +08:00 |
|
hayu
|
a7d8ad5ef8
|
修饰入库不通过问题修改
|
2024-04-20 14:55:38 +08:00 |
 sxu
|
ff93691d19
|
回滚错误提交
|
2024-04-20 14:29:59 +08:00 |
|
sxu
|
00a634cd0b
|
fix conflict
|
2024-04-20 14:21:17 +08:00 |
|
mashuai
|
264bd77a41
|
bug
|
2024-04-20 13:55:53 +08:00 |
|
hayu
|
720ac160e6
|
任务单号获取修改
|
2024-04-20 12:21:00 +08:00 |
|
hayu
|
54cef0f824
|
任务单号获取修改
|
2024-04-20 11:23:08 +08:00 |
|
liang.chao
|
6207d42ee5
|
重庆机具问题提交
|
2024-04-20 10:42:49 +08:00 |
syruan
|
4ba7fa1e04
|
物资LOG日志
|
2024-04-18 16:34:01 +08:00 |
|
mashuai
|
af01245488
|
入库盘点
|
2024-04-17 15:32:23 +08:00 |
|
mashuai
|
4b39107750
|
入库盘点
|
2024-04-17 15:07:29 +08:00 |
|
mashuai
|
4777c2fbb9
|
FIX
|
2024-04-17 10:47:29 +08:00 |
|
liang.chao
|
9a7e4f0dc2
|
领料管理页面展示bug
|
2024-04-17 10:26:01 +08:00 |
|
15856
|
3dcca77cf0
|
bug修复
|
2024-04-16 10:37:42 +08:00 |
|
liang.chao
|
09dd56414a
|
退料接收撤回代码提交
|
2024-04-15 16:03:44 +08:00 |
|
mashuai
|
ad46244534
|
FIX
|
2024-04-15 13:54:22 +08:00 |
|
15856
|
d771ed2975
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-04-15 09:43:03 +08:00 |
|
15856
|
ecb952183c
|
bug修复
|
2024-04-15 09:42:52 +08:00 |
|
hayu
|
273780187a
|
新购入库问题修改
|
2024-04-13 13:31:25 +08:00 |
|
mashuai
|
376020f506
|
计划借调管理初版
|
2024-04-12 18:02:20 +08:00 |
|
liang.chao
|
d5384b25b3
|
bug修改
|
2024-04-12 17:21:21 +08:00 |
|
liang.chao
|
1ecf314a2a
|
bug修改
|
2024-04-12 17:18:48 +08:00 |
|
syruan
|
77c740164c
|
物资LOG日志
|
2024-04-12 16:19:28 +08:00 |
|
mashuai
|
86bfcdae12
|
计划借调管理初版
|
2024-04-12 14:27:08 +08:00 |
|
hayu
|
6deb17db59
|
新购入库问题修改
|
2024-04-11 18:28:20 +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 |
|
liang.chao
|
93139ffd5a
|
bug及退料接收代码提交
|
2024-04-10 17:48:09 +08:00 |
|
mashuai
|
5c1bf635a8
|
fix
|
2024-04-10 16:08:19 +08:00 |
|
hayu
|
29df08846a
|
功能优化
|
2024-04-07 15:52:57 +08:00 |
|
mashuai
|
a815a24790
|
退料入库
|
2024-04-07 14:29:02 +08:00 |
|
syruan
|
1dbfb3f562
|
优化import引用，新增重庆领料确认接口
|
2024-04-07 13:44:14 +08:00 |
|
liang.chao
|
902c5015ac
|
bug提交
|
2024-04-03 17:20:33 +08:00 |
|
mashuai
|
1f8fd7b7e1
|
test
|
2024-04-03 15:26:11 +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 |
|
mashuai
|
a73dbcf24c
|
盘点入库youhua
|
2024-04-03 10:28:37 +08:00 |
|
hayu
|
91a60339bc
|
综合查询-维修查询
|
2024-04-02 17:52:06 +08:00 |
|
mashuai
|
fc6d449566
|
盘点入库youhua
|
2024-04-02 15:15:33 +08:00 |
|
hayu
|
e1e8a47e06
|
问题修复
|
2024-04-02 13:57:31 +08:00 |
|
mashuai
|
a053608b78
|
盘点入库-数量入库
|
2024-04-02 13:19:59 +08:00 |
|
liang.chao
|
85d6291312
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-29 17:48:07 +08:00 |
|
liang.chao
|
026598a082
|
领料出库代码提交
|
2024-03-29 17:48:02 +08:00 |
|
mashuai
|
db9e2eba2b
|
盘点入库
|
2024-03-29 17:41:31 +08:00 |
|
hayu
|
b42e9e9ab3
|
入库盘点
|
2024-03-28 09:29:57 +08:00 |
|
liang.chao
|
0f4ae97bad
|
退料出库代码提交
|
2024-03-27 18:15:32 +08:00 |
|
hayu
|
85cb92670f
|
二级库功能修复
|
2024-03-26 18:06:37 +08:00 |
|
liang.chao
|
696380cec6
|
bug修改
|
2024-03-26 17:31:06 +08:00 |
|
hayu
|
f64ebf1aea
|
功能修复
|
2024-03-25 18:20:42 +08:00 |
|
hayu
|
c96e26c635
|
功能修复
|
2024-03-22 18:00:57 +08:00 |
|
syruan
|
5a01e0bb4d
|
重庆机具退料新接口，优化代码结构
|
2024-03-22 15:23:57 +08:00 |
|
liang.chao
|
929673e491
|
退料申请表数据问题修改
|
2024-03-21 09:06:12 +08:00 |
|
liang.chao
|
463d5bee5a
|
退料申请表数据问题修改
|
2024-03-20 14:14:49 +08:00 |
|
liang.chao
|
fc17702ea5
|
机具编码入库逻辑修改
|
2024-03-20 14:10:41 +08:00 |
|
liang.chao
|
a7bf8ea2c1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-20 11:21:03 +08:00 |
|
liang.chao
|
bbc8d8b1d3
|
退料申请表数据问题修改
|
2024-03-20 11:20:50 +08:00 |
|
bns_han
|
a6830079e1
|
综合服务中心审核
|
2024-03-20 11:17:46 +08:00 |
|
liang.chao
|
4718646984
|
设备编码入库
|
2024-03-20 11:12:37 +08:00 |
|
liang.chao
|
a6336f96a9
|
工地直转审核
|
2024-03-20 10:07:54 +08:00 |
|
liang.chao
|
e6342021eb
|
退料申请表数据问题修改
|
2024-03-19 17:05:14 +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 |
|
liang.chao
|
d2fe5b72f1
|
工地直转查询接口修改
|
2024-03-15 16:22:10 +08:00 |
|
liang.chao
|
0995bd6cb3
|
工地直转查询修改
|
2024-03-15 16:03:11 +08:00 |
|
liang.chao
|
39c42e931f
|
工地直转
|
2024-03-15 13:55:04 +08:00 |
|
liang.chao
|
6b7767fec0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-14 17:59:04 +08:00 |
|
liang.chao
|
c723a725b2
|
退料申请表数据问题修改
|
2024-03-14 17:58:50 +08:00 |
|
syruan
|
ca1980fdd6
|
优化导入，格式化时间，新增删除接口
|
2024-03-14 13:36:51 +08:00 |
|
liang.chao
|
e24109076c
|
工地直转
|
2024-03-14 09:51:15 +08:00 |
|
liang.chao
|
c5475985b9
|
退料申请表数据问题修改
|
2024-03-14 09:09:03 +08:00 |
|
liang.chao
|
a9627e18d2
|
退料申请表数据问题修改
|
2024-03-13 20:10:57 +08:00 |
|
liang.chao
|
de31f4e4f7
|
退料申请表数据问题修改
|
2024-03-13 18:16:50 +08:00 |
|
liang.chao
|
99ff64473d
|
退料申请表数据问题修改
|
2024-03-13 10:56:43 +08:00 |
|
liang.chao
|
85aecf7f66
|
退料申请表数据问题修改
|
2024-03-12 17:33:43 +08:00 |
|
liang.chao
|
b9edcaf673
|
退料申请表数据问题修改
|
2024-03-12 15:14:02 +08:00 |
|
liang.chao
|
d0d13039d6
|
工地直转
|
2024-03-12 13:52:31 +08:00 |
|
liang.chao
|
fe713e0e3a
|
退料申请表数据问题修改
|
2024-03-12 10:39:52 +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
|
c3d270647e
|
退料申请表数据问题修改
|
2024-03-08 18:16:36 +08:00 |
|
liang.chao
|
7a1596a7fb
|
退料申请表数据问题修改
|
2024-03-08 17:47:21 +08:00 |
|
liang.chao
|
4f3975f06d
|
退料审核驳回提交逻辑修改
|
2024-03-08 17:40:02 +08:00 |
|
liang.chao
|
1903c9244e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-07 17:57:56 +08:00 |
|
liang.chao
|
1f8da0f8e9
|
退料申请表数据问题修改
|
2024-03-07 17:57:42 +08:00 |
|
1539530615@qq.com
|
a212fef489
|
修试审核修改
|
2024-03-07 17:52:20 +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
|
89f30114a8
|
退料申请表数据问题修改
|
2024-03-06 15:29:22 +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
|
3bbcd5f634
|
二级库、修试入库驳回代码提交
|
2024-03-01 17:57:05 +08:00 |
|
liang.chao
|
73195a84c5
|
退料申请表数据问题修改
|
2024-02-29 19:44:51 +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 |
|
bns_han
|
f38110f2dc
|
综合查询
|
2024-02-27 18:52:09 +08:00 |
|
bns_han
|
b6de4c1d84
|
综合查询
|
2024-02-27 18:44:28 +08:00 |
|
liang.chao
|
3878c5a23f
|
退料申请表数据问题修改
|
2024-02-27 18:06:01 +08:00 |
|
1539530615@qq.com
|
8b1ecec6c1
|
结算代码提交
|
2024-02-27 17:16:51 +08:00 |
|
liang.chao
|
32b1dc4932
|
退料申请表数据问题修改
|
2024-02-27 14:07:45 +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 |
|
bns_han
|
12ef28f592
|
功能完善
|
2024-02-21 18:26:53 +08:00 |
|
bns_han
|
2886d4946b
|
新购驳回
|
2024-02-20 14:01:15 +08:00 |
|
1539530615@qq.com
|
055ae63020
|
修饰管理代码提交
|
2024-02-18 17:59:38 +08:00 |
|
liang.chao
|
ac5f82ea3f
|
新购器具绑定rfidCode
|
2024-02-18 17:19:56 +08:00 |
|
bns_han
|
1ef299d409
|
Merge remote-tracking branch 'origin/test' into dev
|
2024-02-18 10:55:08 +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 |
|
bns_han
|
87ef699f84
|
新购驳回
|
2024-02-01 10:00:10 +08:00 |
|
bns_han
|
49b4ae203b
|
代码规范
|
2024-01-31 14:10:59 +08:00 |
zhouzy062
|
d801158d54
|
合并
|
2024-01-31 13:57:52 +08:00 |
|
zhouzy062
|
2ed5a78cec
|
Merge remote-tracking branch 'origin/dev' into test
|
2024-01-31 13:57:12 +08:00 |
|
liang.chao
|
820e6dd77e
|
代码规范修改
|
2024-01-30 17:16:19 +08:00 |
|
liang.chao
|
586728fae3
|
南网oss登录接口修改
|
2024-01-30 16:28:46 +08:00 |
|
liang.chao
|
6c75a099ef
|
南网oss登录接口修改
|
2024-01-30 15:55:55 +08:00 |
|
liang.chao
|
451b56c0ba
|
南网oss登录接口修改
|
2024-01-30 15:06:15 +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
|
44e655e0b6
|
问题修改
|
2024-01-30 10:10:58 +08:00 |
|
1539530615@qq.com
|
e1dc6d5512
|
Merge branch 'dev' into test
|
2024-01-29 17:59:12 +08:00 |
|
1539530615@qq.com
|
2e4972279a
|
问题修改
|
2024-01-29 17:58:33 +08:00 |
|
1539530615@qq.com
|
50740168aa
|
Merge branch 'dev' into test
|
2024-01-29 17:20:03 +08:00 |
|
1539530615@qq.com
|
21ad852102
|
维修问题修改
|
2024-01-29 17:11:02 +08:00 |
|
bns_han
|
dcb492aee6
|
功能完善
|
2024-01-29 15:59:30 +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 |
|
liang.chao
|
7c741a45af
|
线上bug修改
|
2024-01-25 14:11:30 +08:00 |
|
1539530615@qq.com
|
e62aa0f71c
|
维修审核驳回修改
|
2024-01-25 13:16:01 +08:00 |
|
1539530615@qq.com
|
214b92688b
|
漏洞修改
|
2024-01-24 19:27:55 +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 |