动态查询:工厂代码可以展示在表格中但是不能作为可选查询条件(BUG#7675)+

3D仓库:库位和存储区新增修改的长宽高校验都去掉(BUG#7723)
yun-zuoyi
许心洁 5 years ago
parent 368986e9d8
commit eaed7962ab

@ -25,7 +25,7 @@ public @interface DynamicField {
int sort() default 0; int sort() default 0;
// 是否标题字段加粗 是否加粗:默认1-加粗2-非加粗 // 是否标题字段加粗 是否加粗:默认1-加粗2-非加粗
int isWider() default 2; int isWider() default 2;
// 是否勾选:默认1-勾选2-非勾 // 是否可选作查询条件:默认1-可选2-不可
int isSelect() default 1; int isSelect() default 1;
// 是否必选:默认1-必选2-非必选 // 是否必选:默认1-必选2-非必选
int isRequire() default 1; int isRequire() default 1;

@ -65,6 +65,7 @@ public abstract class BaseBean implements Serializable {
@Column(name="ORGANIZE_CODE", nullable = false) @Column(name="ORGANIZE_CODE", nullable = false)
@ApiParam(value ="组织代码") @ApiParam(value ="组织代码")
// @AnnoOutputColumn(hidden = true) // @AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isSelect = 2, isRequire = 2)
public String organizeCode; public String organizeCode;
@Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)

@ -12,10 +12,7 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.*;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/** /**
* @Description : * @Description :
@ -29,7 +26,9 @@ import javax.persistence.Transient;
@DynamicInsert @DynamicInsert
@DynamicUpdate @DynamicUpdate
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_PART") @Table(name = "WMS_PART", indexes = {
@Index(columnList = "ORGANIZE_CODE")
})
@Api("物料表") @Api("物料表")
public class WmsPart extends BaseBean { public class WmsPart extends BaseBean {
private static final long serialVersionUID = 4849044986767609346L; private static final long serialVersionUID = 4849044986767609346L;

Loading…
Cancel
Save