diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 7f1c3a8..9acb8ee 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1888,7 +1888,7 @@ public class WmsEnumUtil { STEP_SEQ("STEP_SEQ", "步骤调用序号"), MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"), QC_ORDER_NO("QC_ORDER_NO", "质检单单号"), - ORDER_NO("ORDER_NO", "盘点主表序号"); + CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号"); private String code; private String description; @@ -2068,4 +2068,88 @@ public class WmsEnumUtil { return null; } } + + /** + * 数据状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_STATUS { + ENABLE(1, "启用", "fa fa-success cell-fa fa-check"), + DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle"), + LOCKING(3, "全部", "fa cell-fa fa-lock"); + + private int value; + private String description; + private String code; + + DATA_STATUS(int value, String code, String description){ + this.value = value; + this.description = description; + this.code = code; + } + + public int getValue () { + return value; + } + + public String getDescription () { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf (int val){ + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].getDescription(); + } + } + return tmp; + } + } + + /** + * 打印模板 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRINT_TEMPLATE { + SN_PRINT_TEMPLATE(10, "SN_PRINT_TEMPLATE", "条码打印模板"), + ORDER_PRINT_TEMPLATE(20, "ORDER_PRINT_TEMPLATE", "订单打印模板"), + RC_BACK_PRINT_TEMPLATE(30, "RC_BACK_PRINT_TEMPLATE", "收货回执打印模板"); + + private int value; + private String code; + private String description; + + PRINT_TEMPLATE(int value, String code, String description){ + this.value = value; + this.description = description; + this.code = code; + } + + public int getValue () { + return value; + } + + public String getDescription () { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf (int val){ + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].getDescription(); + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java new file mode 100644 index 0000000..4ca730e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.bean.SysRole; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : siliter + * @CreateDate : 2019-03-19 13:52 + * @Modify: + **/ +@Data +public class UserRolePagerModel { + + private SysRole sysRole; + + private Pager pager; +} 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 c4a8117..a9391f9 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 @@ -86,8 +86,7 @@ public class WmsCSOrderDetails extends BaseBean { public Integer snStatus; /** - * 处理状态:1=已创建,5=已盘,10=已冻结 - * ,20=已解冻,30=取消冻结 + * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 */ @Column(name = "TRANS_STATUS") @ApiParam(value = "处理状态", example = "1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index 9ab2ff2..05c572c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -65,4 +65,16 @@ public class WmsCSOrderMaster extends BaseBean { @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") public Integer isTask; + + @Transient + @ApiParam(value = "盘点物料清单") + public String[] wmsCSParts; + + @Transient + @ApiParam(value = "盘点存储区清单") + public String[] wmsCSZones; + + @Transient + @ApiParam(value = "盘点库位清单") + public String[] wmsCSLocates; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java index ab4f8e7..72049d0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.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 : 盘点存储区信息 @@ -35,4 +36,8 @@ public class WmsCSZone extends BaseBean { @Column(name="ZONE_NO") @ApiParam("存储区代码") public String zoneNo; + + @Transient + @ApiParam("库位代码") + public String locateNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java index 8707b77..c889b78 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java @@ -91,18 +91,9 @@ public class WmsOpType extends BaseBean { @Column(name = "USE_TIME") @ApiParam(value = "标准工时(每箱)", example = "0") - private Integer userTime; + private Integer useTime; @Column(name = "IS_MULITI") @ApiParam(value = "是否允许多人操作", example = "0") private Integer isMuliti; - - @Column(name = "TM_ID") - @ApiParam(value = "处理组件编号") - @JsonSerialize(using = ToStringSerializer.class) - private Long tmId; - - @Column(name = "DATA_SRC") - @ApiParam("数据来源") - private String dataSrc; } 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 2cc7367..6787a24 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 @@ -24,6 +24,12 @@ import java.util.stream.Collectors; **/ public class WmsHqlPack { + public static String packInParams(String colnumName,String[] params){ + StringBuffer sb = new StringBuffer(); + HqlPack.getInPackString(String.join(",", params),colnumName,sb); + return sb.toString(); + } + /** * 封装公用查询参数 * @param bean 实体对象 @@ -188,7 +194,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsPart.getPartName(), "partNameRdd", result); + HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); @@ -351,7 +357,6 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); - HqlPack.getNumEqualPack(wmsOpType.getTmId(), "tmId", result); HqlPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result); getStringBuilderPack(wmsOpType, result); @@ -1471,4 +1476,16 @@ public class WmsHqlPack { getStringBuilderPack(wmsTransModule, result); return result.toString(); } + /** + * 根据条件查询系统配置信息 + * @param wmsConfig + * @return + */ + public static String packHqlWmsConfig(WmsConfig wmsConfig) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result); + getStringBuilderPack(wmsConfig, result); + return result.toString(); + } + }