diff --git a/src/main/java/com/gaotao/modules/base/controller/BaseController.java b/src/main/java/com/gaotao/modules/base/controller/BaseController.java index 618ddcd..66b999e 100644 --- a/src/main/java/com/gaotao/modules/base/controller/BaseController.java +++ b/src/main/java/com/gaotao/modules/base/controller/BaseController.java @@ -1233,6 +1233,20 @@ public class BaseController extends AbstractController { return responseData; } + /** + * @param [inData] + * @author: sxm + * @description: 获取物料工序最大工序编号 + * @return: com.gaotao.common.utils.R + * @date: 2023/3/7 11:55 + */ + @PostMapping("getPartNoRouteInMaxItemNo") + @ResponseBody + public R getPartNoRouteInMaxItemNo(@RequestBody RoutingDetailData inData) { + String maxItemNo = baseService.getPartNoRouteInMaxItemNo(inData); + return R.ok().put("data", maxItemNo); + } + /** * @return {@link Object} * @Title deleteRoutingDetail @@ -1852,9 +1866,9 @@ public class BaseController extends AbstractController { /** - * @author: sxm - * @description: 获取选中班次类型 默认信息 * @param [calendarData] + * @author: sxm + * @description: 获取选中班次类型 默认信息 * @return: com.gaotao.common.utils.R * @date: 2022/10/21 10:06 */ @@ -1866,16 +1880,18 @@ public class BaseController extends AbstractController { } /** + * @param [calendarExceptionData] * @author: sxm * @description: 修改班次信息 - * @param [calendarExceptionData] * @return: com.gaotao.common.utils.R * @date: 2022/10/21 10:27 */ @PostMapping("/updateWorkingCalendar") @ResponseBody - public R updateWorkingCalendar(@RequestBody CalendarExceptionData calendarExceptionData) { - baseService.updateWorkingCalendar(calendarExceptionData); + public R updateWorkingCalendar(@RequestBody CalendarExceptionData calendarExceptionData) { + baseService.updateWorkingCalendar(calendarExceptionData); return R.ok(getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)); } + + } diff --git a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java index f4f4806..439532c 100644 --- a/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java +++ b/src/main/java/com/gaotao/modules/base/dao/BaseMapper.java @@ -1946,4 +1946,15 @@ public interface BaseMapper { */ void deleteCalendarExceptionShift(CalendarExceptionData data); + + + /** + * @author: sxm + * @description: 获取物料最大工序 + * @param [inData] + * @return: java.lang.String + * @date: 2023/3/7 13:05 + */ + String getPartNoRouteInMaxItemNo(RoutingDetailData inData); + } diff --git a/src/main/java/com/gaotao/modules/base/service/BaseService.java b/src/main/java/com/gaotao/modules/base/service/BaseService.java index 47381e4..e810bb1 100644 --- a/src/main/java/com/gaotao/modules/base/service/BaseService.java +++ b/src/main/java/com/gaotao/modules/base/service/BaseService.java @@ -1194,4 +1194,14 @@ public interface BaseService { * @version 1.0 */ void deleteLabelSerialInfo(LabelContentSerialInfoData inData); + + /** + * @author: sxm + * @description: 获取物料工序最大工序编号 + * @param [inData] + * @return: java.lang.String + * @date: 2023/3/7 13:04 + */ + String getPartNoRouteInMaxItemNo(RoutingDetailData inData); + } diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java index 9b8bb9d..d203c4a 100644 --- a/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java +++ b/src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java @@ -2756,4 +2756,9 @@ public class BaseServiceImpl implements BaseService { //删除标签流水号信息 baseMapper.deleteLabelSerialInfo(inData); } + + @Override + public String getPartNoRouteInMaxItemNo(RoutingDetailData inData) { + return baseMapper.getPartNoRouteInMaxItemNo(inData); + } } diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml index 313997f..cd324c0 100644 --- a/src/main/resources/mapper/base/BaseMapper.xml +++ b/src/main/resources/mapper/base/BaseMapper.xml @@ -2125,6 +2125,10 @@ AND rcs.ReportID = #{labelNo} AND rcs.ItemNo = #{itemNo} +