From c1a79a3cfcfe5a8a3eefa8ccb0f451950ff328b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Tue, 10 Aug 2021 15:12:39 +0800 Subject: [PATCH 1/2] listener --- console/pom.xml | 5 +++++ .../mesnac/dispatch/controller/UserResourceController.java | 2 +- pom.xml | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) 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 From fbe645ebd68094efef43668aa359e6c40eb69096 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Tue, 10 Aug 2021 16:15:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/production/service/impl/SplitSfcServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);