Commit Graph

366 Commits

Author SHA1 Message Date
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
1539530615@qq.com f8e8651894 维修修改 2024-01-24 16:13:32 +08:00
liang.chao 96b479c2f8 pom打包提交 2024-01-24 14:48:24 +08:00
1539530615@qq.com b0ab60c20f 维修修改 2024-01-24 14:39:17 +08:00
1539530615@qq.com 7370cab29a 维修修改 2024-01-24 14:19:18 +08:00
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 61c5472b16 功能完善 2024-01-23 21:08:23 +08:00
1539530615@qq.com d595a6b80a 试验检验审核驳回修改 2024-01-23 21:07:13 +08:00
1539530615@qq.com ffbe56adb5 app按钮修改 2024-01-23 09:20:54 +08:00
liang.chao e8d5664028 代码更新 2024-01-22 20:30:13 +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 cf0d751327 功能完善 2024-01-22 18:25:23 +08:00
liang.chao c1f3d612e6 代码还原 2024-01-22 17:42:47 +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 809a144923 新购配件入库 2024-01-19 10:24:57 +08:00
liang.chao 5cb891adf1 内部审核添加审核状态 2024-01-18 15:48:18 +08:00
bns_han d9e2109ddb 新购配件 2024-01-17 18:28:39 +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 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 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 2e2bc51b31 功能优化 2024-01-12 16:05:33 +08:00
1539530615@qq.com 0ebd1cf40a 后台修试管理代码提交 2024-01-12 09:57:16 +08:00
1539530615@qq.com 0149a02d82 后台修试管理代码提交 2024-01-11 18:03:18 +08:00
bns_han 21d3a18573 功能完善 2024-01-10 18:03:35 +08:00
1539530615@qq.com 91f514da08 后台修试管理代码提交 2024-01-10 15:10:37 +08:00
1539530615@qq.com 11bdd0a771 后台修试管理代码提交 2024-01-10 14:40:18 +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
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 4aa9d55c26 退料申请-类型数 2023-12-25 09:59:55 +08:00
liuchuan 7f90455e05 后台代码提交 2023-12-24 17:45:49 +08:00
bns_han 1ac495d7ac app-退料接收 2023-12-24 16:48:38 +08:00
liuchuan 1074e16aed 后台代码提交 2023-12-24 15:55:49 +08:00
liuchuan fbd6c6dcb5 后台代码提交 2023-12-24 15:11:02 +08:00
bns_han 29112420e5 app-退料接收 2023-12-24 01:53:20 +08:00
dingjie 05949b9692 增加入库任务详细记录表 2023-12-24 00:24:23 +08:00
dingjie 2a717dbea1 增加入库任务详细记录表 2023-12-24 00:13:14 +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
bns_han 272bce65c7 后台-退料申请与审核 2023-12-23 22:32:38 +08:00
bns_han b15f613f82 后台-退料申请与审核 2023-12-23 22:30:03 +08:00
dingjie 91943ddfb4 机具编码标签绑定 2023-12-23 21:31:33 +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 bc9dfc589e 后台-退料申请与审核 2023-12-23 20:17:03 +08:00
dingjie 83ac831e0a 机具修改 2023-12-23 18:50:18 +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
dingjie c1075c9320 新购入库模块代码修改 2023-12-23 14:31:54 +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
bns_han 2265d0cebc 后台-退料申请与审核 2023-12-23 10:58:55 +08:00
bns_han 2380d97848 后台-退料申请与审核 2023-12-23 10:24:00 +08:00
dingjie 439536142a 新购入库模块代码修改 2023-12-22 21:07:56 +08:00
dingjie a18aff4d23 新购模块代码修改 2023-12-22 19:14:59 +08:00
liuchuan 0abdca2751 后台代码提交 2023-12-22 17:59:58 +08:00
bns_han b71ca1e957 后台-退料申请与审核 2023-12-22 15:57:59 +08:00
bns_han 5275483a0e 后台-退料申请与审核 2023-12-22 15:57:10 +08:00
bns_han 7f1e051e42 后台-退料申请与审核 2023-12-22 14:13:53 +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 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
bns_han 5564d3d391 后台-退料申请 2023-12-21 20:17:36 +08:00
sliang b19a375a4b 工机具管理-库管员配置;维修班配置 2023-12-21 18:35:36 +08:00
gmhao 3a5e6f503a 修改 2023-12-21 18:09:56 +08:00
dingjie a729039137 仓储管理模块修改 2023-12-20 20:28:42 +08:00
sliang f5d0deb4c8 工机具管理-库管员配置;维修班配置 2023-12-20 19:59:50 +08:00
sliang b6f46c6b4f 工机具管理-库管员配置;维修班配置 2023-12-19 09:58:39 +08:00
gmhao c63a3cf187 领量管理 2023-12-19 09:44:55 +08:00
dingjie 942ec67479 审核模块 2023-12-19 09:01:17 +08:00
sliang 9d5ca4a462 工机具管理-库管员配置;维修班配置 2023-12-18 21:26:40 +08:00
liuchuan b49dcb447d Merge remote-tracking branch 'origin/dev' into dev 2023-12-18 16:19:43 +08:00
sliang 58fe071b38 工机具管理-库管员配置;维修班配置 2023-12-18 13:08:34 +08:00
bns_han e9cfbe9f29 移动退料申请,后台部分系统管理 2023-12-17 19:43:10 +08:00
liuchuan c0e2037689 Merge remote-tracking branch 'origin/dev' into dev 2023-12-17 18:49:05 +08:00
cwchen e78e49f297 修试入库 2023-12-17 16:49:45 +08:00
cwchen 1cf671a47e 修试入库 2023-12-17 16:48:01 +08:00
cwchen 92f726fee7 修试入库 2023-12-17 16:10:04 +08:00
cwchen f7ea60d1aa 修试入库接口 2023-12-17 13:21:21 +08:00
liuchuan c9e54bfb07 Merge remote-tracking branch 'origin/dev' into dev 2023-12-17 10:57:03 +08:00
dingjie e2ba7344de 修饰任务审核,报废审核 2023-12-16 21:50:54 +08:00