 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
|
6a2023bd4b
|
领料审核短信修改
|
2024-07-09 17:40:27 +08:00 |
 15856
|
fd39dad8b7
|
sonar异味优化
|
2024-07-05 13:05:28 +08:00 |
|
liang.chao
|
c5a3725edf
|
退料单需求开发
|
2024-07-02 17:21:54 +08:00 |
|
15856
|
7810dd99ae
|
工机具类型管理绑定多个库管员时修改报错问题修复
|
2024-06-27 16:19:49 +08:00 |
|
mashuai
|
2e6db070e9
|
逐级短信审批催办
|
2024-06-27 11:07:42 +08:00 |
|
liang.chao
|
1234d7437e
|
Merge remote-tracking branch 'origin/dev-nx' into dev-nx
|
2024-06-24 18:18:34 +08:00 |
|
liang.chao
|
904ac86d14
|
测试问题提交
|
2024-06-24 18:18:19 +08:00 |
|
mashuai
|
4a2308fb0b
|
数据返回结果
|
2024-06-24 18:15:15 +08:00 |
|
mashuai
|
bc3d9007fb
|
库管员bug
|
2024-06-24 17:47:36 +08:00 |
|
mashuai
|
88001ab860
|
库管员bug
|
2024-06-24 17:20:26 +08:00 |
|
mashuai
|
4924fbcaf8
|
编码设备分开展示
|
2024-06-24 10:27:23 +08:00 |
|
15856
|
0190782966
|
报废原因和报废图片回显问题
|
2024-06-13 11:29:09 +08:00 |
|
mashuai
|
1c4fe61c2a
|
bug
|
2024-05-28 11:36:42 +08:00 |
|
mashuai
|
33b5c177a9
|
bug
|
2024-05-28 11:30:00 +08:00 |
|
mashuai
|
513ac105c8
|
用户加密漏洞
|
2024-05-23 19:26:58 +08:00 |
|
15856
|
457d1cf846
|
支持多公司使用
|
2024-05-20 09:12:28 +08:00 |
syruan
|
7cef74aa24
|
物资LOG日志修订
|
2024-04-29 16:50:07 +08:00 |
liang.chao
|
b1fee78651
|
bug修改
|
2024-04-20 17:29:05 +08:00 |
|
liang.chao
|
6207d42ee5
|
重庆机具问题提交
|
2024-04-20 10:42:49 +08:00 |
|
syruan
|
4ba7fa1e04
|
物资LOG日志
|
2024-04-18 16:34:01 +08:00 |
|
syruan
|
77c740164c
|
物资LOG日志
|
2024-04-12 16:19:28 +08:00 |
|
mashuai
|
5c1bf635a8
|
fix
|
2024-04-10 16:08:19 +08:00 |
|
syruan
|
035de35c26
|
移动端token策略处理
|
2024-04-08 15:08:12 +08:00 |
 hayu
|
dba22d1477
|
厂家规格型号添加及机具仓储状态查询修改
|
2024-04-03 14:07:26 +08:00 |
|
syruan
|
97eb2e5040
|
腾讯云cos文件上传服务，Log注解新增
|
2024-04-02 17:46:55 +08:00 |
|
liang.chao
|
6b029e51ef
|
退料申请表数据问题修改
|
2024-04-01 15:43:18 +08:00 |
|
liang.chao
|
759a4e22ff
|
领料出库代码提交
|
2024-03-28 18:11:48 +08:00 |
|
syruan
|
518bb466e6
|
领料出库接口
|
2024-03-25 17:26:10 +08:00 |
|
liang.chao
|
f42e2210ba
|
bug修改
|
2024-03-25 15:24:02 +08:00 |
|
liang.chao
|
3e32f0087d
|
bug修改
|
2024-03-22 17:38:48 +08:00 |
|
syruan
|
78b6f03bb3
|
领料审批流
|
2024-03-18 15:30:37 +08:00 |
|
liang.chao
|
d2fe5b72f1
|
工地直转查询接口修改
|
2024-03-15 16:22:10 +08:00 |
|
liang.chao
|
39c42e931f
|
工地直转
|
2024-03-15 13:55:04 +08:00 |
|
syruan
|
ca1980fdd6
|
优化导入，格式化时间，新增删除接口
|
2024-03-14 13:36:51 +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
|
5623ac3199
|
退料申请表数据问题修改
|
2024-03-11 18:45:55 +08:00 |
|
liang.chao
|
87dcee911f
|
二维码绑定和工地直转管理
|
2024-03-05 16:53:10 +08:00 |
1539530615@qq.com
|
60e10fcdb5
|
二维码代码提交
|
2024-03-04 16:40:13 +08:00 |
|
1539530615@qq.com
|
82c2a32a17
|
结算代码提交
|
2024-02-28 17:03:22 +08:00 |
|
1539530615@qq.com
|
8b1ecec6c1
|
结算代码提交
|
2024-02-27 17:16:51 +08:00 |
|
1539530615@qq.com
|
7bbad756b1
|
结算代码提交
|
2024-02-23 11:13:41 +08:00 |
|
1539530615@qq.com
|
bd6e623737
|
代码规范修改
|
2024-01-30 14:10:58 +08:00 |
|
1539530615@qq.com
|
1839e0537c
|
报废审核驳回修改
|
2024-01-26 13:03:26 +08:00 |
|
liang.chao
|
7c741a45af
|
线上bug修改
|
2024-01-25 14:11:30 +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 |
|
liang.chao
|
5781ddfee2
|
根据库管员进行领料发放
|
2024-01-16 20:06:21 +08:00 |