diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index 0b1ec28..dcdd0ba 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import cn.estsh.i3plus.pojo.aps.holders.EMaterial; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; @@ -60,6 +61,11 @@ public class Material extends BaseAPS { @FieldAnnotation(defaultValue = "ONEBYONE") private ApsEnumUtil.REPLENISHMENT_TYPE replType; + @Column(name="GROUP_ID") + @ApiParam(value ="物料组") + @FieldAnnotation(relation = "Material") + private Long groupId; + @Column(name="PURCHASE_LEAD_TIME") @ApiParam(value ="采购提前期") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) @@ -151,6 +157,18 @@ public class Material extends BaseAPS { @ApiParam(value ="标签颜色") private String labelColor; + public Material getGroup() { + return BeanRelation.get(this, EMaterial.Group); + } + + public void setGroup(Material material) { + this.groupId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EMaterial.Group, material); + } + + @JsonBackReference + public List getChilds() { return BeanRelation.list(this, EMaterial.Childs); } + @JsonBackReference public List getProductRoutings() { return BeanRelation.list(this, EMaterial.ProductRoutings); 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 8f2d668..4493b0e 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 @@ -117,16 +117,6 @@ public class Resource extends BaseAPS { @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer timeTailRound; - @Column(name="LOCK_TYPE") - @ApiParam(value ="锁定类型") - @FieldAnnotation(defaultValue = "NONE") - private ApsEnumUtil.RESOURCE_LOCK_TYPE lockType; - - @Column(name="LOCK_TIME") - @ApiParam(value ="锁定时间长度") - @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) - private String lockTime; - @ApiParam(value ="是否存在任务冲突") @FieldAnnotation(property = false) @Transient diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 9fab094..220aac2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -65,9 +65,4 @@ public class StandOperation extends BaseAPS { @ApiParam(value ="生产组合方式") @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") private ApsEnumUtil.RES_COMB_TIME_TYPE combType; - - @Column(name="LOCK_TYPE") - @ApiParam(value ="锁定组合方式") - @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") - private ApsEnumUtil.RES_COMB_LOCK_TYPE lockType; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index dd55c06..8c15fbd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -99,22 +99,6 @@ public class WorkPlan extends BaseAPS { @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer postSetTime; - @Column(name="LOCK_BEGIN") - @ApiParam(value ="锁定开始时间") - @FieldAnnotation(modify = false) - @RippleAnnotation(dependence = {"MainWork.PostRelations.PostWork.MainPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock") - private Date lockBegin; - - @Column(name="LOCK_END") - @ApiParam(value ="锁定结束时间") - @FieldAnnotation(modify = false) - private Date lockEnd; - - @Column(name="LOCK_TIME") - @ApiParam(value ="锁定时间") - @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) - private Integer lockTime; - @Column(name="FORCE_POST_SET_ZERO") @ApiParam(value ="是否将后设置时间强制设置成0") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java index 65cc748..eaa363a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EMaterial { + Group, + Childs, ProductRoutings, OperInputs, OperOutputs, diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml index 51da8ba..33c5974 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml @@ -2,4 +2,6 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 2573b1e..279c6b0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -471,32 +471,6 @@ public class ApsEnumUtil { } /** - * 锁定时间计算方式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RES_COMB_LOCK_TYPE { - KEEP_ORIGIN("KEEP_ORIGIN", "各自锁定"), - MAIN_LOCK("MAIN_LOCK", "主资源锁定"), - MAX_ALL_RESOURCE("MAX_ALL_RESOURCE", "最大锁定时间"); - - private String value; - private String description; - - RES_COMB_LOCK_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 生产时间计算方法 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -958,8 +932,7 @@ public class ApsEnumUtil { public enum PLAN_TYPE { PREV_SET("", "前设置"), PRODUCE("", "生产"), - POST_SET("", "后设置"), - LOCK("", "锁定"); + POST_SET("", "后设置"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java new file mode 100644 index 0000000..97c9310 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetailStandard.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/1/25 10:47 AM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_EQU_TASK_DETAIL_STANDARD") +@Api("设备作业任务要求") +public class MesEquTaskDetailStandard extends BaseBean implements Serializable { + private static final long serialVersionUID = 8033976649492744091L; + + @Column(name = "TASK_DETAIL_ID") + @ApiParam("任务明细ID") + private Long taskDetailId; + + @Column(name = "ACTION_ITEM") + @ApiParam("操作项") + private String actionItem; + + @Column(name = "ACTION_STANDARD") + @ApiParam("操作标准") + private String actionStandard; + + @Column(name = "ACTION_GUIDE") + @ApiParam("操作指导") + private String actionGuide; + + @Column(name = "ACTION_GUIDE_URL") + @ApiParam("指导文件路径") + private String actionGuideUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index 3454a65..b19137b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -5,17 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; +import java.util.List; /** * @Description :设备周期作业计划 @@ -78,4 +74,8 @@ public class MesEquTaskPlan extends BaseBean implements Serializable { @ApiParam("作业任务编号") private String taskNo; + @Transient + @ApiParam("设备作业要求") + private List equTaskStandards; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java new file mode 100644 index 0000000..71b4157 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlanStandard.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description: 设备周期计划作业要求 + * @Author: jokelin + * @Date: 2021/1/25 10:43 AM + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_EQU_TASK_PLAN_STANDARD") +@Api("设备周期计划作业要求") +public class MesEquTaskPlanStandard extends BaseBean implements Serializable { + private static final long serialVersionUID = 8284644034068953809L; + + @Column(name = "PLAN_ID") + @ApiParam("计划ID") + private Long planId; + + @Column(name = "ACTION_ITEM") + @ApiParam("操作项") + private String actionItem; + + @Column(name = "ACTION_STANDARD") + @ApiParam("操作标准") + private String actionStandard; + + @Column(name = "ACTION_GUIDE") + @ApiParam("操作指导") + private String actionGuide; + + @Column(name = "ACTION_GUIDE_URL") + @ApiParam("指导文件路径") + private String actionGuideUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java index e5c4ae0..40df439 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java @@ -42,6 +42,10 @@ public class MesFurnaceLocation extends BaseBean implements Serializable { @ApiParam("炉内位置代码") private String fnLocationNo; + @Column(name = "orientation") + @ApiParam("方向") + private String orientation; + @Column(name = "SEQ") @ApiParam("推荐顺序") private Integer seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 97126f7..3816fc1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -265,4 +265,21 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { this.assyNo = assyNo; this.queueType = queueType; } + + public MesQueueOrderDetail(Long id, String orderNo, String vinCode, String produceCategoryCode, String productSn, String serialNumber, + String groupSeq, String queueGroupNo, Integer groupNo, String groupSide, String jisBackflushStatus, + String modifyUser) { + this.id = id; + this.orderNo = orderNo; + this.vinCode = vinCode; + this.produceCategoryCode = produceCategoryCode; + this.productSn = productSn; + this.serialNumber = serialNumber; + this.groupSeq = groupSeq; + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; + this.groupSide = groupSide; + this.jisBackflushStatus = jisBackflushStatus; + this.modifyUser = modifyUser; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java index bc8a783..6d0c829 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MaterialLotModel.java @@ -21,16 +21,16 @@ public class MaterialLotModel implements Serializable { private String modifyDateTime; - @ApiParam("生产日期") + @ApiParam("供应商批次") private String dateCode; - @ApiParam("批次") + @ApiParam("收货日期") private String lotNo; @ApiParam("特殊批次") private String fixLotNo; - @ApiParam("生产批次") + @ApiParam("生产日期") private String leftCode; @ApiParam("物料代码") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java index 0538b0f..0fdaca2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java @@ -1,12 +1,12 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanCfg; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanStandard; import io.swagger.annotations.ApiParam; import lombok.Data; -import lombok.Getter; -import lombok.Setter; import java.io.Serializable; +import java.util.List; @Data public class MesEquTaskPlanModel implements Serializable { @@ -73,6 +73,9 @@ public class MesEquTaskPlanModel implements Serializable { @ApiParam("设备周期计划配置") private MesEquTaskPlanCfg planCfg; + @ApiParam("设备作业要求") + private List equTaskStandards; + public MesEquTaskPlanModel() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index 3be6af1..c8e1ea9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -87,9 +87,22 @@ public class TJMgnBoardModel extends BaseBean implements Serializable { @ApiParam("产线") private String workCenterCode; + @Transient + @ApiParam("创建时间") + private String createDatetime; + public TJMgnBoardModel() { } + public TJMgnBoardModel(String partNo, String partNameRdd, Integer qcStatus, String workOrderNo, Integer snQty, String createDatetime) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qcStatus = qcStatus; + this.workOrderNo = workOrderNo; + this.snQty = snQty; + this.createDatetime = createDatetime; + } + public TJMgnBoardModel(String partNo, String partNameRdd, Integer qcStatus, String workOrderNo, Integer snQty) { this.partNo = partNo; this.partNameRdd = partNameRdd; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java index 317587c..a99b138 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.model.report; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; + /** * 生产统计 * @author yumingxing @@ -13,6 +15,12 @@ import lombok.Data; public class ProductStatisticsQueryModel { @ApiParam("生产线") + private List workCenterCodeList; + @ApiParam("工序") + private List processCodeList; + @ApiParam("零件号") + private List partNoList; + @ApiParam("生产线") private String workCenterCode; @ApiParam("工序") private String processCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java new file mode 100644 index 0000000..38c311a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailStandardRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskDetailStandard; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/1/25 10:49 AM + * @Modify: + */ +public interface MesEquTaskDetailStandardRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java new file mode 100644 index 0000000..03b79f7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanStandardRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskPlanStandard; + +/** + * @Description: + * @Author: jokelin + * @Date: 2021/1/25 10:46 AM + * @Modify: + */ +public interface MesEquTaskPlanStandardRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 6fc02ee..cbcbc49 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -8,8 +8,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -18,6 +16,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; @@ -109,7 +109,7 @@ public class WmsPart extends BaseBean { @Column(name = "ABC") @ApiParam(value = "分类") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "PART_ABC") private String abc; @Column(name = "BUY_UNIT") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 7023c0c..c7f840e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -397,6 +397,10 @@ public class WmsStockSn extends BaseBean { private Integer boxQty; @Transient + @ApiParam(value = "箱数") + private String boxQtyStr; + + @Transient @ApiParam(value = "是否报工") private String isReport;