diff --git a/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java new file mode 100644 index 0000000..4ccff93 --- /dev/null +++ b/src/main/java/com/gaotao/modules/schedule/controller/SchedulingController.java @@ -0,0 +1,59 @@ +package com.gaotao.modules.schedule.controller; + +import com.gaotao.common.utils.R; +import com.gaotao.modules.schedule.data.SearchScheduleData; +import com.gaotao.modules.schedule.data.ShiftInfoData; +import com.gaotao.modules.schedule.service.SchedulingService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Author LR + * @Description 排产的操作 + * @DateTime 2022/2/28 11:15 + * @Param + * @return + **/ +@RestController +@RequestMapping(value = "/scheduling") +public class SchedulingController { + + @Autowired + private SchedulingService schedulingService; + + /** + * @Author LR + * @Description 获取当前的机台对应的加工中心 + * @DateTime 2022/2/28 14:39 + * @Param [inData] + * @return com.gaotao.common.utils.R + **/ + @PostMapping(value = "getCurrentWorkCenterNoByResourceId") + public R getCurrentWorkCenterNoByResourceId(@RequestBody SearchScheduleData inData){ + String workCenterNo = schedulingService.getCurrentWorkCenterNoByResourceId(inData); + return R.ok() + .put("code", 200) + .put("msg", "操作成功!") + .put("workCenterNo", workCenterNo); + } + + + + + + + + + + + + + + + +} diff --git a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java index 66939b6..01363c8 100644 --- a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java +++ b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java @@ -395,4 +395,13 @@ public interface ScheduleMapper { * @return java.util.List **/ List getSfdcMaterialHistBySeqNo(SearchScheduleData inData); + + /** + * @Author LR + * @Description 获取当前加工中心机台对应的calendarId + * @DateTime 2022/2/28 11:57 + * @Param [inData] + * @return java.util.Map + **/ + Map getCalendarId(SearchScheduleData inData); } diff --git a/src/main/java/com/gaotao/modules/schedule/mapper/SchedulingMapper.java b/src/main/java/com/gaotao/modules/schedule/mapper/SchedulingMapper.java new file mode 100644 index 0000000..45c6d61 --- /dev/null +++ b/src/main/java/com/gaotao/modules/schedule/mapper/SchedulingMapper.java @@ -0,0 +1,25 @@ +package com.gaotao.modules.schedule.mapper; + +import com.gaotao.modules.schedule.data.SearchScheduleData; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +/** + * @Author LR + * @Description 接口mapper + * @DateTime 2022/2/28 14:42 + * @Param + * @return + **/ +@Mapper +@Repository +public interface SchedulingMapper { + /** + * @Author LR + * @Description 获取当前的机台对应的加工中心 + * @DateTime 2022/2/28 14:48 + * @Param [inData] + * @return java.lang.String + **/ + String getCurrentWorkCenterNoByResourceId(SearchScheduleData inData); +} diff --git a/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java b/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java new file mode 100644 index 0000000..b0cedc4 --- /dev/null +++ b/src/main/java/com/gaotao/modules/schedule/service/SchedulingService.java @@ -0,0 +1,21 @@ +package com.gaotao.modules.schedule.service; + +import com.gaotao.modules.schedule.data.SearchScheduleData; + +/** + * @Author LR + * @Description 排产使用的service + * @DateTime 2022/2/28 14:40 + * @Param + * @return + **/ +public interface SchedulingService { + /** + * @Author LR + * @Description 获取当前的机台对应的加工中心 + * @DateTime 2022/2/28 14:44 + * @Param [inData] + * @return java.lang.String + **/ + String getCurrentWorkCenterNoByResourceId(SearchScheduleData inData); +} diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index 54d2fe0..9d95f84 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -32,15 +32,16 @@ public class ScheduleServiceImpl implements ScheduleService { @Override public List getResourceRestList(SearchScheduleData inData) { - //获取当前加工中心机台的数据 - List resourceList = scheduleMapper.getResourceLIst(inData); + //获取当前加工中心机台对应的calendarId + Map resultMap = scheduleMapper.getCalendarId(inData); //判断是否存在当前的加工中心机台数据 - if (resourceList.size() == 0) { + if (resultMap.size() == 0) { //throw new RuntimeException(""); return new ArrayList(); } else { //设置查询的条件 - inData.setCalendarId(resourceList.get(0).getCalendarId()); + String calendarId = String.valueOf(resultMap.get("calendarId")); + inData.setCalendarId(calendarId); } return scheduleMapper.getResourceRestList(inData); } @@ -84,7 +85,7 @@ public class ScheduleServiceImpl implements ScheduleService { OperatorOutData operatorData = scheduleMapper.getOperatorData(inData); //判断是否存在 if(null == operatorData){ - throw new RRException("用户不存在!"); + throw new RRException("用户不存在!"); } //判断是否停用 String status = operatorData.getStatus(); 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 new file mode 100644 index 0000000..abd48b4 --- /dev/null +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/SchedulingServiceImpl.java @@ -0,0 +1,32 @@ +package com.gaotao.modules.schedule.service.impl; + +import com.gaotao.common.exception.RRException; +import com.gaotao.modules.schedule.data.SearchScheduleData; +import com.gaotao.modules.schedule.mapper.SchedulingMapper; +import com.gaotao.modules.schedule.service.SchedulingService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Author LR + * @Description 排产接口的实现类 + * @DateTime 2022/2/28 14:41 + * @Param + * @return + **/ +@Service +public class SchedulingServiceImpl implements SchedulingService { + + @Autowired + private SchedulingMapper schedulingMapper; + + @Override + public String getCurrentWorkCenterNoByResourceId(SearchScheduleData inData) { + String workCenterNo = schedulingMapper.getCurrentWorkCenterNoByResourceId(inData); + //判断是否存在 + if(null == workCenterNo || "".equalsIgnoreCase(workCenterNo)){ + throw new RRException("机台编码有误!"); + } + return workCenterNo; + } +} diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index 9062938..e621c94 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -996,4 +996,13 @@ ORDER BY smh.HistSeqNo DESC + + + \ No newline at end of file diff --git a/src/main/resources/mapper/schedule/SchedulingMapper.xml b/src/main/resources/mapper/schedule/SchedulingMapper.xml new file mode 100644 index 0000000..2a37a25 --- /dev/null +++ b/src/main/resources/mapper/schedule/SchedulingMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + \ No newline at end of file