Commit Graph

321 Commits

Author SHA1 Message Date
76164 307bb01e5a 二级库模块功能完善 2024-07-25 16:54:38 +08:00
76164 6d93d570f5 配件模块前后端代码修改 2024-07-25 15:56:07 +08:00
76164 805f69de95 二级库模块前后端修改 2024-07-24 18:50:46 +08:00
sxu 1e37e8aea8 二级库 2024-07-24 11:27:54 +08:00
sxu 851f419cc2 deploy 2024-07-24 09:47:19 +08:00
liang.chao ea19ecccc0 端口修改 2024-07-22 13:52:47 +08:00
sxu 3273e4ba9c deploy 2024-07-19 14:31:53 +08:00
hayu d958d0b775 新购 2024-06-20 09:07:29 +08:00
mashuai 4186260ef5 退料审核bug 2024-06-19 13:55:58 +08:00
hayu bc45f6bf07 综合服务中心导出功能修改 2024-06-18 17:42:02 +08:00
mashuai e80849ec52 退料审核bug 2024-06-18 16:23:47 +08:00
hayu 986013197c 代码异味 2024-06-14 18:04:40 +08:00
csyue 245c841248 重庆测试问题修改 2024-06-14 17:28:18 +08:00
csyue a6497fcc2c 重庆测试问题修改 2024-06-14 16:31:45 +08:00
hayu 1fd3565c51 新购时间筛选修改 2024-06-14 15:14:34 +08:00
mashuai 9cd15963dd bug 2024-06-14 14:58:11 +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
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 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
赵福海 24b6c7be6e bug修复 2024-06-04 15:41:08 +08:00
hayu 351bcbfb12 测试问题修改 2024-06-04 09:01:38 +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 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
mashuai 99761fb49c 权限 2024-05-08 18:23:47 +08:00
BianLzhaoMin f6c1bdb1c7 冲突合并 2024-05-07 16:38:53 +08:00
15856 d92af0df79 导出预报废审核列表 2024-05-07 11:02:36 +08:00
mashuai 0f3675df58 bug 2024-05-07 10:21:12 +08:00
15856 40736e1c85 催办,退料报废,维修报废,预报废审核,报废审核 2024-05-06 10:35:08 +08:00
liang.chao bc8420e094 bug修改提交 2024-04-30 16:43:40 +08:00
15856 25f84100e6 bug修复 2024-04-30 14:32:17 +08:00
15856 bbf5d988f3 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-30 10:26:55 +08:00
liang.chao 763c003c34 新购验收查询接口添加 2024-04-30 09:09:34 +08:00
mashuai 88ac035ed7 bug 2024-04-29 18:43:22 +08:00
15856 bad5c11bdc Merge remote-tracking branch 'origin/dev' into dev-cq-bug 2024-04-28 16:41:10 +08:00
liang.chao a8d0461e37 退料申请查询在用量代码提交 2024-04-28 09:13:18 +08:00
15856 f5f2307232 Bug修复 2024-04-26 17:58:14 +08:00
liang.chao 86c204a632 字段别名添加 2024-04-26 17:52:15 +08:00
liang.chao bf0992137d 成套机具和退料申请当前在用量代码提交 2024-04-26 17:00:29 +08:00