Commit Graph

660 Commits

Author SHA1 Message Date
hayu 1fd3565c51 新购时间筛选修改 2024-06-14 15:14:34 +08:00
mashuai 9cd15963dd bug 2024-06-14 14:58:11 +08:00
csyue f7bb700762 Merge remote-tracking branch 'origin/dev-cq' into dev-cq 2024-06-14 13:51:10 +08:00
csyue 5f5b7bccae 重庆测试问题修改 2024-06-14 13:50:59 +08:00
hayu dd94f1ee56 新购新增类型下拉框去重 2024-06-14 13:50:59 +08:00
csyue e5c4ad8c55 重庆测试问题修改 2024-06-14 13:42:46 +08:00
mashuai 2ba5872015 bug 2024-06-14 10:33:10 +08:00
mashuai 25210e04b6 bug 2024-06-13 17:56:24 +08:00
mashuai 3d6e880881 bug 2024-06-13 17:52:10 +08:00
mashuai 25469976a4 乱码bug 2024-06-13 14:44:59 +08:00
mashuai f0157d9563 乱码bug 2024-06-13 14:42:47 +08:00
hayu 9efc9ace5d 代码异味 2024-06-13 09:38:00 +08:00
mashuai cf8e5eac70 bug优化 2024-06-12 18:17:28 +08:00
csyue 39f3988079 修饰入库审核库管员返回 2024-06-12 17:48:54 +08:00
csyue c0e7bf8d7c Merge remote-tracking branch 'origin/dev-cq' into dev-cq 2024-06-12 17:44:16 +08:00
csyue a159464dfc 领料审核增加任务状态筛选 2024-06-12 17:43:04 +08:00
mashuai bfbb2bba31 入库盘点 2024-06-12 13:46:55 +08:00
csyue 79622b42a9 获取库管员接口修改 2024-06-12 09:10:45 +08:00
csyue 4db4ef2c65 获取维修人员接口修改 2024-06-12 09:03:58 +08:00
mashuai 5a96f46e6a bug 2024-06-11 11:19:51 +08:00
mashuai 2fa88dc1cd bug 2024-06-07 17:05:36 +08:00
csyue b6a404753b 重庆新购无法绑定编码问题修改 2024-06-07 13:29:51 +08:00
mashuai 47831720ed 盘点入库详情 2024-06-05 14:06:45 +08:00
mashuai a5f7806154 重庆用户加解密 2024-06-05 13:37:52 +08:00
15856 9df51c3993 重庆bug修复 2024-06-04 17:00:56 +08:00
赵福海 24b6c7be6e bug修复 2024-06-04 15:41:08 +08:00
hayu 351bcbfb12 测试问题修改 2024-06-04 09:01:38 +08:00
csyue 7690b80b6b 测试问题项修改 2024-05-31 15:26:47 +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 dd8e0e788a 盘点入库,用户加解密 2024-05-25 16:32:27 +08:00
mashuai 4db960c1d6 盘点入库,用户加解密 2024-05-25 16:28:54 +08:00
mashuai 6ac2183854 bug 2024-05-24 15:16:52 +08:00
liang.chao eafeddae64 代码提交 2024-05-16 13:37:16 +08:00
liang.chao 2c14888e0d 领料申请代码codeview 2024-05-10 15:22:15 +08:00
liang.chao ecdacc0143 领料管理列表展示问题提交 2024-05-10 11:06:49 +08:00
liang.chao 54d057f5b2 领料申请删除bug修改 2024-05-10 09:59:04 +08:00
liang.chao 7ef53ff9fe app退料接收无数据bug修改 2024-05-09 13:29:20 +08:00
mashuai eda8eac15d 权限 2024-05-08 18:43:46 +08:00
mashuai 99761fb49c 权限 2024-05-08 18:23:47 +08:00
BianLzhaoMin f6c1bdb1c7 冲突合并 2024-05-07 16:38:53 +08:00
liang.chao 8b5519223f 测试问题bug修改 2024-05-07 16:29:36 +08:00
15856 d92af0df79 导出预报废审核列表 2024-05-07 11:02:36 +08:00
mashuai 0f3675df58 bug 2024-05-07 10:21:12 +08:00
mashuai 75d2b02422 bug 2024-05-06 18:20:45 +08:00
liang.chao 25ad01ce71 bug修改提交 2024-05-06 17:59:30 +08:00
liang.chao 0cce5cc793 退料审核代码提交 2024-05-06 17:07:03 +08:00
15856 40736e1c85 催办,退料报废,维修报废,预报废审核,报废审核 2024-05-06 10:35:08 +08:00
mashuai 4c8a65cd54 大屏 2024-05-06 10:04:58 +08:00
BianLzhaoMin 688599a5b0 宁夏 冲突合并 2024-05-06 09:48:15 +08:00