二次重排不考虑交期

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java

@@ -48,16 +48,6 @@ public class ParentWork extends BaseAPS {
     @FieldAnnotation(property = false)
     private Integer confirmSerial = 0;
 
-    @Column(name="POST_SERIAL_NUMBER")
-    @ApiParam(value ="子工作流水号")
-    @FieldAnnotation(property = false)
-    private Integer postSerialNumber = 0;
-
-    @Column(name="NEW_SERIAL")
-    @ApiParam(value ="拆分工作流水号")
-    @FieldAnnotation(property = false)
-    private Boolean newSerial = false;
-
     @Column(name="PRODUCT_ORDER_ID")
     @ApiParam(value ="订单")
     @FieldAnnotation(property = false)
@@ -68,28 +58,6 @@ public class ParentWork extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long operationId;
 
-//    public int getCodeNumber() {
-//        for (int bitIndex = 0; bitIndex < 10; ++bitIndex) {
-//            int value = 1 << bitIndex;
-//            if ((this.serialNumber & value) == 0) {
-//                this.serialNumber |= value;
-//                newSerial = true;
-//                return bitIndex;
-//            }
-//        }
-//
-//        return 0;
-//    }
-//
-//    public void recoverNumber(int value) {
-//        if (newSerial == null || !newSerial) {
-//            return;
-//        }
-//
-//        value = ~(1 << value);
-//        this.serialNumber &= value;
-//    }
-
     public BaseOrder getProductOrder() {
         return BeanRelation.get(this, EParentWork.ProductOrder);
     }
@@ -112,70 +80,4 @@ public class ParentWork extends BaseAPS {
     public List<Work> getWorks() {
         return BeanRelation.list(this, EParentWork.Works);
     }
-
-    public int createNew() {
-        return getPrevNumber() * 10;
-    }
-
-    public int createContinue(int number) {
-        number /= 10;
-        return number * 10 + getPostNumber();
-    }
-
-    private int getPrevNumber() {
-        for (int bitIndex = 1; bitIndex < 10; ++bitIndex) {
-            int value = 1 << bitIndex;
-            if ((this.serialNumber & value) == 0) {
-                this.serialNumber |= value;
-                this.newSerial = true;
-                return bitIndex ;
-            }
-        }
-
-        return 0;
-    }
-
-    private int getPostNumber() {
-        for (int bitIndex = 1; bitIndex < 10; ++bitIndex) {
-            int value = 1 << bitIndex;
-            if ((this.postSerialNumber & value) == 0) {
-                this.postSerialNumber |= value;
-                return bitIndex;
-            }
-        }
-
-        return 0;
-    }
-
-    public void cycleNumber(int number) {
-        if (newSerial == null || !newSerial) {
-            return;
-        }
-
-        cyclePrevNumber(number);
-        cyclePostNumber(number);
-    }
-
-    private void cyclePrevNumber(int number) {
-        if (number % 10 > 0) {
-            return;
-        }
-
-        number /= 10;
-        number = ~(1 << number);
-        this.serialNumber &= number;
-    }
-
-    private void cyclePostNumber(int number) {
-        number %= 10;
-        if (number == 0) {
-            return;
-        }
-        if (this.postSerialNumber == null) {
-            this.postSerialNumber = 0;
-        }
-
-        number = ~(1 << number);
-        this.postSerialNumber &= number;
-    }
 }