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

yxFwq

2024-07-14 b853fb2c1aa745d390a66974aad6a260f794664e

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

 src/main/java/com/zy/common/model/enums/WorkNoType.java

@@ -10,9 +10,10 @@
    PAKIN(0),
    PICK(1),
    PAKOUT(2),
    OTHER1(3),
//    OTHER1(3),
    OTHER2(4),
    OTHER(5),
    OTHER3(5),
    OTHER4(5),
    ;

    public Integer type;
@@ -42,7 +43,7 @@
            case 110:
                return PAKOUT.type;
            case 201:
                return OTHER1.type;
                return OTHER3.type;
            case 202:
                return OTHER2.type;
            default: