rev:半成品维护

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;
 

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{

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;

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("根据用户获取菜单")

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:
+  mapper-locations: classpath:/org/nl/**/mapper/**/*.xml
-    - classpath:/org/nl/**/mapper/**/*.xml
   global-config:
     db-config:
       id-type: INPUT

mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue

@@ -27,7 +27,7 @@
         <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
       </el-form-item>
       <el-form-item label="仓库" prop="stor_id">
-        <label slot="label">仓&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp库:</label>
+        <label slot="label">仓库</label>
         <el-select
           v-model="form.stor_id"
           clearable

mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue

@@ -14,7 +14,7 @@
         <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
         <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
       </el-form-item>
-      <el-form-item label="生产车间">
+      <el-form-item label="仓  库">
         <el-select
           v-model="form.product_code"
           clearable