diff --git a/.gitignore b/.gitignore index 838e520..586e79f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,12 @@ ### Example user template # IntelliJ project files .gitignore -.idea -*.iml out gen target +.idea +.iml .jar .class -.md \ No newline at end of file +.md +.log diff --git a/i3plus-pojo.iml b/i3plus-pojo.iml new file mode 100644 index 0000000..ec94526 --- /dev/null +++ b/i3plus-pojo.iml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/i3plus-pojo-base.iml b/modules/i3plus-pojo-base/i3plus-pojo-base.iml new file mode 100644 index 0000000..5dd064c --- /dev/null +++ b/modules/i3plus-pojo-base/i3plus-pojo-base.iml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 168c94a..c6a518e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -1317,22 +1317,22 @@ public class BlockFormEnumUtil { /** * 表单功能明细 触发信息 * - * onclick script 元素上发生鼠标点击时触发。 - * ondblclick script 元素上发生鼠标双击时触发。 - * ondrag script 元素被拖动时运行的脚本。 - * ondragend script 在拖动操作末端运行的脚本。 - * ondragenter script 当元素元素已被拖动到有效拖放区域时运行的脚本。 - * ondragleave script 当元素离开有效拖放目标时运行的脚本。 - * ondragover script 当元素在有效拖放目标上正在被拖动时运行的脚本。 - * ondragstart script 在拖动操作开端运行的脚本。 - * ondrop script 当被拖元素正在被拖放时运行的脚本。 - * onmousedown script 当元素上按下鼠标按钮时触发。 - * onmousemove script 当鼠标指针移动到元素上时触发。 - * onmouseout script 当鼠标指针移出元素时触发。 - * onmouseover script 当鼠标指针移动到元素上时触发。 - * onmouseup script 当在元素上释放鼠标按钮时触发。 - * onmousewheel script 当鼠标滚轮正在被滚动时运行的脚本。 - * onscroll script 当元素滚动条被滚动时运行的脚本。 + * onclick script 元素上发生鼠标点击时触发。 + * ondblclick script 元素上发生鼠标双击时触发。 + * ondrag script 元素被拖动时运行的脚本。 + * ondragend script 在拖动操作末端运行的脚本。 + * ondragenter script 当元素元素已被拖动到有效拖放区域时运行的脚本。 + * ondragleave script 当元素离开有效拖放目标时运行的脚本。 + * ondragover script 当元素在有效拖放目标上正在被拖动时运行的脚本。 + * ondragstart script 在拖动操作开端运行的脚本。 + * ondrop script 当被拖元素正在被拖放时运行的脚本。 + * onmousedown script 当元素上按下鼠标按钮时触发。 + * onmousemove script 当鼠标指针移动到元素上时触发。 + * onmouseout script 当鼠标指针移出元素时触发。 + * onmouseover script 当鼠标指针移动到元素上时触发。 + * onmouseup script 当在元素上释放鼠标按钮时触发。 + * onmousewheel script 当鼠标滚轮正在被滚动时运行的脚本。 + * onscroll script 当元素滚动条被滚动时运行的脚本。 * */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -1521,4 +1521,54 @@ public class BlockFormEnumUtil { } } + /** + * 菜单类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MENU_TYPE { + FORM_METHOD(1, "FORM_METHOD", "表单功能"), + OUTER_CHAIN(2, "OUTER_CHAIN", "外链"); + + private int value; + private String name; + private String description; + + MENU_TYPE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getName() { + return name; + } + + public static MENU_TYPE valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-form/i3plus-pojo-form.iml b/modules/i3plus-pojo-form/i3plus-pojo-form.iml new file mode 100644 index 0000000..b36beb9 --- /dev/null +++ b/modules/i3plus-pojo-form/i3plus-pojo-form.iml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java index fe5f61e..d8192c2 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java index b6d2f95..496d6f8 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java @@ -2,10 +2,6 @@ package cn.estsh.i3plus.pojo.form.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.sun.xml.internal.bind.v2.model.core.ID; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 942a339..cfc903f 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.sun.xml.internal.bind.v2.model.core.ID; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -16,8 +15,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; -import javax.transaction.Transactional; -import java.util.List; /** * @Description : diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java index e9cda71..30abaca 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java @@ -7,7 +7,6 @@ import lombok.Data; 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; @@ -26,39 +25,39 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BF_LAYOUT") -@Api(value="自定义表单布局") +@Table(name = "BF_LAYOUT") +@Api(value = "自定义表单布局") public class BfLayout extends BaseBean { - @Column(name="LAYOUT_NAME") - @ApiParam(value ="名称") + @Column(name = "LAYOUT_NAME") + @ApiParam(value = "名称") private String layoutName; - @Column(name="LAYOUT_WIDTH") - @ApiParam(value ="布局宽度") + @Column(name = "LAYOUT_WIDTH") + @ApiParam(value = "布局宽度") private Double layoutWidth; - @Column(name="LAYOUT_HEIGHT") - @ApiParam(value ="布局高度") + @Column(name = "LAYOUT_HEIGHT") + @ApiParam(value = "布局高度") private Double layoutHeight; - @Column(name="LAYOUT_ROW_COUNT") - @ApiParam(value ="行数") + @Column(name = "LAYOUT_ROW_COUNT") + @ApiParam(value = "行数") private Integer layoutRowCount; - @Column(name="LAYOUT_COLUMN_COUNT") - @ApiParam(value ="列数") + @Column(name = "LAYOUT_COLUMN_COUNT") + @ApiParam(value = "列数") private Integer layoutColumnCount; - @Column(name="LAYOUT_REPORT_COUNT") - @ApiParam(value ="引用报表数量") + @Column(name = "LAYOUT_REPORT_COUNT") + @ApiParam(value = "引用报表数量") private Integer layoutReportCount; - @Column(name = "LAYOUT_DESCRIPTION",columnDefinition = "TEXT") - @ApiParam(value ="布局描述") + @Column(name = "LAYOUT_DESCRIPTION", columnDefinition = "TEXT") + @ApiParam(value = "布局描述") private String layoutDescription; + // 布局行集合 @Transient - @ApiParam(value ="模板行集合") - private List brLayoutRows; + private List bfLayoutRows; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java index 3bcd562..6adb621 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java @@ -9,7 +9,6 @@ import lombok.Data; 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; @@ -26,41 +25,41 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BF_LAYOUT_COLUMN") -@Api(value="自定义表单布局-列") +@Table(name = "BF_LAYOUT_COLUMN") +@Api(value = "自定义表单布局-列") public class BfLayoutColumn extends BaseBean { - @Column(name="LAYOUT_ID") - @ApiParam(value ="布局主键") + @Column(name = "LAYOUT_ID") + @ApiParam(value = "布局主键") @JsonSerialize(using = ToStringSerializer.class) private Long layoutId; - @Column(name="LAYOUT_ROW_ID") - @ApiParam(value ="行主键") + @Column(name = "LAYOUT_ROW_ID") + @ApiParam(value = "行主键") @JsonSerialize(using = ToStringSerializer.class) private Long layoutRowId; - @Column(name="COLUMN_COLSPAN") - @ApiParam(value ="跨列数") + @Column(name = "COLUMN_COLSPAN") + @ApiParam(value = "跨列数") private Integer columnColspan; - @Column(name="COLUMN_ROWSPAN") - @ApiParam(value ="跨行数") + @Column(name = "COLUMN_ROWSPAN") + @ApiParam(value = "跨行数") private Integer columnRowspan; - @Column(name="COLUMN_WIDTH") - @ApiParam(value ="列宽") + @Column(name = "COLUMN_WIDTH") + @ApiParam(value = "列宽") private Integer columnWidth; - @Column(name="COLUMN_STYLE") - @ApiParam(value ="列样式") + @Column(name = "COLUMN_STYLE") + @ApiParam(value = "列样式") private String columnStyle; - @Column(name="COLUMN_SORT") - @ApiParam(value ="排序，降序") + @Column(name = "COLUMN_SORT") + @ApiParam(value = "排序，降序") private Integer columnSort; - @Column(name = "COLUMN_DESCRIPTION",columnDefinition = "TEXT") - @ApiParam(value ="列描述") + @Column(name = "COLUMN_DESCRIPTION", columnDefinition = "TEXT") + @ApiParam(value = "列描述") private String columnDescription; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java index 500b042..3996e81 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java @@ -9,7 +9,6 @@ import lombok.Data; 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; @@ -28,32 +27,32 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BF_LAYOUT_ROW") -@Api(value="自定义表单布局-行") +@Table(name = "BF_LAYOUT_ROW") +@Api(value = "自定义表单布局-行") public class BfLayoutRow extends BaseBean { - @Column(name="LAYOUT_ID") - @ApiParam(value ="布局主键") + @Column(name = "LAYOUT_ID") + @ApiParam(value = "布局主键") @JsonSerialize(using = ToStringSerializer.class) private Long layoutId; - @Column(name="ROW_HEIGHT") - @ApiParam(value ="行高") + @Column(name = "ROW_HEIGHT") + @ApiParam(value = "行高") private Integer rowHeight; - @Column(name="ROW_SORT") - @ApiParam(value ="排序") + @Column(name = "ROW_SORT") + @ApiParam(value = "排序") private Integer rowSort; - @Column(name="ROW_STYLE",columnDefinition = "TEXT") - @ApiParam(value ="行样式") + @Column(name = "ROW_STYLE", columnDefinition = "TEXT") + @ApiParam(value = "行样式") private String rowStyle; - @Column(name="ROW_COL_NUM") - @ApiParam(value ="行所关联列数") + @Column(name = "ROW_COL_NUM") + @ApiParam(value = "行所关联列数") private Integer rowColNum; + // 行所包含的列 @Transient - @ApiParam(value ="行所包含的列") - private List brLayoutColumns; + private List bfLayoutColumns; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java index 2d6f0b0..81e5d14 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java @@ -62,7 +62,7 @@ public class BfMenu extends BaseBean { @Column(name="METHOD_ID") @ApiParam(value ="功能id") - private String methodId; + private Long methodId; @Column(name = "MENU_STATUS") @ApiParam(value = "菜单状态") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java index d7344ba..b590a94 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java @@ -32,10 +32,6 @@ public class BfMethodDetail extends BaseBean { @ApiParam(value ="功能id") private Long methodId; - @Column(name="METHOD_NAME_RDD") - @ApiParam(value ="功能名称") - private String methodNameRdd; - @Column(name="layout_column_id") @ApiParam(value ="布局列id") private Long layoutColumnId; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 7802209..21c8c2a 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.form.sqlpack; +import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.form.bean.BfLayout; +import cn.estsh.i3plus.pojo.form.bean.BfLayoutRow; +import cn.estsh.i3plus.pojo.form.bean.BfMenu; +import cn.estsh.i3plus.pojo.form.bean.BfMethod; +import org.apache.commons.lang3.StringUtils; + /** * @Description : * @Reference : @@ -7,5 +14,111 @@ package cn.estsh.i3plus.pojo.form.sqlpack; * @CreateDate : 2019-03-21 15:16 * @Modify: **/ -public class FormHqlPack { +public final class FormHqlPack { + + private FormHqlPack() { + } + + /** + * In 参数封装 + * @param columnName 列名 + * @param params 参数 + * @return hql + */ + public static String packHqlIds(String columnName, String[] params) { + StringBuffer result = new StringBuffer(); + + // 参数数组 [1,2,3] -> "1,2,3" + HqlPack.getInPack(String.join(",", params), columnName, result); + return result.toString(); + } + + /** + * In 参数封装 + * @param columnName 列名 + * @param params 参数 + * @return hql + */ + public static String packHqlIds(String columnName, Long[] params) { + StringBuffer result = new StringBuffer(); + + // 参数数组 [1,2,3] -> "1,2,3" + HqlPack.getInPack(StringUtils.join(params, ","), columnName, result); + return result.toString(); + } + + /** + * 表单布局复杂查询 + * @param bfLayout 表单布局 + * @return hql + */ + public static String packHqlBfLayout(BfLayout bfLayout) { + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(bfLayout.getLayoutName(), "layoutName", result); + HqlPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result); + + return result.toString(); + } + + /** + * 根据表单布局查询表单布局行 + * @param bfLayout 表单布局 + * @return hql + */ + public static String packHqlBfLayoutRowByBfLayout(BfLayout bfLayout) { + StringBuffer result = new StringBuffer(); + + HqlPack.getNumEqualPack(bfLayout.getId(), "layoutId", result); + HqlPack.getNumEqualPack(bfLayout.getIsDeleted(), "isDeleted", result); + + result.append(bfLayout.orderBy()); + return result.toString(); + } + + /** + * 根据表单布局行查询表单布局列 + * @param bfLayoutRow 表单布局行 + * @return hql + */ + public static String packHqlBfLayoutColumnByBfLayoutRow(BfLayoutRow bfLayoutRow) { + StringBuffer result = new StringBuffer(); + + HqlPack.getNumEqualPack(bfLayoutRow.getLayoutId(), "layoutId", result); + HqlPack.getNumEqualPack(bfLayoutRow.getId(), "layoutRowId", result); + HqlPack.getNumEqualPack(bfLayoutRow.getIsDeleted(), "isDeleted", result); + + result.append(bfLayoutRow.orderBy()); + return result.toString(); + } + + /** + * 菜单目录复杂查询 + * @param bfMenu 菜单目录 + * @return hql + */ + public static String packHqlBfMenu(BfMenu bfMenu) { + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(bfMenu.getMenuName(), "menuName", result); + HqlPack.getNumEqualPack(bfMenu.getParentId(), "parentId", result); + HqlPack.getNumEqualPack(bfMenu.getIsDeleted(), "isDeleted", result); + + return result.toString(); + } + + /** + * 表单功能复杂查询 + * @param bfMethod 表单功能查询条件 + * @return hql + */ + public static String packHqlBfMethod(BfMethod bfMethod) { + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(bfMethod.getMethodName(), "methodName", result); + HqlPack.getNumEqualPack(bfMethod.getLayoutId(), "layoutId", result); + HqlPack.getNumEqualPack(bfMethod.getIsDeleted(), "isDeleted", result); + + return result.toString(); + } } diff --git a/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml b/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml new file mode 100644 index 0000000..d75c4ad --- /dev/null +++ b/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml b/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml new file mode 100644 index 0000000..d75c4ad --- /dev/null +++ b/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml b/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml new file mode 100644 index 0000000..b36beb9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml b/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml new file mode 100644 index 0000000..c1a72f3 --- /dev/null +++ b/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-model/i3plus-pojo-model.iml b/modules/i3plus-pojo-model/i3plus-pojo-model.iml new file mode 100644 index 0000000..97807fd --- /dev/null +++ b/modules/i3plus-pojo-model/i3plus-pojo-model.iml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml b/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml new file mode 100644 index 0000000..c1a72f3 --- /dev/null +++ b/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-report/i3plus-pojo-report.iml b/modules/i3plus-pojo-report/i3plus-pojo-report.iml new file mode 100644 index 0000000..b36beb9 --- /dev/null +++ b/modules/i3plus-pojo-report/i3plus-pojo-report.iml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml b/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml new file mode 100644 index 0000000..b36beb9 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml b/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml new file mode 100644 index 0000000..b36beb9 --- /dev/null +++ b/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml b/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml new file mode 100644 index 0000000..c1a72f3 --- /dev/null +++ b/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 640d69e..ce33950 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -41,6 +42,7 @@ public class WmsASNMasterDetails extends BaseBean { public Integer item; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -107,6 +109,7 @@ public class WmsASNMasterDetails extends BaseBean { public String vendorLotNo; @Column(name = "REC_QTY") + @ColumnDefault("0") @ApiParam(value = "已收数量", example = "0") public Double recQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index b99f4ec..62f285f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -49,7 +49,7 @@ public class WmsActionResponseBean { public Obj details; @ApiParam(value = "结果代码") - public Boolean codeStatus; + public Boolean codeStatus = true; @ApiParam(value = "作业任务编号", example = "1") @JsonSerialize(using = ToStringSerializer.class) @@ -77,6 +77,12 @@ public class WmsActionResponseBean { /** * 默认为true，如果这个值为true就禁用按钮否则可用， */ + @ApiParam(value = "按钮是否禁用") + public Boolean isCommitBtnDisabled = true; + + /** + * 默认为true，如果这个值为true就禁用按钮否则可用， + */ @ApiParam(value = "输入框是否禁用") public Boolean isInputBtnDisabled = false; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 96eb0b1..5d950d3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -57,6 +58,7 @@ public class WmsCSFactTrans extends BaseBean { public String sn; @Column(name="QTY") + @ColumnDefault("0") @ApiParam(value = "库存数量", example = "0") public Double qty; @@ -65,6 +67,7 @@ public class WmsCSFactTrans extends BaseBean { public String unit; @Column(name="FACT_QTY") + @ColumnDefault("0") @ApiParam(value = "实盘数量", example = "0") public Double factQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index a9391f9..411d07a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -40,6 +41,7 @@ public class WmsCSOrderDetails extends BaseBean { public Integer item; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index ff54102..caaad9d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -40,6 +41,7 @@ public class WmsDocMovementDetails extends BaseBean { public Integer item; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -76,6 +78,7 @@ public class WmsDocMovementDetails extends BaseBean { public String destLocateNo; @Column(name = "PRINT_QTY") + @ColumnDefault("0") @ApiParam(value = "条码打印数量", example = "1") private Double printQty; @@ -109,18 +112,22 @@ public class WmsDocMovementDetails extends BaseBean { private String remark; @Column(name = "PICK_QTY") + @ColumnDefault("0") @ApiParam(value = "已拣货数量", example = "1") private Double pickQty; @Column(name = "OUT_QTY") + @ColumnDefault("0") @ApiParam(value = "已出库数量", example = "1") private Double outQty; @Column(name = "REC_QTY") + @ColumnDefault("0") @ApiParam(value = "已收货数量", example = "1") private Double recQty; @Column(name = "MOVE_QTY") + @ColumnDefault("0") @ApiParam(value = "已移库数量", example = "1") private Double moveQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index a2ddf74..72e0030 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -108,4 +108,8 @@ public class WmsDocMovementMaster extends BaseBean { @Transient @ApiParam(value = "目的库存地代码") private String desrAreaNo; + + @Column(name = "IS_PART") + @ApiParam(value = "是否散件") + private Integer isPart; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 0a1030e..1a0230a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -46,6 +47,7 @@ public class WmsDocMovementSn extends BaseBean { public String partNameRdd; @Column(name="QTY") + @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java index 9be8adb..f720f6a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -45,6 +46,7 @@ public class WmsFGInStock extends BaseBean { public String partNameRdd; @Column(name="QTY") + @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index cfb386c..4e5bc8c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -128,6 +128,10 @@ public class WmsMoveDetails extends BaseBean { this.transQty = transQty; } + public WmsMoveDetails(String orderNo){ + this.orderNo = orderNo; + } + public Long getWaitingCounts() { return waitingCounts == null ? 0L : this.waitingCounts; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 2020250..4231c17 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -73,6 +74,7 @@ public class WmsMoveSn extends BaseBean { public String packAgeNo; @Column(name="SRC_QTY") + @ColumnDefault("0") @ApiParam(value = "源数量", example = "0") public Double srcQty; @@ -109,10 +111,12 @@ public class WmsMoveSn extends BaseBean { private Long finishedCounts; @Column(name="DEST_QTY") + @ColumnDefault("0") @ApiParam(value = "目标数量", example = "0") public Double destQty; @Column(name="QTY") + @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index ad1faae..7b1d60f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -78,4 +78,8 @@ public class WmsPOMaster extends BaseBean { @Column(name="IS_TASK") @ApiParam(value = "是否生产任务", example = "1") public Integer isTask; + + @Column(name="IS_PART") + @ApiParam(value = "是否散件", example = "1") + public Integer isPart; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index f65e744..364199b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -40,6 +41,7 @@ public class WmsPOMasterDetails extends BaseBean { public Integer item; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -52,18 +54,22 @@ public class WmsPOMasterDetails extends BaseBean { public String orderNo; @Column(name = "PRINT_QTY") + @ColumnDefault("0") @ApiParam(value = "条码打印数量", example = "0") public Double printQty; @Column(name = "RC_QTY") + @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") public Double rcQty; @Column(name = "PASS_QTY") + @ColumnDefault("0") @ApiParam(value = "质检合格数量", example = "0") public Double passQty; @Column(name = "NG_QTY") + @ColumnDefault("0") @ApiParam(value = "质检不合格数量", example = "0") public Double ngQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 619f29a..9fdfdd0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -46,6 +47,7 @@ public class WmsPoSn extends BaseBean { public String partNameRdd; @Column(name="QTY") + @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; @@ -78,6 +80,7 @@ public class WmsPoSn extends BaseBean { public String groupNo; @Column(name="REC_QTY") + @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") public Double recQty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 779e705..b7dd03a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -41,6 +42,7 @@ public class WmsQCDetails extends BaseBean { public Integer item; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -65,14 +67,17 @@ public class WmsQCDetails extends BaseBean { @Column(name = "FACT_QTY") + @ColumnDefault("0") @ApiParam(value = "实检数量", example = "0") public Double factQty; @Column(name = "PASS_QTY") + @ColumnDefault("0") @ApiParam(value = "合格数量", example = "0") public Double passQty; @Column(name = "REJECT_QTY") + @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") public Double rejectQty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 8c1eae2..d8a367b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -87,4 +87,8 @@ public class WmsQCMaster extends BaseBean { @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") public Integer isTask; + + @Column(name="IS_PART") + @ApiParam(value = "是否散件", example = "2") + public Integer isPart; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java index 9d9c2a2..429f415 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -42,6 +43,7 @@ public class WmsShopping extends BaseBean { public String partNameRdd; @Column(name="QTY") + @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java new file mode 100644 index 0000000..0ab7b22 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrintRcd.java @@ -0,0 +1,84 @@ +package cn.estsh.i3plus.pojo.wms.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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.Date; + +/** + * @Description : 条码补打印记录表 + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-21 14:50 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_SN_PRINT_RCD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "条码补打印记录表", description = "条码补打印记录表") +public class WmsSnPrintRcd extends BaseBean { + + @Column(name = "WH_NO") + @ApiParam(value = "仓库代码") + private String whNo; + + @Column(name = "ZONE_NO") + @ApiParam(value = "存储区编号") + private String zoneNo; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "库位代码") + private String locateNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + private String partNameRdd; + + @Column(name = "SN") + @ApiParam(value = "条码") + private String sn; + + @Column(name = "UNIT") + @ApiParam(value = "单位") + private String unit; + + @Column(name = "QTY") + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + private Double qty; + + @Column(name = "PDATE") + @ApiParam(value = "打印时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date pdate; + + @ApiParam(value = "仓库名称") + @Transient + public String whNameRdd; + + @ApiParam(value = "存储区名称") + @Transient + public String zoneNameRdd; + + @ApiParam(value = "库位名称") + @Transient + public String locateNameRdd; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index d34efd0..d10fe0b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -57,34 +58,42 @@ public class WmsStockQuan extends BaseBean { private String custNo; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") public Double qty; @Column(name = "FAIL_QTY") + @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") private Double failQty; @Column(name = "HOLD_QTY") + @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") private Double holdQty; @Column(name = "QC_QTY") + @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") private Double qcQty; @Column(name = "RIN_QTY") + @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") private Double rinQty; @Column(name = "FREEZE_QTY") + @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") private Double freezeQty; @Column(name = "CONSIGN_QTY") + @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") private Double consignQty; @Column(name = "LOCK_QTY") + @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") private Double lockQty; } 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 6333860..33e4d70 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 @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; @@ -96,6 +97,7 @@ public class WmsStockSn extends BaseBean { private String unit; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "数量", example = "0") private Double qty; /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index 34ab3f6..76f34f9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -57,10 +58,12 @@ public class WmsTaskDetails extends BaseBean { private String vendorNo; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "需求数量", example = "1") private Double qty; @Column(name = "TRANS_QTY") + @ColumnDefault("0") @ApiParam(value = "处理数量", example = "1") private Double transQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index d14c492..24b41f8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 作业任务表信息 @@ -67,4 +68,8 @@ public class WmsTaskInfo extends BaseBean { @ApiParam("是否一步法操作") public Integer isOneStep; + @ApiParam("作业类型名称") + @Transient + public String opTypeName; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java index 421e07e..52e7883 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -57,6 +58,7 @@ public class WmsTrans extends BaseBean{ private Integer transStatus; @Column(name="QTY") + @ColumnDefault("0") @ApiParam(value ="需求数") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index 893a13b..7c4009d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -93,34 +94,42 @@ public class WmsTransQuan extends BaseBean { private String errorMessage; @Column(name = "QTY") + @ColumnDefault("0") @ApiParam(value = "可用数量", example = "0") public Double qty; @Column(name = "FAIL_QTY") + @ColumnDefault("0") @ApiParam(value = "不合格数量", example = "0") private Double failQty; @Column(name = "HOLD_QTY") + @ColumnDefault("0") @ApiParam(value = "隔离数量", example = "0") private Double holdQty; @Column(name = "QC_QTY") + @ColumnDefault("0") @ApiParam(value = "质检中数量", example = "0") private Double qcQty; @Column(name = "RIN_QTY") + @ColumnDefault("0") @ApiParam(value = "待入库数量", example = "0") private Double rinQty; @Column(name = "FREEZE_QTY") + @ColumnDefault("0") @ApiParam(value = "冻结数量", example = "0") private Double freezeQty; @Column(name = "CONSIGN_QTY") + @ColumnDefault("0") @ApiParam(value = "寄售数量", example = "0") private Double consignQty; @Column(name = "LOCK_QTY") + @ColumnDefault("0") @ApiParam(value = "锁定数量", example = "0") private Double lockQty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java index 6fd02b2..c74b56c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -57,6 +58,7 @@ public class WmsTransRcd extends BaseBean{ private Integer transStatus; @Column(name="QTY") + @ColumnDefault("0") @ApiParam(value ="需求数") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java index 4a69c08..3adc50e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -65,10 +66,12 @@ public class WmsTransSn extends BaseBean { public String transCode; @Column(name="QTY") + @ColumnDefault("0") @ApiParam(value = "交易数量", example = "0") public Double qty; @Column(name="REJECT_QTY") + @ColumnDefault("0") @ApiParam(value = "不合格交易数量", example = "0") public Double rejectQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRcdRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRcdRepository.java new file mode 100644 index 0000000..d4a0c0a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRcdRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsSnPrintRcd; +import org.springframework.stereotype.Repository; + +/** +* @Description :条码打印记录Repository的方法接口 +* @Reference : +* @Author : siliter +* @CreateDate : 2019-03-21 10:19 +* @Modify: +**/ +@Repository +public interface WmsSnPrintRcdRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index dac5fb6..0b3776c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -60,12 +60,12 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getStringLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); + HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); + HqlPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); + HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); + HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); + HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); getStringBuilderPack(wmsPOMasterDetails, result); @@ -269,6 +269,20 @@ public class WmsHqlPack { } /** + * 根据类型查询库位分页 + * + * @param wmsLocate + * @return + */ + public static String packHqlWmsLocatesByType(WmsLocate wmsLocate) { + StringBuffer result = new StringBuffer(); + //查询参数封装 + HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); + getStringBuilderPack(wmsLocate, result); + return result.toString(); + } + + /** * 交易类型信息 分页查询 * * @param wmsTransType @@ -1248,6 +1262,12 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); // 单据编号 HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); + // 设备编号 + HqlPack.getStringEqualPack(wmsActionLog.getFixId(), "fixId", result); + // 交易类型代码 + HqlPack.getStringEqualPack(wmsActionLog.getTransTypeCode(), "transTypeCode", result); + // 流程状态 + HqlPack.getNumEqualPack(wmsActionLog.getActionStatus(), "actionStatus", result); getStringBuilderPack(wmsActionLog, result); @@ -1320,11 +1340,11 @@ public class WmsHqlPack { public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getNumEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getWhNo(), "whNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getPartNo(), "partNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + HqlPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); + HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); @@ -1334,6 +1354,23 @@ public class WmsHqlPack { } /** + * 根据条件查询条码条码信息 + * + * @param wmsSnPrintRcd + * @return + */ + public static String packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result); + HqlPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result); + HqlPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result); + HqlPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsSnPrintRcd.getLocateNo(), "locateNo", result); + getStringBuilderPack(wmsSnPrintRcd, result); + return result.toString(); + } + + /** * 根据条件模糊查询库存条码信息 * * @param wmsStockSn @@ -1341,7 +1378,7 @@ public class WmsHqlPack { */ public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); + HqlPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); getStringBuilderPack(wmsStockSn, result); HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); return result.toString(); @@ -1419,10 +1456,11 @@ public class WmsHqlPack { * @param vals * @return */ - public static String packHqlAndIn(BaseBean bean, String columnName, List vals) { + public static String packHqlAndIn(WmsTaskInfo bean,String columnName,List vals) { StringBuffer result = new StringBuffer(); String data = String.join(",", vals); - HqlPack.getInPackString(data, columnName, result); + HqlPack.getInPackString(data,columnName,result); + HqlPack.getNumEqualPack(bean.getTaskStatus(), "taskStatus", result); getStringBuilderPack(bean, result); return result.toString(); } @@ -1441,7 +1479,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsDataAuth.getDataObj(), "dataObj", result); } if (!Strings.isNullOrEmpty(wmsDataAuth.getDataObjValue())) { - HqlPack.getStringLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result); + HqlPack.getStringRightLikerPack(wmsDataAuth.getDataObjValue(), "dataObjValue", result); } getStringBuilderPack(wmsDataAuth, result); return result.toString(); @@ -1506,4 +1544,19 @@ public class WmsHqlPack { return result.toString(); } + /** + * 移库单订单条码表 分页查询 + * + * @param wmsDocMovementSn + * @return + */ + public static String packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsDocMovementSn.getPartNo(), "partNo", result); + + getStringBuilderPack(wmsDocMovementSn, result); + + return result.toString(); + } } diff --git a/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml b/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml new file mode 100644 index 0000000..d75c4ad --- /dev/null +++ b/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file