Commit Graph

475 Commits

Author SHA1 Message Date
bns_han 367ad3f33e Merge remote-tracking branch 'origin/test' into dev 2024-01-24 11:30:37 +08:00
bns_han 382bc7b6f3 功能完善 2024-01-24 11:29:30 +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
bns_han 61c5472b16 功能完善 2024-01-23 21:08:23 +08:00
1539530615@qq.com d595a6b80a 试验检验审核驳回修改 2024-01-23 21:07:13 +08:00
liang.chao 88e5c4a21c 头像上传 2024-01-23 16:09:25 +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 e8d5664028 代码更新 2024-01-22 20:30:13 +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 8509d2bb10 退料审核 2024-01-19 15:07:32 +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
bns_han 809a144923 新购配件入库 2024-01-19 10:24:57 +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
bns_han d9e2109ddb 新购配件 2024-01-17 18:28:39 +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 fdd1f813e0 1 2024-01-16 20:08:34 +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 a3dcf55260 新购配件入库 2024-01-16 17:11:57 +08:00
bns_han 8dc5fc562c 功能完善 2024-01-16 17:09:48 +08:00
bns_han 25477c1289 待办事项 2024-01-15 18:49:36 +08:00
1539530615@qq.com a954cbdb30 修试管理代码提交 2024-01-15 16:42:18 +08:00
liang.chao 4d4dfd55b9 app退料驳回 2024-01-15 15:32:06 +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 d54d79ea44 修试入库代码提交 2024-01-12 18:19:22 +08:00
1539530615@qq.com 351ad2904f 后台修试管理代码提交 2024-01-12 18:02:33 +08:00
1539530615@qq.com 8310504c52 后台修试管理代码提交 2024-01-12 17:13:55 +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 43c5f53816 Merge remote-tracking branch 'origin/dev' into dev 2024-01-12 17:07:37 +08:00
liang.chao 1450a2b5b1 代码提交 2024-01-12 17:07:30 +08:00
bns_han 2e2bc51b31 功能优化 2024-01-12 16:05:33 +08:00
1539530615@qq.com 0ebd1cf40a 后台修试管理代码提交 2024-01-12 09:57:16 +08:00
bns_han b95cbc87dc 退料接收记录 2024-01-11 19:28:04 +08:00
bns_han 0ed978a97d 功能完善 2024-01-11 18:21:30 +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
bns_han 21d3a18573 功能完善 2024-01-10 18:03:35 +08:00
syruan 32ee5fcae8 Merge remote-tracking branch 'devVPN/dev' into dev 2024-01-10 15:51:58 +08:00
syruan e54d3673be 获取登录信息方式修改 2024-01-10 15:51:25 +08:00
1539530615@qq.com 91f514da08 后台修试管理代码提交 2024-01-10 15:10:37 +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 e31a99a17e app-退料接收 2023-12-25 10:48:28 +08:00
bns_han 001761c777 app-退料接收 2023-12-25 10:21:58 +08:00
bns_han b4c5bbd7af app-退料接收 2023-12-25 10:15:38 +08:00
bns_han 4aa9d55c26 退料申请-类型数 2023-12-25 09:59:55 +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
liuchuan 7f90455e05 后台代码提交 2023-12-24 17:45:49 +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
liuchuan 1074e16aed 后台代码提交 2023-12-24 15:55:49 +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
dingjie 05949b9692 增加入库任务详细记录表 2023-12-24 00:24:23 +08:00
dingjie cc0bb3e292 Merge remote-tracking branch 'origin/dev' into dev 2023-12-24 00:13:25 +08:00
dingjie 2a717dbea1 增加入库任务详细记录表 2023-12-24 00:13:14 +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
dingjie 86c6b25f5d Merge remote-tracking branch 'origin/dev' into dev 2023-12-23 23:09:27 +08:00
dingjie 5a49a44693 数据回滚问题 2023-12-23 23:09:17 +08:00
gmhao 0ad1ac019d 修改往来单位 2023-12-23 22:52:36 +08:00
bns_han 272bce65c7 后台-退料申请与审核 2023-12-23 22:32:38 +08:00
bns_han b15f613f82 后台-退料申请与审核 2023-12-23 22:30:03 +08:00
sliang 11aef851d9 工机具管理-库管员配置;维修班配置 2023-12-23 21:49:43 +08:00
gmhao df5d92ef99 新增二维码 状态 2023-12-23 21:33:04 +08:00
dingjie 8ae7102597 Merge remote-tracking branch 'origin/dev' into dev 2023-12-23 21:31:37 +08:00
dingjie 91943ddfb4 机具编码标签绑定 2023-12-23 21:31:33 +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 b6bd220662 上传文件生成名称规则修改 2023-12-23 19:33:37 +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 a22ee17c23 后台-退料申请与审核 2023-12-23 15:55:22 +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 d3f7052535 Merge remote-tracking branch 'origin/dev' into dev 2023-12-23 11:45:53 +08:00
dingjie 52a96de545 新购入库模块代码修改 2023-12-23 11:45:38 +08:00
sliang 18a5ba85e9 Merge remote-tracking branch 'origin/dev' into dev 2023-12-23 11:03:21 +08:00
bns_han 2265d0cebc 后台-退料申请与审核 2023-12-23 10:58:55 +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
sliang 66aa9b717e Merge remote-tracking branch 'origin/dev' into dev 2023-12-22 21:23:32 +08:00
syruan 76cdd524f9 Merge remote-tracking branch 'devVPN/dev' into dev 2023-12-22 21:23:29 +08:00
syruan 86acb6308b mapper修改 2023-12-22 21:23:00 +08:00
dingjie 35c6862e01 Merge remote-tracking branch 'origin/dev' into dev 2023-12-22 21:08:09 +08:00
dingjie 439536142a 新购入库模块代码修改 2023-12-22 21:07:56 +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
cwchen d51ec0bbf3 统一下拉选-设备树添加company_id 2023-12-22 16:17:57 +08:00
bns_han b71ca1e957 后台-退料申请与审核 2023-12-22 15:57:59 +08:00
bns_han 5275483a0e 后台-退料申请与审核 2023-12-22 15:57:10 +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
cwchen 54a6c380d0 修试入库 2023-12-22 13:43:58 +08:00
cwchen f92c7f4489 修试入库 2023-12-22 13:40:46 +08:00
cwchen 1bbfc1dd73 修试入库 2023-12-22 12:32:01 +08:00
cwchen 308d8e343c 修试入库 2023-12-22 11:21:10 +08:00
bns_han 8d7e961f80 后台-退料申请与审核 2023-12-22 11:05:45 +08:00
cwchen f7ef5c629e 修试入库修改 2023-12-22 10:03:23 +08:00
bns_han a4850f1d40 后台-退料申请与审核 2023-12-22 00:16:53 +08:00
bns_han a428cf7658 后台-退料申请与审核 2023-12-22 00:13:15 +08:00
dingjie 2380e9a695 配置文件修改 2023-12-21 20:29:12 +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