|
|
|
|
@ -1,11 +1,13 @@
|
|
|
|
|
package cn.estsh.i3plus.pojo.aps.bean;
|
|
|
|
|
|
|
|
|
|
import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
|
|
|
|
|
import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
|
|
|
|
|
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
|
|
|
|
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
|
|
|
|
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
|
|
|
|
|
import cn.estsh.i3plus.pojo.aps.holders.EParentWork;
|
|
|
|
|
import com.fasterxml.jackson.annotation.JsonBackReference;
|
|
|
|
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
|
|
import io.swagger.annotations.ApiParam;
|
|
|
|
|
import lombok.Data;
|
|
|
|
|
@ -31,6 +33,7 @@ import java.util.List;
|
|
|
|
|
@Table(name = "APS_PARENT_WORK")
|
|
|
|
|
@Api("父工作")
|
|
|
|
|
@ExcludeImportExport
|
|
|
|
|
@ClassLevelAnnotation(level = 5)
|
|
|
|
|
public class ParentWork extends BaseAPS {
|
|
|
|
|
private static final long serialVersionUID = 8792781216193806606L;
|
|
|
|
|
|
|
|
|
|
@ -48,16 +51,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 +61,7 @@ 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;
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
@JsonIgnore
|
|
|
|
|
public BaseOrder getProductOrder() {
|
|
|
|
|
return BeanRelation.get(this, EParentWork.ProductOrder);
|
|
|
|
|
}
|
|
|
|
|
@ -99,6 +71,7 @@ public class ParentWork extends BaseAPS {
|
|
|
|
|
BeanRelation.set(this, EParentWork.ProductOrder, order);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@JsonIgnore
|
|
|
|
|
public Operation getOperation() {
|
|
|
|
|
return BeanRelation.get(this, EParentWork.Operation);
|
|
|
|
|
}
|
|
|
|
|
@ -112,70 +85,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;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
andly.pan
3 years ago