 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 |
 liang.chao
|
1440b673d6
|
新购验收增加图片展示功能
|
2024-07-10 16:59:41 +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 |
|
mashuai
|
4e9dfa60cd
|
通知公告弹窗降序
|
2024-07-10 11:11:32 +08:00 |
|
mashuai
|
ff43266b93
|
通知公告弹窗微调
|
2024-07-10 10:59:10 +08:00 |
|
liang.chao
|
6ed34efbb8
|
禅道bug修改
|
2024-07-09 19:00:53 +08:00 |
|
liang.chao
|
6a2023bd4b
|
领料审核短信修改
|
2024-07-09 17:40:27 +08:00 |
|
mashuai
|
55bb72d1a1
|
通知公告弹窗
|
2024-07-09 13:09:27 +08:00 |
|
mashuai
|
feab351a4f
|
bug调试
|
2024-07-08 16:34:57 +08:00 |
 15856
|
ff11afe15f
|
当一个订单多个机具归属一个库管员时，只要通知一次
|
2024-07-06 15:17:36 +08:00 |
|
liang.chao
|
ca683c727d
|
禅道bug修改提交
|
2024-07-05 18:12:13 +08:00 |
|
liang.chao
|
5b7f0128d4
|
禅道bug修改提交
|
2024-07-05 17:08:06 +08:00 |
|
liang.chao
|
249b1c1240
|
预报废退料审核提交和禅道bug修改提交
|
2024-07-05 16:55:48 +08:00 |
|
mashuai
|
52547c4323
|
test
|
2024-07-05 09:44:14 +08:00 |
|
mashuai
|
8ae7cd430f
|
大屏二级页面调试
|
2024-07-04 15:22:46 +08:00 |
|
mashuai
|
c1f55991eb
|
大屏页面调试
|
2024-07-04 09:26:02 +08:00 |
|
mashuai
|
9a942b3d87
|
大屏页面调试
|
2024-07-03 17:31:38 +08:00 |
|
mashuai
|
e2115c867f
|
领导发短信优先级未确认，暂时注释逐级发短信代码
|
2024-07-03 11:26:01 +08:00 |
|
15856
|
86f70ad962
|
修改管理员名称
|
2024-07-03 10:56:24 +08:00 |
|
15856
|
6001521609
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-07-03 09:55:34 +08:00 |
|
15856
|
e005116d3e
|
预报废驳回维修页面查看
|
2024-07-03 09:55:23 +08:00 |
|
liang.chao
|
c5a3725edf
|
退料单需求开发
|
2024-07-02 17:21:54 +08:00 |
|
liang.chao
|
1032f6d0a3
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-07-01 17:21:55 +08:00 |
|
liang.chao
|
9aaee8611c
|
试运行问题代码提交
|
2024-07-01 17:21:49 +08:00 |
|
mashuai
|
a1669a3e08
|
大屏二级页面分页
|
2024-07-01 15:36:33 +08:00 |
|
liang.chao
|
763746b314
|
试运行问题代码提交
|
2024-07-01 14:20:24 +08:00 |
|
15856
|
f28f3b6c86
|
预报废驳回退料页面优化
|
2024-06-28 16:35:10 +08:00 |
|
liang.chao
|
e852e14a31
|
问题代码提交
|
2024-06-28 09:55:41 +08:00 |
|
15856
|
bf812851cd
|
预报废驳回维修页面查看
|
2024-06-27 17:58:25 +08:00 |
|
15856
|
9fc5adaec3
|
预报废驳回维修页面查看
|
2024-06-27 16:48:41 +08:00 |
|
15856
|
2b201f35b5
|
预报废驳回和自动发送短信
|
2024-06-27 16:20:35 +08:00 |
|
15856
|
7810dd99ae
|
工机具类型管理绑定多个库管员时修改报错问题修复
|
2024-06-27 16:19:49 +08:00 |
|
mashuai
|
2e6db070e9
|
逐级短信审批催办
|
2024-06-27 11:07:42 +08:00 |
|
liang.chao
|
2b20d72d13
|
成套设备配置代码提交
|
2024-06-26 14:49:43 +08:00 |
|
liang.chao
|
c04a3b4738
|
维修员列表查询
|
2024-06-26 09:35:50 +08:00 |
|
liang.chao
|
8aa35d3ccf
|
测试问题提交
|
2024-06-25 17:46:52 +08:00 |
|
mashuai
|
f75f3107ea
|
测试修改
|
2024-06-25 10:37:41 +08:00 |
|
liang.chao
|
503d34ef03
|
测试问题提交
|
2024-06-25 10:33:24 +08:00 |
|
liang.chao
|
50de01d74d
|
测试问题提交
|
2024-06-25 10:21:46 +08:00 |
|
mashuai
|
2df173ba58
|
测试修改
|
2024-06-25 09:45:51 +08:00 |
|
liang.chao
|
904ac86d14
|
测试问题提交
|
2024-06-24 18:18:19 +08:00 |
|
mashuai
|
51b8a10208
|
数据返回结果
|
2024-06-24 18:07:22 +08:00 |
|
mashuai
|
bc3d9007fb
|
库管员bug
|
2024-06-24 17:47:36 +08:00 |
|
mashuai
|
bd706462e6
|
库管员bug
|
2024-06-24 17:43:21 +08:00 |
|
mashuai
|
88001ab860
|
库管员bug
|
2024-06-24 17:20:26 +08:00 |
|
liang.chao
|
55ef6f5b96
|
测试问题提交
|
2024-06-24 14:05:22 +08:00 |
|
mashuai
|
4924fbcaf8
|
编码设备分开展示
|
2024-06-24 10:27:23 +08:00 |
|
mashuai
|
ea64252ee1
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-06-24 10:13:12 +08:00 |
|
mashuai
|
cf317042c2
|
综合查询分开展示
|
2024-06-24 10:13:06 +08:00 |