Commit Graph

347 Commits

Author SHA1 Message Date
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