#

fyxc

2025-04-03 7bac1f6a6be795d36b94a6f77b23958e0590add4

#

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

@@ -73,6 +73,9 @@
            if (basCrnp.getCrnNo() == 4 && !crn4){
                iterator.remove();
            }
            if (basCrnp.getCrnNo() == 7){
                iterator.remove();
            }
        }
        if (basCrnps.isEmpty()){
            return;

 src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java

@@ -31,42 +31,8 @@
    public ReturnT<String> start(LocMast locMastStart, LocMast locMastEnd, Integer crnNo) {
        try {
            LocMast locMastEndNew = null;
            Integer row1 = locMastStart.getRow1();
            Integer row2 = 0;
            Integer bay1 = locMastStart.getBay1();
            Integer lev1 = locMastStart.getLev1();
            if (row1==crnNo*4){
                row1 = crnNo*4-3;
                row2 = row1+1;
            }else {
                row1=crnNo*4;
                row2 = row1-1;
            }
            Integer signInt = 0;
            while (Cools.isEmpty(locMastEndNew) && lev1<9 && signInt<100){
                signInt++;

                bay1 = BAY+1-bay1;
                if ((bay1<BAY && bay1>0) || (bay1.equals(BAY) && lev1>3)){

                }else {
                    bay1=1;
                    lev1++;
                }
                locMastEndNew = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("row1",row1).eq("bay1",bay1).eq("lev1",lev1).ne("modi_user",66));
                LocMast locMastEndNew2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("row1",row2).eq("bay1",bay1).eq("lev1",lev1).ne("modi_user",66));
                if (!Cools.isEmpty(locMastEndNew) && !Cools.isEmpty(locMastEndNew2)){
                    locMastEnd = locMastEndNew;
                }
                if ((bay1<BAY && bay1>0)){
                    bay1++;
                }
                if (signInt==100){
                    bay1=1;
                    lev1++;
                    signInt=0;
                }
            }
            workService.locMove(locMastStart.getLocNo(), locMastEnd.getLocNo(), 66L);
        } catch (Exception e) {
            log.error("fail", e);

 src/main/resources/application.yml

@@ -10,7 +10,7 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=fyxcasrs
    url: jdbc:sqlserver://192.168.10.201:1433;databasename=fyxcasrs
    username: sa
    password: sa@123
  mvc: