Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs

zjj

2024-03-13 59ef340bc31a599a12c616a459977518d595aef5

Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -1632,6 +1632,9 @@
                    case 1:
                        ledCommand.setTitle("全板入库");
                        break;
                    case 10:
                        ledCommand.setTitle("空板入库");
                        break;
                    case 101:
                        ledCommand.setTitle("全板出库");
                        break;
@@ -1655,7 +1658,7 @@
                ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
                ledCommand.setStaNo(wrkMast.getStaNo());
                ledCommand.setBarcode(wrkMast.getBarcode());
                if (wrkMast.getIoType() != 110) {
                if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
                    List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());

                    wrkDetls.forEach(wrkDetl -> {

 src/main/java/com/zy/asrs/utils/RouteUtils.java

@@ -233,11 +233,11 @@
    }

    public static Short CrnStaEnd(Integer endSta,Integer souSta) {
        if (souSta == 118){
            return (short)119;
        }
        switch (endSta) {
            case 100:
                if (souSta == 118){
                    return (short)119;
                }
                return (short)149;
            case 102:
            case 111: