#

LSH

2024-06-16 2402bfd8833ceae684cab99f2981afda75893ea4

#

 src/main/java/com/zy/asrs/controller/BasJarController.java

@@ -126,7 +126,7 @@


    @PostMapping("/table/jar/state")
    @ManagerAuth(memo = "RGV信息表")
//    @ManagerAuth(memo = "RGV信息表")
    public R rgvStateTable(){
        List<JarStateTableVo> list = new ArrayList<>();
        List<BasJar> jars = basJarService.selectList(new EntityWrapper<BasJar>().orderBy("jar_no"));

 src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java

@@ -65,7 +65,7 @@
                            continue;
                        }
                        WrkMastSplitTwin wrkMastSplitTwin = wrkMastSplitTwinList.get(0);
                        if (wrkMastSplitTwin.getWrkType()!=1){
                        if (wrkMastSplitTwin.getWrkType()!=1 && wrkMastSplitTwin.getWrkType()!=2){
                            continue;
                        }
                        wrkMastSplitTwinList = wrkMastSplitTwinService.getWrkMastSplitTwinNoComplete(crnNo, 2, null, null, 4);

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8082
  port: 8080
  servlet:
    context-path: /@pom.build.finalName@

@@ -10,9 +10,12 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://192.168.4.15:1433;databasename=ahyxasrs
    url: jdbc:sqlserver://10.10.10.254:1433;databasename=ahyxasrs
    username: sa
    password: sa@123
#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=ahyxasrs
#    username: sa
#    password: sa@123
  mvc:
    static-path-pattern: /**
  redis: