Commit Graph

323 Commits

Author SHA1 Message Date
mashuai 2c3ee99151 Merge branch 'master' into branch_basic 2024-10-23 13:59:53 +08:00
mashuai 710b214b1a Merge branch 'master' into branch_basic 2024-10-23 13:57:58 +08:00
mashuai e177458116 新购绑定 2024-10-23 13:50:04 +08:00
syruan 55aad85480 任务状态枚举更新、新购验收接口、事务处理 2024-10-23 13:46:01 +08:00
mashuai 315cce8cdc 新购绑定 2024-10-23 11:17:47 +08:00
mashuai 0013ceeed0 新购绑定 2024-10-23 11:12:46 +08:00
sxu 015f993bfe Merge remote-tracking branch 'origin/branch_basic' 2024-10-23 10:20:34 +08:00
mashuai 30364e6b19 新购绑定 2024-10-23 10:05:59 +08:00
mashuai cef5310e65 新购绑定 2024-10-23 09:48:47 +08:00
mashuai de3594b947 新购绑定 2024-10-22 16:32:55 +08:00
mashuai ef3e01353c 新购绑定 2024-10-22 15:38:00 +08:00
mashuai 83cc6bd022 新购绑定 2024-10-22 14:22:34 +08:00
mashuai 1c70d63c42 新购绑定 2024-10-22 14:16:53 +08:00
syruan d23f2765ae 新购验收--定义枚举、增加事务、去除TODO 2024-10-22 14:02:26 +08:00
mashuai 2bed78391e 新购绑定 2024-10-22 14:00:51 +08:00
sxu 7067ff7290 替代MaTypeConfigController 2024-10-22 13:27:25 +08:00
syruan f1a955262a 新购验收--报告附件查询、报告附件新增API 2024-10-22 11:27:34 +08:00
mashuai 246b482bc2 新购入库 2024-10-21 18:40:35 +08:00
syruan 56f09fd5c7 新增新购模块枚举 2024-10-21 16:52:34 +08:00
syruan e48ddb3d85 物资类型API--优化业务代码至service层 2024-10-21 15:37:44 +08:00
syruan ed83f77055 新购任务--批量发送短信sendSMS 2024-10-21 14:50:13 +08:00
syruan c1abbcbba5 Merge remote-tracking branch 'origin/branch_syruan' into branch_syruan 2024-10-21 14:27:38 +08:00
syruan 8093deda18 新购任务--批量增加人员通知API 2024-10-21 14:27:17 +08:00
sxu 03a47de19f Merge branch 'master' into branch_syruan 2024-10-21 14:14:08 +08:00
sxu b9291f2106 Merge remote-tracking branch 'origin/branch_syruan' into branch_syruan 2024-10-21 14:12:04 +08:00
syruan a542efc44d 物资类型--公用规格型号连动式下拉框 2024-10-21 13:20:13 +08:00
sxu 014996b1fe Merge remote-tracking branch 'origin/master' 2024-10-21 10:17:30 +08:00
mashuai 93ab8b705f 合并提交 2024-10-21 09:54:57 +08:00
mashuai 1d47b4aea4 解决合并冲突 2024-10-21 09:53:19 +08:00
sxu 40f90333b9 替代MaTypeConfigController 2024-10-21 09:42:17 +08:00
mashuai 55acf99070 字段长度判断 2024-10-21 09:39:14 +08:00
mashuai 79f6a099a6 字段非空判断 2024-10-21 09:20:36 +08:00
syruan 6753565194 Merge remote-tracking branch 'origin/branch_syruan' 2024-10-18 18:24:31 +08:00
syruan 65fff1eefb 物资新购新增多表查询 2024-10-18 18:05:29 +08:00
sxu 31c7da6798 添加退料审核配置和读取 2024-10-18 17:41:51 +08:00
mashuai 413ba05302 工程管理 2024-10-18 17:36:17 +08:00
syruan ed2290bc99 物资类型--控制器代码抽出 优化三四级节点关联逻辑 2024-10-18 16:57:12 +08:00
sxu 07e05db253 update scritps 2024-10-18 16:13:17 +08:00
syruan 77e19d4d9d 物资类型新增字段 2024-10-18 15:29:49 +08:00
mashuai c6aa29b09f 基础模块合并 2024-10-18 15:20:00 +08:00
mashuai ab7aef3c84 Merge branch 'master' into branch_basic 2024-10-18 15:17:36 +08:00
mashuai 25481aa6af 工程管理 2024-10-18 15:13:39 +08:00
mashuai 8f87295d6a 工程管理 2024-10-18 15:01:36 +08:00
mashuai 935f8d5823 合并代码 2024-10-18 14:29:39 +08:00
syruan bb4d2ebf80 供应商新增营业执照附件上传,新购流程开发 2024-10-18 13:54:24 +08:00
mashuai c8cd712ed1 合并代码 2024-10-18 13:52:09 +08:00
mashuai 008a477ea6 设备管理 2024-10-18 13:36:56 +08:00
mashuai 548577d50b 设备管理 2024-10-18 13:26:45 +08:00
sxu f779b8b0fe 添加任务审核模型 2024-10-18 12:07:48 +08:00
mashuai f8bea11e1c 设备管理 2024-10-18 09:31:11 +08:00