diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 903874d..129a9db 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -30,6 +30,7 @@ import java.util.List; public class Resource extends BaseCode { @Column(name="BOTTLENECK") @ApiParam(value ="是否瓶颈资源") + @FieldAnnotation(defaultValue = "false") private Boolean bottleneck; @Column(name="TYPE") @@ -60,11 +61,11 @@ public class Resource extends BaseCode { private Double maxProduceBatch; @Column(name="TIME_TAIL_ADJUST") - @ApiParam(value ="时间尾数调整") + @ApiParam(value ="时间尾数圆整") private String timeTailAdjust; @Column(name="TIME_ADJUST") - @ApiParam(value ="时间调整") + @ApiParam(value ="时间圆整") private String timeAdjust; @Column(name="MAX_PREV_SD_TIME") @@ -80,7 +81,7 @@ public class Resource extends BaseCode { private String maxPostSdTime; @Column(name="ROUND_TYPE") - @ApiParam(value ="时间与时间尾数圆整类型") + @ApiParam(value ="圆整类型") @FieldAnnotation(defaultValue = "ROUNDING") private ApsEnumUtil.TIME_ROUND_TYPE roundType; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java new file mode 100644 index 0000000..eea1979 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :流水号,补充生产订单和采购订单时自动生成编码 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_SERIAL_NUMBER") +@Api("取消计划规则") +public class SerialNumber extends BaseAPS { + + @Column(name="NUMBER") + @ApiParam(value ="流水号") + private Integer number; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index fa3db91..f35fbed 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -359,30 +359,31 @@ public class BeanRelation { * * @param bean */ - public static void delete(BaseBean bean) { - if (bean == null) { - return; - } - BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass()); - List> ownerSigns = beanInfo.getOwnerHolders(); - for (Enum holder : ownerSigns) { - List relaBeans = new ArrayList<>(list(bean, holder)); - for (BaseBean relaBean : relaBeans) { - //MemoryManager.delete(relaBean); - } - } - - List> normalSigns = beanInfo.getNormalSigns(); - for (Enum holder : normalSigns) { - Enum reverseHolder = beanInfo.getReverseHolder(holder); - List relaBeans = new ArrayList<>(list(bean, holder)); - for (BaseBean relaBean : relaBeans) { - if (reverseHolder != null) { - remove(relaBean, reverseHolder, bean); - } - } - } - } +// public static void delete(BaseBean bean) { +// if (bean == null) { +// return; +// } +// BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass()); +// List> ownerSigns = beanInfo.getOwnerHolders(); +// for (Enum holder : ownerSigns) { +// Class relaCls = beanInfo.getRelationInfo(holder).getBeanInfo().getBeanClass(); +// List relaBeans = new ArrayList<>(list(bean, holder)); +// for (BaseBean relaBean : relaBeans) { +// //MemoryManager.delete(relaBean); +// } +// } +// +// List> normalSigns = beanInfo.getNormalSigns(); +// for (Enum holder : normalSigns) { +// Enum reverseHolder = beanInfo.getReverseHolder(holder); +// List relaBeans = new ArrayList<>(list(bean, holder)); +// for (BaseBean relaBean : relaBeans) { +// if (reverseHolder != null) { +// remove(relaBean, reverseHolder, bean); +// } +// } +// } +// } /** * 按指定路径,递归调用lambda表达式,当lambda表达式返回false或路径存在循环则退出递归。 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ISerialNumberRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ISerialNumberRepository.java new file mode 100644 index 0000000..3770ae5 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ISerialNumberRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.SerialNumber; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ISerialNumberRepository extends CrudRepository { +}