diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseModelBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseModelBean.java index 3937b15..f4d02c4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseModelBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseModelBean.java @@ -1,7 +1,11 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; /** * @Description : @@ -10,6 +14,9 @@ import io.swagger.annotations.ApiParam; * @CreateDate : 2018-09-04 15:58 * @Modify: **/ +@Getter +@Setter +@ToString public class BaseModelBean { @ApiParam("操作对象") @@ -18,37 +25,23 @@ public class BaseModelBean { @ApiParam("翻页") private Pager pager; - private String OrdersString; + @ApiParam("排序SQL") + private String ordersString; - public BaseModelBean(Obj obj, Pager pager) { - this.obj = obj; - this.pager = pager; - } + @ApiParam("整型参数") + private long paramLong; - public BaseModelBean() { - } + @ApiParam("浮点数字参数") + private double paramDouble; - public Obj getObj() { - return obj; - } + @ApiParam("字符串参数") + private String paramString; - public void setObj(Obj obj) { + public BaseModelBean(Obj obj, Pager pager) { this.obj = obj; - } - - public Pager getPager() { - return pager; - } - - public void setPager(Pager pager) { this.pager = pager; } - public String getOrdersString() { - return OrdersString; - } - - public void setOrdersString(String ordersString) { - OrdersString = ordersString; + public BaseModelBean() { } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java index 1bba8ce..ad47fee 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java @@ -18,20 +18,6 @@ import java.util.Map; **/ public class BaseResultBean { - public static BaseResultBean buildBaseResultBean(boolean success,String msg){ - BaseResultBean rs = new BaseResultBean(); - rs.success = success; - if(success) { - rs.msg = msg; - rs.code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); - }else { - rs.code = ResourceEnumUtil.MESSAGE.FAIL.getCode(); - rs.errorMsg = msg; - } - - return rs; - } - @ApiParam("是否成功") public boolean success; @@ -108,4 +94,19 @@ public class BaseResultBean { public int getTotalCount() { return totalCount; } + + + public static BaseResultBean buildBaseResultBean(boolean success,String msg){ + BaseResultBean rs = new BaseResultBean(); + rs.success = success; + if(success) { + rs.msg = msg; + rs.code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); + }else { + rs.code = ResourceEnumUtil.MESSAGE.FAIL.getCode(); + rs.errorMsg = msg; + } + + return rs; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index f71827c..cf31941 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -348,7 +348,7 @@ public class ImppEnumUtil { * 2.UNREAD：未读 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum USER_MESSAGE_STATUS{ + public enum MESSAGE_STATUS { READ(1,"已读","fa cell-fa fa-file-text"), UNREAD(2,"未读","fa cell-fa fa-file-o"); @@ -357,10 +357,10 @@ public class ImppEnumUtil { private String name; private String description; - USER_MESSAGE_STATUS() { + MESSAGE_STATUS() { } - USER_MESSAGE_STATUS(int value, String name, String description) { + MESSAGE_STATUS(int value, String name, String description) { this.value = value; this.name = name; this.description = description; @@ -415,7 +415,7 @@ public class ImppEnumUtil { * 2.STATION_LETTER：站内信 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum USER_MESSAGE_TYPE{ + public enum MESSAGE_TYPE { MAIL(1,"邮件","邮件"), LETTER(2,"站内信","站内信"); @@ -424,10 +424,10 @@ public class ImppEnumUtil { private String name; private String description; - USER_MESSAGE_TYPE() { + MESSAGE_TYPE() { } - USER_MESSAGE_TYPE(int value, String name, String description) { + MESSAGE_TYPE(int value, String name, String description) { this.value = value; this.name = name; this.description = description; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index ddaef4e..7bc50c5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -31,19 +31,19 @@ public class SysConfig extends BaseBean { @Column(name="NAME") @ApiParam(value ="名称") private String name; - + @Column(name="CONFIG_TYPE") @ApiParam(value ="配置类型ID（枚举：1.系统配置...）" , example ="-1") private Integer configType; - + @Column(name="CONFIG_CODE") @ApiParam(value ="配置代码") private String configCode; - + @Column(name="CONFIG_VALUE") @ApiParam(value ="配置值") private String configValue; - + @Column(name="CONFIG_DESCRIPTION") @ApiParam(value ="配置描述") private String configDescription; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 00aa85b..e805f03 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -35,11 +35,11 @@ public class SysMessage extends BaseBean { private String messageTitle; @Column(name="MESSAGE_TYPE") - @ApiParam(value ="消息类型(枚举：1.通知，2.站内信)" , example ="-1") + @ApiParam(value ="消息类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1") private Integer messageType; @Column(name="MESSAGE_CONTENT_TYPE") - @ApiParam(value ="消息内容类型(枚举：1.HTML，2.TEXT)" , example ="-1") + @ApiParam(value ="消息内容类型(枚举：ImppEnumUtil.MESSAGE_CONTENT_TYPE)" , example ="-1") private Integer messageContentType; @Column(name="MESSAGE_CONTENT") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java new file mode 100644 index 0000000..a59768a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModule.java @@ -0,0 +1,50 @@ +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.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** +* @Description : 作业步骤处理组件 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-22 16:53 +* @Modify: +**/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_MODULE") +@Api("作业步骤处理组") +public class WmsActionModule extends BaseBean { + + @Column(name="AM_NAME") + @ApiParam("组件名称") + public String amName; + + @Column(name="AM_DESC") + @ApiParam("组件描述") + public String amDesc; + + @Column(name="CALL_CLASS") + @ApiParam("实现类") + public String callClass; + + @Column(name="CALL_FUN") + @ApiParam("调用方法") + public String callFun; + + @Column(name="AM_TYPE") + @ApiParam(value = "组件类型", example = "0") + public Integer amType; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java new file mode 100644 index 0000000..8910354 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java @@ -0,0 +1,50 @@ +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.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** +* @Description : 作业步骤处理组参数 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-22 16:53 +* @Modify: +**/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_MODULE_PARAM") +@Api("作业步骤处理组参数") +public class WmsActionModuleParam extends BaseBean { + + @Column(name="AM_ID") + @ApiParam("组件ID") + public Long amID; + + @Column(name="PARAM_CODE") + @ApiParam("参数编码") + public String paramCode; + + @Column(name="PARAM_NAME") + @ApiParam("参数名称") + public String paramName; + + @Column(name="PARAM_VALUE_LIST") + @ApiParam("参数可选值列表") + public String paramValueList; + + @Column(name="PARAM_TYPE") + @ApiParam(value = "参数类型", example = "0") + public Integer paramType; +} 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 new file mode 100644 index 0000000..33c4b57 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -0,0 +1,44 @@ +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 javax.persistence.Entity; +import java.util.List; + +/** + * @Description : PDA传输到后台的实体bean对象 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 15:58 + * @Modify: + **/ +@Data +@Api("返回前端数据实体") +public class WmsActionResponseBean extends BaseBean { + + @ApiParam("进度") + public Double percent; + + @ApiParam("当前步骤") + public Integer currentStep; + + @ApiParam("总步数") + public int totalStep; + + @ApiParam("提示信息") + public String message; + + @ApiParam("列表信息") + public List informations; + + @ApiParam("可选项") + public List options; + + @ApiParam("选中的明细数据") + public String details; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java new file mode 100644 index 0000000..4198ff5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java @@ -0,0 +1,63 @@ +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.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :作业步骤类型信息 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 9:33 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_ACTION_STEP") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="作业步骤信息",description = "作业步骤信息") +public class WmsActionStep extends BaseBean { + + @Column(name = "AS_NAME_E") + @ApiParam(value = "英文类型名称") + private String asNameE; + + @Column(name = "AS_DESC_E") + @ApiParam(value = "英文类型描述") + private String asDescE; + + @Column(name = "AS_NAME_C") + @ApiParam(value = "中文类型名称") + private String asNameC; + + @Column(name = "AS_DESC_C") + @ApiParam(value = "中文类型描述") + private String asDescC; + + @Column(name = "AT_NAME_C_RDD") + @ApiParam(value = "步骤类型名称") + private String atNameCRdd; + + @Column(name = "AT_ID") + @ApiParam(value = "步骤类型编号", example = "0") + private Long atId; + + //get单独处理 + public Long getAtId() { + if(atId != null) { + return atId.longValue(); + }else{ + return atId; + } + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java new file mode 100644 index 0000000..942e6a8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +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; + +/** + * @Description : 作业步骤调用 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-22 14:18 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_ACTION_STEP_CALL") +@Api("作业步骤调用信息") +public class WmsActionStepCall extends BaseBean { + + @Column(name="AS_ID") + @ApiParam(value = "作业步骤ID",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + public Long asId; + + @Column(name="SEQ") + @ApiParam(value = "序号",example = "0") + public Integer seq; + + @Column(name="AM_ID") + @ApiParam(value = "处理组件ID",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + public Long amId; + + @ApiParam(value = "组件名称") + public transient String amName; + + @ApiParam(value = "组件描述") + public transient String amDesc; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java new file mode 100644 index 0000000..cb08f18 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepType.java @@ -0,0 +1,50 @@ +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.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :作业步骤类型信息 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 9:33 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_ACTION_TYPE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="作业步骤类型信息",description = "作业步骤类型信息") +public class WmsActionStepType extends BaseBean { + + @Column(name = "AT_NAME_E") + @ApiParam(value = "英文类型名称") + private String atNameE; + + @Column(name = "AT_DESC_E") + @ApiParam(value = "英文类型描述") + private String atDescE; + + @Column(name = "AT_NAME_C") + @ApiParam(value = "中文类型名称") + private String atNameC; + + @Column(name = "AT_DESC_C") + @ApiParam(value = "中文类型描述") + private String atDescC; + + @Column(name = "FUN_CALL_NAME") + @ApiParam(value = "方法调用名称") + private String funCallName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java new file mode 100644 index 0000000..9f9d6c2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java @@ -0,0 +1,43 @@ +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.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.List; + +/** + * @Description : PDA传输到后台的实体bean对象 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 15:58 + * @Modify: + **/ +@Data +@Api("接受前端数据实体") +public class WmsOperationBean extends BaseBean { + + @ApiParam("扫描内容") + public String barCode; + + @ApiParam("可选项的值") + public List options; + + /** + * 触发源:10=扫描枪, + * 20=提交按钮,30=重置按钮,40=查看明细， 50=明细(删除) + * 60=明细（清空） + */ + @ApiParam("触发源") + public int sourceOwner; + + @ApiParam("选中的明细数据") + public String details; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.java new file mode 100644 index 0000000..3aa2b6c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleParamRepository.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.WmsActionModuleParam; +import org.springframework.stereotype.Repository; + +/** +* @Description : 作业步骤处理组件参数 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-22 17:01 +* @Modify: +**/ +@Repository +public interface WmsActionModuleParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java new file mode 100644 index 0000000..5fde9b3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionModuleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionModule; +import org.springframework.stereotype.Repository; +/** +* @Description : 作业步骤处理组件 +* @Reference : +* @Author : dragon.xu +* @CreateDate : 2018-11-22 17:01 +* @Modify: +**/ +@Repository +public interface WmsActionModuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java new file mode 100644 index 0000000..6987eb6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepCallRepository.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; + +/** + * @Description : 作业步骤调用信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2018-11-22 14:41 + * @Modify: + **/ +public interface WmsActionStepCallRepository extends BaseRepository { + + @Query("from WmsActionStepCall was, WmsActionStep wass where was.amId = wass.id ") + List findWmsActionStepCallByAmid(@Param("id") long id); + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.java new file mode 100644 index 0000000..91e4ff9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepRepository.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.WmsActionStep; +import org.springframework.stereotype.Repository; + +/** + * @Description : 作业步骤操作类 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 11:25 + * @Modify: + **/ +@Repository +public interface WmsActionStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java new file mode 100644 index 0000000..793ad96 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionStepTypeRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepType; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : 作业步骤类型操作类 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2018-11-22 11:25 + * @Modify: + **/ +@Repository +public interface WmsActionStepTypeRepository 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 a226b47..c4ec2f3 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 @@ -385,11 +385,11 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //仓库代码 - HqlPack.getNumEqualPack(wmsZones.getWhNo(), "whNo", result); + HqlPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result); //库存地代码 - HqlPack.getNumEqualPack(wmsZones.getAreaNo(), "areaNo", result); + HqlPack.getStringEqualPack(wmsZones.getAreaNo(), "areaNo", result); //存储区代码 - HqlPack.getNumEqualPack(wmsZones.getZoneNo(), "zoneNo", result); + HqlPack.getStringEqualPack(wmsZones.getZoneNo(), "zoneNo", result); getStringBuilderPack(wmsZones, result); @@ -406,7 +406,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //客户编号 - HqlPack.getNumEqualPack(basCustomer.getCustNo(), "custNo", result); + HqlPack.getStringEqualPack(basCustomer.getCustNo(), "custNo", result); //客户简称 HqlPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); //客户全称 @@ -987,4 +987,56 @@ public class WmsHqlPack { return result.toString(); } + + /** + * 作业步骤 查询 + * + * @param wmsActionStepCall + * @return + */ + public static String packHqlWmsActionStepCall(WmsActionStepCall wmsActionStepCall) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result); + HqlPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result); + + getStringBuilderPack(wmsActionStepCall, result); + + return result.toString(); + } + + /** + * 作业步骤类型表信息查询 + * + * @param wmsActionStepType + * @return + */ + public static String packHqlWmsActionStepType(WmsActionStepType wmsActionStepType) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result); + + getStringBuilderPack(wmsActionStepType, result); + + return result.toString(); + } + + /** + * 作业步骤信息查询 + * + * @param wmsActionStep + * @return + */ + public static String packHqlWmsActionStep(WmsActionStep wmsActionStep) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringEqualPack(wmsActionStep.getAsNameC(), "asNameC", result); + + getStringBuilderPack(wmsActionStep, result); + + return result.toString(); + } }