From 8916b80dc0acc2594edeaddd3b3ce81bf5ccf501 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Wed, 10 May 2023 09:47:12 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=8D=8A=E6=88=90=E5=93=81=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/acs/service/impl/AgvInstService.java | 1 - .../{xml => dog}/StIvtIostorinvCpMapper.xml | 0 .../StIvtIostorinvdisCpMapper.xml | 0 .../StIvtIostorinvdisdtlCpMapper.xml | 0 .../StIvtIostorinvdtlCpMapper.xml | 0 .../controller/SemiProductInController.java | 5 ++++- .../controller/SemiProductOutController.java | 2 +- .../java/org/nl/wms/storage_manage/stivt.xls | Bin 400896 -> 400896 bytes .../controller/menu/SysMenuController.java | 4 ++++ .../src/main/resources/config/application.yml | 3 +-- .../product/productIn/AddDialog.vue | 2 +- .../product/productIn/ViewDialog.vue | 2 +- 12 files changed, 12 insertions(+), 7 deletions(-) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/{xml => dog}/StIvtIostorinvCpMapper.xml (100%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/{xml => dog}/StIvtIostorinvdisCpMapper.xml (100%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/{xml => dog}/StIvtIostorinvdisdtlCpMapper.xml (100%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/{xml => dog}/StIvtIostorinvdtlCpMapper.xml (100%) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java index 504c5ebd..b043d2ef 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java @@ -19,7 +19,6 @@ import org.nl.wms.scheduler_manage.service.point.ISchBasePointService; import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.PlatformTransactionManager; import java.util.stream.Collectors; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/dog/StIvtIostorinvCpMapper.xml similarity index 100% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvCpMapper.xml rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/dog/StIvtIostorinvCpMapper.xml diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/dog/StIvtIostorinvdisCpMapper.xml similarity index 100% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisCpMapper.xml rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/dog/StIvtIostorinvdisCpMapper.xml diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisdtlCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/dog/StIvtIostorinvdisdtlCpMapper.xml similarity index 100% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisdtlCpMapper.xml rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/dog/StIvtIostorinvdisdtlCpMapper.xml diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdtlCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/dog/StIvtIostorinvdtlCpMapper.xml similarity index 100% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdtlCpMapper.xml rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/dog/StIvtIostorinvdtlCpMapper.xml diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/SemiProductInController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/SemiProductInController.java index 13051473..0e4ffd8e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/SemiProductInController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/SemiProductInController.java @@ -17,12 +17,15 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.util.LinkedHashSet; import java.util.Map; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; @RestController @RequiredArgsConstructor @Api(tags = "半成品入库") -@RequestMapping("/api/in/semiProductIn") +@RequestMapping("/api/in/semiproductIn") @Slf4j @SaIgnore public class SemiProductInController{ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/SemiProductOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/SemiProductOutController.java index 6ae092bf..03f384cc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/SemiProductOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/SemiProductOutController.java @@ -19,7 +19,7 @@ import java.util.Map; @RestController @RequiredArgsConstructor @Api(tags = "半成品出库") -@RequestMapping("/api/semiProductOut") +@RequestMapping("/api/semiproductOut") @Slf4j public class SemiProductOutController{ private final SemiProductOutService semiProductOutService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls index 50ff484667f26444be4d52231ba13d0a50ff087a..8ea30294fe45f9bd2cd00dd6438b5620cef9ed22 100644 GIT binary patch delta 45 ucmZqJBhj!&VnYrK+XIdL)vis=MJ(+_EQ~KnGUM} delta 45 ucmZqJBhj!&VnYrKo5D6%&zQ#MB9`_d7Dgau0%B$$2Ju<97qPJQNdf?2<_+Tj diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java index df76d4cc..507cde2d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java @@ -17,9 +17,12 @@ import org.nl.wms.system_manage.service.menu.dto.MenuDto; import org.nl.wms.system_manage.service.menu.dto.MenuQuery; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; @@ -36,6 +39,7 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class SysMenuController { private final ISysMenuService iSysMenuService; + private final PlatformTransactionManager platformTransactionManager; @GetMapping(value = "/build") @ApiOperation("根据用户获取菜单") diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml index eb3aa928..0d141f34 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml @@ -87,8 +87,7 @@ mybatis-plus: configuration: map-underscore-to-camel-case: false # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mapper-locations: - - classpath:/org/nl/**/mapper/**/*.xml + mapper-locations: classpath:/org/nl/**/mapper/**/*.xml global-config: db-config: id-type: INPUT diff --git a/mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue index e828a30c..c261c596 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue @@ -27,7 +27,7 @@ - + 单  据 号: - +