BianLzhaoMin
|
0be2776cf6
|
iot定位设备地图弹框页面完善
|
2024-08-06 14:23:32 +08:00 |
|
BianLzhaoMin
|
01e5924e0e
|
iot设备定位页面完善
|
2024-08-06 13:10:54 +08:00 |
|
BianLzhaoMin
|
dc8546d7c4
|
iot页面调试
|
2024-08-05 18:10:34 +08:00 |
|
BianLzhaoMin
|
34511e5972
|
代码调试
|
2024-08-05 16:55:28 +08:00 |
|
BianLzhaoMin
|
6f7a589268
|
调试数据推送接口
|
2024-07-26 13:55:09 +08:00 |
|
BianLzhaoMin
|
8aac72612e
|
增加设备编码处按钮操作
|
2024-07-24 10:44:25 +08:00 |
|
BianLzhaoMin
|
d35f8799ae
|
优化页面字段
|
2024-07-16 10:46:02 +08:00 |
|
BianLzhaoMin
|
3bac5f119a
|
解决打包报错问题
|
2024-07-15 11:26:34 +08:00 |
 15856
|
a8097987df
|
Merge remote-tracking branch 'origin/dev-nw' into dev-nwcc
# Conflicts:
# sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java
# sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
# sgzb-auth/src/main/java/com/bonus/sgzb/auth/utils/RsaUtil.java
# sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/ParamsDto.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InventoryAndWarehousingController.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachIneDto.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
# sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/config/RsaUtil.java
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysConfigController.java
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java
# sgzb-ui/package.json
# sgzb-ui/src/api/claimAndRefund/return.js
# sgzb-ui/src/router/index.js
# sgzb-ui/src/store/modules/user.js
# sgzb-ui/src/utils/globalUrl.js
# sgzb-ui/src/views/base/section/index.vue
# sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
# sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
# sgzb-ui/src/views/index.vue
# sgzb-ui/src/views/oldLogin.vue
# sgzb-ui/src/views/resetPassword.vue
# sgzb-ui/src/views/system/config/index.vue
# sgzb-ui/src/views/system/user/index.vue
# sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
# sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
# sgzb-ui/vue.config.js
|
2024-07-15 10:21:48 +08:00 |
 binbin_pan
|
89f3c6f39c
|
IOT设备管理联调
|
2024-07-11 18:33:09 +08:00 |
|
binbin_pan
|
40eb75962a
|
数据推送
|
2024-07-10 17:23:54 +08:00 |
|
binbin_pan
|
36c5b6eecc
|
推送租赁
|
2024-07-05 16:48:26 +08:00 |
|
binbin_pan
|
b551fe3475
|
领料出库-定位页面+推送
|
2024-07-05 11:00:28 +08:00 |
|
binbin_pan
|
6adb1dc728
|
定位页面搭建
|
2024-07-03 17:10:50 +08:00 |
|
binbin_pan
|
22ec75cbf2
|
定位页面搭建
|
2024-07-03 11:04:35 +08:00 |
|
binbin_pan
|
9adc2a5528
|
IOT设备管理页面搭建
|
2024-07-02 17:59:58 +08:00 |
|
BianLzhaoMin
|
e1ca6fdde4
|
代码同步（领退料，仓储管理）
|
2024-06-20 13:24:44 +08:00 |
|
binbin_pan
|
d2cc5721f2
|
优化资产属性下拉回显
|
2024-06-11 11:02:43 +08:00 |
|
binbin_pan
|
7f1b3bbc8b
|
1991 机具设备管理点击导出按钮无反应
|
2024-06-11 10:51:55 +08:00 |
|
binbin_pan
|
aedf651435
|
1979 机具设备管理厂家信息回显的错误
|
2024-06-11 10:05:50 +08:00 |
|
BianLzhaoMin
|
c57c539f51
|
优化仓储管理菜单展示
|
2024-06-07 11:17:34 +08:00 |