Commit Graph

175 Commits

Author SHA1 Message Date
sxu f609921ada 标签绑定历史的排序问题 2024-04-20 13:03:41 +08:00
liang.chao 6207d42ee5 重庆机具问题提交 2024-04-20 10:42:49 +08:00
mashuai 9e9fb2da60 名称重复性校验 2024-04-18 18:14:09 +08:00
mashuai 4dc7d58e72 fix 2024-04-18 17:27:47 +08:00
hayu 82a5bf2cee 往来单位列表创建时间倒叙 2024-04-17 10:45:01 +08:00
mashuai b0e00b40a3 FIX 2024-04-17 10:38:02 +08:00
mashuai d98daff25c fix:模糊查询,分页功能优化 2024-04-11 13:06:32 +08:00
hayu 1784251cf3 功能优化 2024-04-11 10:40:04 +08:00
hayu 5da7fcdbad 功能优化 2024-04-10 18:24:20 +08:00
mashuai 5c1bf635a8 fix 2024-04-10 16:08:19 +08:00
hayu dba22d1477 厂家规格型号添加及机具仓储状态查询修改 2024-04-03 14:07:26 +08:00
liang.chao 3e32f0087d bug修改 2024-03-22 17:38:48 +08:00
liang.chao e2ce07dbd7 退料申请表数据问题修改 2024-03-21 11:29:39 +08:00
1539530615@qq.com beb33397a8 问题修改 2024-03-15 18:00:23 +08:00
1539530615@qq.com a6065ec289 问题修改 2024-03-11 17:35:30 +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 a658f82915 rfid绑定和注册配置默认角色 2024-02-28 13:52:12 +08:00
1539530615@qq.com 8b1ecec6c1 结算代码提交 2024-02-27 17:16:51 +08:00
bns_han cb2d8a551a 综合查询 2024-02-26 19:28:18 +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
liang.chao 71e0bc45e5 RFID编码入库 2024-02-01 10:42:01 +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
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 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 be37865f2d 工机具图片上传修改 2024-01-23 13:47:10 +08:00
bns_han 8472f12a30 功能完善 2024-01-22 21:02:51 +08:00
1539530615@qq.com 338f5c7fc6 代码规范修改提交 2024-01-22 14:46:44 +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
1539530615@qq.com c956bca3af 后台修饰管理导出代码提交 2024-01-08 16:32:49 +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
sliang d47a1ec7f4 获取领料申请-详情列表 2023-12-24 18:43:42 +08:00
syruan 43c3bd1484 QRCODE拆分 2023-12-24 18:02:25 +08:00
liuchuan 592662a686 后台代码提交 2023-12-24 13:26:21 +08:00
liuchuan 7e2564fe06 后台代码提交 2023-12-24 12:03:43 +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 f0254a5f3d QRCODE判断修正 2023-12-24 00:31:04 +08:00
gmhao 0ad1ac019d 修改往来单位 2023-12-23 22:52:36 +08:00
gmhao df5d92ef99 新增二维码 状态 2023-12-23 21:33:04 +08:00
gmhao ec1824b586 新增二维码 状态 2023-12-23 21:13:17 +08:00
dingjie fa9ad0f28f 机具编码标签绑定 2023-12-23 20:52:59 +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
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
syruan eab80f6156 SQL异常处理 2023-12-23 13:33:03 +08:00
dingjie 52a96de545 新购入库模块代码修改 2023-12-23 11:45:38 +08:00
dingjie a18aff4d23 新购模块代码修改 2023-12-22 19:14:59 +08:00
gmhao 689abd905d 设备标签二改 新增下拉框 2023-12-22 18:49:20 +08:00
gmhao 2495ce88f5 设备标签二改 新增下拉框 2023-12-22 17:07:32 +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
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 f6566e60f8 报错修改 2023-12-20 20:02:45 +08:00
dingjie 79c261b235 标签绑定新增 2023-12-20 18:49:09 +08:00
liuchuan fc0d7cac8a 后台维修代码提交 2023-12-20 15:14:55 +08:00
gmhao afdddd648d 排序 资产属性 2023-12-19 10:09:47 +08:00
sliang b6f46c6b4f 工机具管理-库管员配置;维修班配置 2023-12-19 09:58:39 +08:00
gmhao 0e6b525cbd 修改 2023-12-19 01:48:17 +08:00
gmhao d435d728e7 修改 2023-12-19 01:38:17 +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
gmhao ffb442aaec Merge remote-tracking branch 'origin/dev' into dev 2023-12-18 09:40:01 +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 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