diff --git a/console/pom.xml b/console/pom.xml index f65c57fb..ffdf56a5 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -64,6 +64,11 @@ anomaly + + com.foreverwin.mesnac + listener + + com.foreverwin.mesnac quartz diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java index 5fb59ea8..5362f265 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java @@ -139,7 +139,7 @@ public class UserResourceController { return R.ok(userResourceService.findAll(userResourceDto)); } - @PostMapping("saveAll") + @PostMapping("/saveAll") public R saveAll(@RequestBody Map param){ String resource = (String) param.get("resource"); String user = (String) param.get("user"); diff --git a/pom.xml b/pom.xml index 64dc68e7..ab5c5d57 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,12 @@ ${project.version} + + com.foreverwin.mesnac + listener + ${project.version} + + com.foreverwin.mesnac dataimport diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java index 5a4ccfb1..4850dd6b 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java @@ -247,7 +247,7 @@ public class SplitSfcServiceImpl extends ServiceImpl i splitSfc.setCreatedDateTime(LocalDateTime.now()); save(splitSfc); String workCenterBo = shopOrderService.getById(HandleEnum.SHOP_ORDER.getHandle(site, sfcData.getShopOrder())).getPlannedWorkCenterBo(); - sfcDispatchCommonService.saveSfcDispatch(site,CommonMethods.getUser(),StringUtil.trimHandle(workCenterBo),newSfc, sfcData.getShopOrder(),routerBo); + sfcDispatchCommonService.saveSfcDispatch(site,CommonMethods.getUser(),StringUtil.trimHandle(workCenterBo),newSfc, sfcData.getShopOrder(),maxRevisionRouter.getHandle()); return splitSfc; } catch (Exception e) { ExceptionUtil.throwException(e);