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 50ff4846..8ea30294 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls differ 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 @@ - + 单  据 号: - +