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 |
|
liang.chao
|
79361e219f
|
系统bug修改
|
2024-01-19 15:57:05 +08:00 |
|
bns_han
|
aa3ca8b7c3
|
退料审核
|
2024-01-19 14:55:21 +08:00 |
|
bns_han
|
0733651fd4
|
退料审核
|
2024-01-19 13:29:02 +08:00 |
|
bns_han
|
e229db14af
|
退料审核
|
2024-01-19 11:30:59 +08:00 |
|
1539530615@qq.com
|
346333eaac
|
1/19代码提交
|
2024-01-19 10:53:02 +08:00 |
|
liang.chao
|
75db3516e3
|
app内部驳回操作
|
2024-01-18 17:00:26 +08:00 |
|
liang.chao
|
9200a1e869
|
内部审核添加审核状态
|
2024-01-18 15:53:08 +08:00 |
|
liang.chao
|
5cb891adf1
|
内部审核添加审核状态
|
2024-01-18 15:48:18 +08:00 |
|
1539530615@qq.com
|
8fbedfec49
|
app首页代码提交
|
2024-01-18 14:24:09 +08:00 |
|
liang.chao
|
2dcc9c5eb6
|
内部审核细节划分
|
2024-01-17 17:49:51 +08:00 |
|
liang.chao
|
fa8410f12a
|
app查询单个领料申请单
|
2024-01-17 13:52:10 +08:00 |
|
liang.chao
|
5781ddfee2
|
根据库管员进行领料发放
|
2024-01-16 20:06:21 +08:00 |
|
bns_han
|
cd2e8b32d9
|
功能完善
|
2024-01-16 18:21:24 +08:00 |
|
bns_han
|
8dc5fc562c
|
功能完善
|
2024-01-16 17:09:48 +08:00 |
|
1539530615@qq.com
|
a954cbdb30
|
修试管理代码提交
|
2024-01-15 16:42:18 +08:00 |
|
1539530615@qq.com
|
1b4cbfc091
|
维修代码提交
|
2024-01-15 10:51:41 +08:00 |
|
liang.chao
|
579c0bf5b1
|
领料详情工程不显示问题bug
|
2024-01-14 14:01:56 +08:00 |
|
1539530615@qq.com
|
1115686d36
|
后台修试管理代码提交
|
2024-01-12 17:11:47 +08:00 |
|
bns_han
|
d53020f434
|
功能优化
|
2024-01-12 17:08:34 +08:00 |
|
liang.chao
|
1450a2b5b1
|
代码提交
|
2024-01-12 17:07:30 +08:00 |
|
bns_han
|
b95cbc87dc
|
退料接收记录
|
2024-01-11 19:28:04 +08:00 |
|
1539530615@qq.com
|
0149a02d82
|
后台修试管理代码提交
|
2024-01-11 18:03:18 +08:00 |
|
liang.chao
|
664c7e147d
|
领料申请和管理数据导出功能
|
2024-01-11 15:58:22 +08:00 |
 bonus
|
260f09af4d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-11 13:43:01 +08:00 |
|
bonus
|
63065db713
|
修改app领料明细查询
|
2024-01-11 13:40:03 +08:00 |
|
liang.chao
|
6a60453217
|
领料申请/管理数据导出
|
2024-01-11 10:26:01 +08:00 |
|
1539530615@qq.com
|
1431e4af62
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-10 14:46:21 +08:00 |
|
1539530615@qq.com
|
11bdd0a771
|
后台修试管理代码提交
|
2024-01-10 14:40:18 +08:00 |
|
liang.chao
|
3a7ead3c6b
|
领料申请驳回代码提交
|
2024-01-10 11:30:23 +08:00 |
|
liang.chao
|
d7b78162ec
|
领料申请驳回代码提交
|
2024-01-10 09:03:26 +08:00 |
|
bns_han
|
867070cd6b
|
功能完善
|
2024-01-09 15:33:50 +08:00 |
|
1539530615@qq.com
|
c956bca3af
|
后台修饰管理导出代码提交
|
2024-01-08 16:32:49 +08:00 |
|
bns_han
|
19af666b60
|
功能完善
|
2024-01-08 14:17:38 +08:00 |
|
1539530615@qq.com
|
c319fc413a
|
APP领料代码提交
|
2024-01-05 10:09:07 +08:00 |
|
bns_han
|
ba817cfc02
|
app-退料接收
|
2023-12-25 11:54:12 +08:00 |
|
bns_han
|
b4c5bbd7af
|
app-退料接收
|
2023-12-25 10:15:38 +08:00 |
 cwchen
|
30a3d8131d
|
大屏接口修改
|
2023-12-24 21:19:01 +08:00 |
sliang
|
d19284f996
|
获取领料申请-详情列表
|
2023-12-24 20:44:43 +08:00 |
|
cwchen
|
04de103666
|
大屏接口修改
|
2023-12-24 20:30:41 +08:00 |
|
sliang
|
d47a1ec7f4
|
获取领料申请-详情列表
|
2023-12-24 18:43:42 +08:00 |
syruan
|
43c3bd1484
|
QRCODE拆分
|
2023-12-24 18:02:25 +08:00 |
|
bns_han
|
bda94aeff8
|
app-退料接收
|
2023-12-24 17:18:35 +08:00 |
|
bns_han
|
1ac495d7ac
|
app-退料接收
|
2023-12-24 16:48:38 +08:00 |
|
sliang
|
44e8ae0a82
|
获取领料申请-详情列表
|
2023-12-24 16:16:15 +08:00 |
|
syruan
|
d2b5398d09
|
工程标段展示问题修正
|
2023-12-24 15:29:58 +08:00 |
 liuchuan
|
fbd6c6dcb5
|
后台代码提交
|
2023-12-24 15:11:02 +08:00 |
|
liuchuan
|
a5a0642cdf
|
后台代码提交
|
2023-12-24 13:33:24 +08:00 |
|
liuchuan
|
592662a686
|
后台代码提交
|
2023-12-24 13:26:21 +08:00 |
|
liuchuan
|
ce8e4d7133
|
后台代码提交
|
2023-12-24 13:22:33 +08:00 |
|
syruan
|
f24cafc21e
|
修改逻辑判断优化
|
2023-12-24 12:41:46 +08:00 |
|
bns_han
|
2d875db4eb
|
app-退料接收
|
2023-12-24 12:24:20 +08:00 |
|
bns_han
|
ca7bc2e5a5
|
app-退料接收
|
2023-12-24 12:15:31 +08:00 |
|
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 |