1

zhang

昨天 27b048e77b68752c7c3060b9e31ad46efb4101a5

1

 version/db/cv.sql

@@ -136,5 +136,6 @@
-- Records of cv_work_lastno
-- ----------------------------
INSERT INTO `cv_work_lastno` VALUES (1, 1, 1, 1, 8999, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL);
INSERT INTO `cv_work_lastno` (`id`, `type`, `wrk_no`, `s_no`, `e_no`, `status`, `deleted`, `tenant_id`, `create_by`, `create_time`, `update_by`, `update_time`, `memo`) VALUES (2, 2, 10000, 10000, 30000, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL);

SET FOREIGN_KEY_CHECKS = 1;

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/AppleLocOperationHandler.java

@@ -162,9 +162,7 @@
        return job;
    }

    private Integer getWorkNo() {
        return wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
    }


    private ApplyInDto applyIn(String barcode, String staNo, StaProtocol staProtocol) {
        ApplyInDto applyInDto = new ApplyInDto();

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java

@@ -91,7 +91,7 @@
                            redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocol);


                            int workNo = wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
                            int workNo = wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_OUT_TYPE.type);
                            staProtocol.setWorkNo(workNo);
                            staProtocol.setStaNo(putSta.getTargetSta());
                            job = new Job();

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java

@@ -127,6 +127,6 @@
    }

    private Integer getWorkNo() {
        return wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
        return wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_IN_TYPE.type);
    }
}

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/enums/WorkNoTypeType.java

@@ -2,7 +2,9 @@

public enum WorkNoTypeType {

    WORK_NO_TYPE(1);
    WORK_NO_IN_TYPE(1),
    WORK_NO_OUT_TYPE(2);


    public int type;