 mashuai
|
c3a41e51bb
|
合并配置
|
2024-07-11 20:29:44 +08:00 |
|
mashuai
|
6c0e4c6a70
|
Merge remote-tracking branch 'origin/dev-nw' into devicesmgt-nwcopy
# Conflicts:
# sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
# sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java
# sgzb-auth/src/main/java/com/bonus/sgzb/auth/utils/RsaUtil.java
# sgzb-auth/src/main/resources/bootstrap.yml
# sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java
# sgzb-gateway/src/main/resources/bootstrap.yml
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/ParamsDto.java
# sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml
# sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
# 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/service/impl/InventoryAndWarehousingServiceImpl.java
# sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml
# sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
# sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.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-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysSmsServiceImpl.java
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java
# sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
# sgzb-ui/package.json
# sgzb-ui/src/api/claimAndRefund/return.js
# sgzb-ui/src/components/DialogModel/index.vue
# sgzb-ui/src/components/FormModel/index.vue
# sgzb-ui/src/components/TableModel/index.vue
# sgzb-ui/src/layout/components/Navbar.vue
# sgzb-ui/src/permission.js
# sgzb-ui/src/router/index.js
# sgzb-ui/src/store/modules/user.js
# sgzb-ui/src/utils/globalUrl.js
# sgzb-ui/src/utils/request.js
# sgzb-ui/src/views/base/section/index.vue
# sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
# sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
# sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
# sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue
# sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue
# sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
# sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue
# sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
# sgzb-ui/src/views/claimAndreturn/picking/protocol/index.vue
# sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue
# sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue
# sgzb-ui/src/views/claimAndreturn/return/apply/index.vue
# sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue
# sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
# sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue
# sgzb-ui/src/views/claimAndreturn/return/receive/index.vue
# sgzb-ui/src/views/index.vue
# sgzb-ui/src/views/newLogin.vue
# sgzb-ui/src/views/oldLogin.vue
# sgzb-ui/src/views/resetPassword.vue
# sgzb-ui/src/views/system/user/index.vue
# sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
# sgzb-ui/src/views/warehouseManage/machinery/keeper/index.vue
# sgzb-ui/src/views/warehouseManage/machinery/parts/index.vue
# sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
# sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue
# sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue
# sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/index.vue
# sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
# sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
# sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue
# sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
# sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
# sgzb-ui/src/views/warehouseManage/tagBind/bind/index.vue
# sgzb-ui/src/views/warehouseManage/warehousing/Inventory/index.vue
# sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
# sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
# sgzb-ui/src/views/warehouseManage/warehousing/return/index.vue
# sgzb-ui/vue.config.js
|
2024-07-11 20:28:54 +08:00 |
 binbin_pan
|
89f3c6f39c
|
IOT设备管理联调
|
2024-07-11 18:33:09 +08:00 |
BianLzhaoMin
|
24e06003d9
|
预报废列表按钮优化
|
2024-07-11 17:24:34 +08:00 |
|
BianLzhaoMin
|
b9e8f34fe9
|
优化处置文件上传，报废驳回等问题
|
2024-07-11 15:17:01 +08:00 |
|
BianLzhaoMin
|
947dc56d6c
|
优化上传题型
|
2024-07-11 09:41:49 +08:00 |
|
BianLzhaoMin
|
6baa14cc5f
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-07-10 17:55:50 +08:00 |
|
BianLzhaoMin
|
de977c0100
|
优化上传问题
|
2024-07-10 17:55:48 +08:00 |
|
binbin_pan
|
40eb75962a
|
数据推送
|
2024-07-10 17:23:54 +08:00 |
 liang.chao
|
a0a0ce7f28
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-07-10 16:59:59 +08:00 |
|
liang.chao
|
1440b673d6
|
新购验收增加图片展示功能
|
2024-07-10 16:59:41 +08:00 |
|
BianLzhaoMin
|
ecbf580e80
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-07-10 16:59:28 +08:00 |
|
BianLzhaoMin
|
445e250d2b
|
新购验收页面增加附件信息查看功能
|
2024-07-10 16:59:24 +08:00 |
|
liang.chao
|
4337996e01
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-07-10 14:40:18 +08:00 |
|
liang.chao
|
48826ae819
|
禅道bug修改
|
2024-07-10 14:40:08 +08:00 |
|
BianLzhaoMin
|
2e3f6ef8af
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-07-10 14:12:40 +08:00 |
|
BianLzhaoMin
|
47481e8fb4
|
优化页面，增加领料催办短信问题
|
2024-07-10 14:12:37 +08:00 |
|
mashuai
|
4e9dfa60cd
|
通知公告弹窗降序
|
2024-07-10 11:11:32 +08:00 |
|
mashuai
|
ff43266b93
|
通知公告弹窗微调
|
2024-07-10 10:59:10 +08:00 |
|
BianLzhaoMin
|
1db5f7cd6f
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-07-10 08:50:31 +08:00 |
|
BianLzhaoMin
|
fb8599e607
|
优化页面
|
2024-07-10 08:50:28 +08:00 |
|
liang.chao
|
6ed34efbb8
|
禅道bug修改
|
2024-07-09 19:00:53 +08:00 |
|
BianLzhaoMin
|
5f17f97f0e
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-07-09 17:51:50 +08:00 |
|
BianLzhaoMin
|
1f83edc71d
|
优化页面字段
|
2024-07-09 17:51:47 +08:00 |
|
liang.chao
|
e70ec91271
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-07-09 17:40:41 +08:00 |
|
liang.chao
|
6a2023bd4b
|
领料审核短信修改
|
2024-07-09 17:40:27 +08:00 |
|
BianLzhaoMin
|
8e07744e10
|
优化表单搜素项
|
2024-07-09 17:07:03 +08:00 |
|
binbin_pan
|
aa9aac7459
|
数据推送
|
2024-07-09 17:06:32 +08:00 |
|
BianLzhaoMin
|
99346e816d
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-07-09 16:54:28 +08:00 |
|
BianLzhaoMin
|
5ddc832224
|
数量退料时bug修改，调试领料申请时首催短信问题
|
2024-07-09 16:54:25 +08:00 |
|
mashuai
|
55bb72d1a1
|
通知公告弹窗
|
2024-07-09 13:09:27 +08:00 |
|
BianLzhaoMin
|
1240d87af3
|
新增通知公告弹框
|
2024-07-09 11:22:10 +08:00 |
|
BianLzhaoMin
|
ee67ff5f5d
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-07-09 08:26:10 +08:00 |
|
BianLzhaoMin
|
431d087010
|
优化接口取值
|
2024-07-09 08:26:07 +08:00 |
|
binbin_pan
|
8eea5b7ad4
|
数据推送
|
2024-07-08 18:08:41 +08:00 |
|
mashuai
|
feab351a4f
|
bug调试
|
2024-07-08 16:34:57 +08:00 |
|
BianLzhaoMin
|
80df6d082d
|
优化页面样式
|
2024-07-08 16:26:03 +08:00 |
|
BianLzhaoMin
|
33f6069fea
|
测试打包
|
2024-07-08 11:01:05 +08:00 |
|
BianLzhaoMin
|
962e1bbad8
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-07-08 10:27:49 +08:00 |
|
BianLzhaoMin
|
baed28c7c3
|
优化字段展示
|
2024-07-08 10:27:46 +08:00 |
|
binbin_pan
|
ed6530ee52
|
盘点入库-加大可入库的限制数量
|
2024-07-08 09:22:41 +08:00 |
 15856
|
ff11afe15f
|
当一个订单多个机具归属一个库管员时，只要通知一次
|
2024-07-06 15:17:36 +08:00 |
|
liang.chao
|
ca683c727d
|
禅道bug修改提交
|
2024-07-05 18:12:13 +08:00 |
|
BianLzhaoMin
|
3fc43574dc
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-07-05 17:44:01 +08:00 |
|
BianLzhaoMin
|
637594ba36
|
优化退料接收参数
|
2024-07-05 17:43:58 +08:00 |
|
liang.chao
|
5b7f0128d4
|
禅道bug修改提交
|
2024-07-05 17:08:06 +08:00 |
|
BianLzhaoMin
|
a4e52b0902
|
Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
|
2024-07-05 17:02:53 +08:00 |
|
BianLzhaoMin
|
74f9ceffff
|
调试成套设备新增参数修改
|
2024-07-05 17:02:51 +08:00 |
|
liang.chao
|
092b8068cb
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-07-05 16:56:29 +08:00 |
|
liang.chao
|
249b1c1240
|
预报废退料审核提交和禅道bug修改提交
|
2024-07-05 16:55:48 +08:00 |