Commit Graph

31 Commits

Author SHA1 Message Date
liang.chao 23e4885815 结算管理功能开发 2024-08-06 15:44:16 +08:00
sxu a00cbbd709 月度结算 2024-08-03 17:23:37 +08:00
mashuai 47831720ed 盘点入库详情 2024-06-05 14:06:45 +08:00
mashuai a5f7806154 重庆用户加解密 2024-06-05 13:37:52 +08:00
赵福海 0000bf3752 Merge remote-tracking branch 'origin/dev' into dev-cq
# Conflicts:
#	sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
#	sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SavePutInfoDto.java
#	sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java
#	sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
#	sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysSmsServiceImpl.java
#	sgzb-ui/package.json
#	sgzb-ui/prettier.config.js
#	sgzb-ui/src/router/index.js
#	sgzb-ui/src/utils/request.js
#	sgzb-ui/src/views/base/comeAndGo/index.vue
#	sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
#	sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
#	sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
#	sgzb-ui/src/views/login.vue
#	sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
#	sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
#	sgzb-ui/src/views/store/tools/keeper.vue
#	sgzb-ui/src/views/system/user/index.vue
#	sgzb-ui/vue.config.js
2024-05-31 15:19:38 +08:00
mashuai 32b80e0d6c 手机号次数限制 2024-05-27 15:52:20 +08:00
mashuai eda8eac15d 权限 2024-05-08 18:43:46 +08:00
15856 d92af0df79 导出预报废审核列表 2024-05-07 11:02:36 +08:00
15856 40736e1c85 催办,退料报废,维修报废,预报废审核,报废审核 2024-05-06 10:35:08 +08:00
syruan 4ba7fa1e04 物资LOG日志 2024-04-18 16:34:01 +08:00
syruan 035de35c26 移动端token策略处理 2024-04-08 15:08:12 +08:00
syruan 97eb2e5040 腾讯云cos文件上传服务,Log注解新增 2024-04-02 17:46:55 +08:00
csyue 2881cb0204 int类型变量命名 2024-03-26 13:53:28 +08:00
syruan 518bb466e6 领料出库接口 2024-03-25 17:26:10 +08:00
liang.chao d0d13039d6 工地直转 2024-03-12 13:52:31 +08:00
1539530615@qq.com 3bbcd5f634 二级库、修试入库驳回代码提交 2024-03-01 17:57:05 +08:00
liang.chao 3878c5a23f 退料申请表数据问题修改 2024-02-27 18:06:01 +08:00
liang.chao 9ca45416b3 领料申请和管理数据隔离 2024-02-22 17:02:04 +08:00
liang.chao e9b0dbd68c Merge branch 'dev' into test-sso 2024-02-01 13:26:45 +08:00
bns_han 49b4ae203b 代码规范 2024-01-31 14:10:59 +08:00
bns_han d0f151a77d 代码规范 2024-01-31 11:25:41 +08:00
liang.chao b8f6578230 领料审核通过 2024-01-26 16:07:44 +08:00
liang.chao bfd206a0b2 代码规范提交 2024-01-23 09:32:21 +08:00
liang.chao d7b78162ec 领料申请驳回代码提交 2024-01-10 09:03:26 +08:00
cwchen f689436364 大屏添加接口 2023-12-21 13:26:41 +08:00
syruan 9fa8b537c9 领料申请逻辑完善 2023-12-19 00:53:49 +08:00
cwchen 9edf649b72 大屏 2023-12-16 13:01:37 +08:00
cwchen 99f7998a2d 日期工具类 2023-12-13 11:03:46 +08:00
syruan e2695c05a2 短信登录 2023-12-12 17:31:15 +08:00
cwchen 97b44440fd 大屏 2023-12-11 15:47:13 +08:00
bonus 8920821ac5 项目第一次上传git 2023-11-28 20:33:38 +08:00