Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz

console/pom.xml

@@ -64,6 +64,11 @@
             <artifactId>anomaly</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.foreverwin.mesnac</groupId>
+            <artifactId>listener</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.foreverwin.mesnac</groupId>
             <artifactId>quartz</artifactId>

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<String,Object> param){
         String resource = (String) param.get("resource");
         String user = (String) param.get("user");

pom.xml

@@ -132,6 +132,12 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.foreverwin.mesnac</groupId>
+                <artifactId>listener</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.foreverwin.mesnac</groupId>
                 <artifactId>dataimport</artifactId>

production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java

@@ -247,7 +247,7 @@ public class SplitSfcServiceImpl extends ServiceImpl<SplitSfcMapper, SplitSfc> 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);