From 63cf82d78a6c19539276ecb3ca0badaa5bb90d93 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 19 Sep 2025 17:02:06 +0800 Subject: [PATCH] =?UTF-8?q?2025-09-19=201=E3=80=81=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=99=BB=E9=99=86=E4=BA=BA=E5=91=98=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=201=E3=80=81=E8=BF=87=E7=AB=99=E9=87=87=E9=9B=86?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=A0=B9=E6=8D=AE=E7=99=BB=E9=99=86=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E7=9A=84username=20=E6=9F=A5=E8=AF=A2=E6=9C=BA?= =?UTF-8?q?=E5=8F=B0=E6=8E=88=E6=9D=83=E8=A1=A8=E4=B8=AD=E7=9A=84=E6=9D=83?= =?UTF-8?q?=E9=99=90=EF=BC=8C=E7=AD=9B=E9=80=89=E5=87=BA=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E6=9C=BA=E5=8F=B0=EF=BC=88=E9=BB=98=E8=AE=A4=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schedule/controller/SchedulingController.java | 9 +++++++++ .../gaotao/modules/schedule/mapper/SchedulingMapper.java | 3 +++ .../modules/schedule/service/SchedulingService.java | 3 +++ .../schedule/service/impl/SchedulingServiceImpl.java | 7 +++++++ src/main/resources/mapper/schedule/SchedulingMapper.xml | 8 ++++++++ 5 files changed, 30 insertions(+) diff --git a/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java index 37b8c7b..5942024 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java @@ -3,6 +3,8 @@ package com.gaotao.modules.schedule.controller; import com.gaotao.common.constant.SysMsgConstant; import com.gaotao.common.utils.PageUtils; import com.gaotao.common.utils.R; +import com.gaotao.modules.factory.entity.vo.MachineResourceVo; +import com.gaotao.modules.pms.entity.StandardOperationEntity; import com.gaotao.modules.purchasingManagement.entity.ViewSapPoData; import com.gaotao.modules.schedule.data.*; import com.gaotao.modules.schedule.service.SchedulingService; @@ -628,4 +630,11 @@ public class SchedulingController extends AbstractController { return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } + + @PostMapping("/getResourceByUser") + public R getResourceByUser(@RequestBody MachineResourceVo data){ + List list = schedulingService.getResourceByUser(data); + return R.ok().put("rows", list); + } + } diff --git a/src/main/java/com/gaotao/modules/schedule/mapper/SchedulingMapper.java b/src/main/java/com/gaotao/modules/schedule/mapper/SchedulingMapper.java index 7ecabf9..668d508 100644 --- a/src/main/java/com/gaotao/modules/schedule/mapper/SchedulingMapper.java +++ b/src/main/java/com/gaotao/modules/schedule/mapper/SchedulingMapper.java @@ -2,6 +2,7 @@ package com.gaotao.modules.schedule.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gaotao.modules.factory.entity.vo.MachineResourceVo; import com.gaotao.modules.pms.data.QcMethodData; import com.gaotao.modules.purchasingManagement.entity.CRollInfoData; import com.gaotao.modules.purchasingManagement.entity.ViewSapPoData; @@ -186,4 +187,6 @@ public interface SchedulingMapper { * @return java.util.Map **/ Map getSfdcFlowLabelData(SearchScheduleData inData); + + List getResourceByUser(MachineResourceVo data); } diff --git a/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java b/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java index 46bf1ef..aa98b53 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java @@ -1,6 +1,7 @@ package com.gaotao.modules.schedule.service; import com.gaotao.common.utils.PageUtils; +import com.gaotao.modules.factory.entity.vo.MachineResourceVo; import com.gaotao.modules.purchasingManagement.entity.ViewSapPoData; import com.gaotao.modules.schedule.data.*; @@ -365,4 +366,6 @@ public interface SchedulingService { * @date: 2022/12/2 16:41 */ void moveScheduleBun(SearchScheduleData inData); + + List getResourceByUser(MachineResourceVo data); } diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java index 7391e5e..d5da2dc 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java @@ -7,6 +7,7 @@ import com.gaotao.common.constant.SysMsgConstant; import com.gaotao.common.exception.XJException; import com.gaotao.common.utils.DateUtil; import com.gaotao.common.utils.PageUtils; +import com.gaotao.modules.factory.entity.vo.MachineResourceVo; import com.gaotao.modules.pda.dao.TransNoDao; import com.gaotao.modules.pms.data.QcMethodData; import com.gaotao.modules.purchasingManagement.entity.CRollInfoData; @@ -1321,4 +1322,10 @@ public class SchedulingServiceImpl implements SchedulingService { } } } + + @Override + public List getResourceByUser(MachineResourceVo data) { + List list = schedulingMapper.getResourceByUser(data); + return list; + } } diff --git a/src/main/resources/mapper/schedule/SchedulingMapper.xml b/src/main/resources/mapper/schedule/SchedulingMapper.xml index b1e3820..ff28243 100644 --- a/src/main/resources/mapper/schedule/SchedulingMapper.xml +++ b/src/main/resources/mapper/schedule/SchedulingMapper.xml @@ -432,4 +432,12 @@ + \ No newline at end of file