diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index da0fd4a..888e1bd 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index d8ec9de..9987e99 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -80,28 +80,34 @@ public abstract class BaseBean implements Serializable { @ApiParam(value = "修改日期") public String modifyDatetime; + @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00") - public transient String createDateTimeStart; + public String createDateTimeStart; + @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") - public transient String createDateTimeEnd; + public String createDateTimeEnd; + @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00") - public transient String modifyDateTimeStart; + public String modifyDateTimeStart; + @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59") - public transient String modifyDateTimeEnd; + public String modifyDateTimeEnd; + @Transient @ApiParam(value = "排序属性") - public transient String orderByParam = ""; + public String orderByParam = ""; + @Transient @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc - public transient int ascOrDesc = 1; + public int ascOrDesc = 1; //排序方式 public String orderBy(){ diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 1e02137..38b454c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -26,9 +26,9 @@ public class CommonEnumUtil { SURFACE(98,"i3surface","对外服务"), CENTER(99,"icloud-server","注册中心"); - public int value; - public String code; - public String description; + private int value; + private String code; + private String description; private SOFT_TYPE(int value, String code, String description) { this.value = value; @@ -120,6 +120,16 @@ public class CommonEnumUtil { } return tmp; } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** 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 010ac3e..00c2f7f 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 @@ -1231,7 +1231,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_INFO_TYPE { - FEED(1, "进料检验"), ONLINE(10, "在线检验"), EMDPRODUCT(30, "成品检验,"), SHIPMENTS(40, "出货检验,"); + FEED(1, "进料检验"), ONLINE(10, "在线检验"), EMDPRODUCT(30, "成品检验"), SHIPMENTS(40, "出货检验"); private int value; private String description; @@ -1267,9 +1267,9 @@ public class WmsEnumUtil { public enum QC_INFO_STATUS { CREATE(1, "新建"), FINISH(5, "待处理"), - FAIL(10, "已完成,"), - CLOSE(90, "已关闭,"), - CANCEL(91, "已取消,"); + FAIL(10, "已完成"), + CLOSE(90, "已关闭"), + CANCEL(91, "已取消"); private int value; private String description; @@ -1769,4 +1769,72 @@ public class WmsEnumUtil { } } + /** + * 成功标志枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RC_OK_VALUE { + + IS_TRUE(10, true, "成功"), + IS_FALSE(20, false, "失败"); + + private int value; + private boolean codeValue; + private String description; + + RC_OK_VALUE(int value, boolean codeValue, String description) { + this.value = value; + this.codeValue = codeValue; + this.description = description; + } + + public int getValue() { + return value; + } + + public boolean getCodeValue() { + return codeValue; + } + + public String getDescription() { + return description; + } + } + + /** + * 通用序号编码枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COMMON_SEQ { + TASK_MV_ORDERNO("TASK_MV_ORDERNO", "作业任务移动单号"), + ROUTING_SEQ("ROUTING_SEQ", "物料路线序号"), + LOCATE_SEQ("LOCATE_SEQ", "库位序号"), + OP_SEQ("OP_SEQ", "作业类型序号"), + TRAN_SEQ("TRAN_SEQ", "交易类型序号"), + STEP_SEQ("STEP_SEQ", "步骤调用序号"), + ORDER_NO("ORDER_NO", "盘点主表序号"); + + private String code; + private String description; + int value; + + COMMON_SEQ(String code, String description) { + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + } diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 3ee81da..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index c369e12..485fdd6 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java new file mode 100644 index 0000000..494586d --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +/** + * @Description : 抽点接收数据model + * @Reference : + * @Author : amy + * @CreateDate : 2018-12-04 10:31 + * @Modify: + **/ +@Data +public class CheckPointModel { + + /** + * 单据类型 + */ + private String orderType; + + /** + *条码类型 + */ + private String snType; + + /** + *条码 + */ + private String sn; + + /** + *订单号 + */ + private String orderNo; + + /** + *工厂代码 + */ + private String organizeCode; + + /** + *实际抽点数量【从前端输入获取】 + */ + private Integer actQty; +} diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index de63812..e310bfd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java index 6ab6e0e..abf2465 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -34,11 +35,11 @@ public class SysDepartment extends BaseBean { @Column(name="NAME") @ApiParam(value ="名称") private String name; - + @Column(name="DEPARTMENT_CODE") @ApiParam(value ="部门代码") private String departmentCode; - + @Column(name="PARENT_NAME_RDD") @ApiParam(value ="父节点名称") private String parentNameRdd; @@ -52,17 +53,18 @@ public class SysDepartment extends BaseBean { @Column(name="ORGANIZATION_NAME_RDD") @ApiParam(value ="所属组织名称" , access ="所属组织名称") private String organizeNameRdd; - + @Column(name="ORGANIZE_ID") @ApiParam(value ="所属组织" , example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long organizeId; - + @Column(name="DEPARTMENT_SORT") @ApiParam(value ="排序" , example ="1" , access ="排序") private Integer departmentSort; + @Transient @ApiParam(value ="子集列表") - private transient List childList; + private List childList; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 0de27ad..ff23075 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 系统资源表，通过resourceType，languageId和resourceKey三者，查询value @@ -31,7 +32,8 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value = "资源类型",example = "1",access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE") private Integer resourceType; - private transient String resourceTypeTxt; + @Transient + private String resourceTypeTxt; public String getResourceTypeTxt(){ if(this.resourceType != null){ diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 55af110..61b930a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -52,7 +53,7 @@ public class SysMenu extends BaseBean { @Column(name="PARENT_NAME_RDD") @ApiParam(value ="父级功能名称" , access ="父级功能名称") private String parentNameRdd; - + @Column(name="MENU_CLASS_PATH") @ApiParam(value ="资源class path" , access ="资源class path") private String menuClassPath; @@ -72,7 +73,7 @@ public class SysMenu extends BaseBean { @Column(name="MENU_CSS") @ApiParam(value ="资源css" , access ="资源css") private String menuCss; - + @Column(name="MENU_ICON") @ApiParam(value ="资源icon" , access ="资源icon") private String menuIcon; @@ -80,12 +81,13 @@ public class SysMenu extends BaseBean { @Column(name="MENU_DESCRIPTION") @ApiParam(value ="资源描述" , access ="配置描述") private String menuDescription; - + @Column(name="MENU_STATUS") @ApiParam(value ="功能状态（1.正常，2.禁用）" , example ="1" , access ="功能状态（1.正常，2.禁用）",defaultValue="1") private Integer menuStatus; + @Transient @ApiParam(value ="子集列表") - private transient List childList; + private List childList; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index 8694646..a76db1f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -13,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 单号规则 @@ -58,19 +61,40 @@ public class SysOrderNoRule extends BaseBean { private Long serialNoLength; @Column(name = "IS_CYCLE") - @ApiParam(value = "达到最大值后是否循环",example = "1") + @ApiParam(value = "达到最大值后是否循环",example = "1",hidden = true) private Integer isCycle; + @Transient + @ApiParam(value = "达到最大值后是否循环",example = "否") + private String isCycleName; + + public String getIsCycleName() { + if(isCycle != null){ + CommonEnumUtil.TRUE_OR_FALSE.valueOf(isCycle); + } + return isCycleName; + } + + public void setIsCycleName(String isCycleName) { + this.isCycleName = isCycleName; + this.isCycle = CommonEnumUtil.TRUE_OR_FALSE.descOf(isCycleName); + } + @Column(name = "SERIAL_NO") - @ApiParam(value = "当前流水号",example = "-1") + @ApiParam(value = "当前流水号",example = "-1",hidden = true) @JsonSerialize(using = ToStringSerializer.class) private Long serialNo; @Column(name = "ORDER_NO") - @ApiParam(value = "当前单号") + @ApiParam(value = "当前单号",hidden = true) private String orderNo; @Column(name = "ORDER_NO_RULE_STATUS") - @ApiParam(value = "单号规则状态") + @ApiParam(value = "单号规则状态",hidden = true) private Integer orderNoRuleStatus; + + @Column(name="ORDER_NO_RULE_DESCRIPTION") + @ApiParam(value ="描述") + private String orderNoRuleDescription; + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java index c6b1131..2851d38 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.text.DecimalFormat; import java.util.List; @@ -35,11 +36,11 @@ public class SysOrganize extends BaseBean { @Column(name="NAME") @ApiParam(value ="名称") private String name; - + @Column(name="ORGANIZE_CODE") @ApiParam(value ="组织代码") private String organizeCode; - + @Column(name="ORGANIZE_TYPE") @ApiParam(value ="组织类型ID（枚举：1.集团，2.公司，3.工厂）" , example ="1") private Integer organizeType; @@ -53,20 +54,21 @@ public class SysOrganize extends BaseBean { @Column(name="PARENT_NAME_RDD") @ApiParam(value ="父节点") private String parentNameRdd; - + @Column(name="ORGANIZE_DESCRIPTION") @ApiParam(value ="组织描述") private String organizeDescription; - + @Column(name="ORGANIZE_SORT") @ApiParam(value ="排序" , example ="1") private Integer organizeSort; - + @Column(name="ORGANIZE_STATUS") @ApiParam(value ="组织状态（枚举：1.正常，2.禁用）" , example ="1") private Integer organizeStatus; + @Transient @ApiParam(value ="子集列表") - private transient List childList; + private List childList; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java index dd5e424..513f3c2 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -34,7 +35,7 @@ public class SysPosition extends BaseBean { @Column(name="NAME") @ApiParam(value ="名称" , access ="名称") private String name; - + @Column(name="POSITION_CODE") @ApiParam(value ="岗位代码" , access ="岗位代码") private String positionCode; @@ -48,12 +49,13 @@ public class SysPosition extends BaseBean { @Column(name="PARENT_NAME_RDD") @ApiParam(value ="上级岗位名称" , access ="上级岗位名称") private String parentNameRdd; - + @Column(name="POSITION_DESCRIPTION") @ApiParam(value ="描述" , access ="描述") private String positionDescription; + @Transient @ApiParam(value ="子部门列表") - private transient List childList; + private List childList; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 4641688..22aa6ae 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -92,9 +93,11 @@ public class SysUser extends BaseBean { @ApiParam(value ="用户类型（枚举，待定）" , example ="-1") private Integer userType; + @Transient @ApiParam(value ="用户所有角色信息") - private transient List roleList; + private List roleList; + @Transient @ApiParam(value ="用户所有权限信息") - private transient List menuList; + private List menuList; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 0da5de7..84781e3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -52,7 +53,7 @@ public class SysUserInfo extends BaseBean { @Column(name="USER_SEX") @ApiParam(value ="性别（1.男，2.女）" , example ="1" , access ="性别（1.男，2.女）") private Integer userSex; - + @Column(name="USER_AGE") @ApiParam(value ="年龄" , example ="1" , access ="年龄") private Integer userAge; @@ -112,31 +113,40 @@ public class SysUserInfo extends BaseBean { @ApiParam(value ="登录次数",example = "0") private Integer userLoginNum; + @Transient @ApiParam(value ="用户所有部门信息") - private transient List departmentList; + private List departmentList; + @Transient @ApiParam("用户的部门ID信息") - private transient List departmentIdList; + private List departmentIdList; + @Transient @ApiParam(value ="用户所有岗位信息") - private transient List positionList; + private List positionList; + @Transient @ApiParam("用户的岗位ID信息") - private transient List positionIdList; + private List positionIdList; + @Transient @ApiParam(value ="用户所有组织信息") - private transient List organizeList; + private List organizeList; + @Transient @ApiParam(value ="用户岗位信息") - private transient SysDepartment department; + private SysDepartment department; + @Transient @ApiParam(value ="用户组织信息") - private transient SysOrganize organize; + private SysOrganize organize; + @Transient @ApiParam(value = "岗位信息",access = "用户主岗位信息") - private transient SysPosition position; + private SysPosition position; + @Transient @JsonIgnore @ApiParam(value ="用户详细信息") - private transient SysUser user; + private SysUser user; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java index 9350790..3833ebd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java @@ -45,6 +45,8 @@ public class CoreBsonPack { bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(),"operateType",bson); bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(),"operateModule",bson); bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(),"createDatetime",bson,false,false); + bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(),"remoteIp",bson); + bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(),"operateMessage",bson); bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(),"createUser",bson); return bson; diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index ba27b81..7409467 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index c841866..179e772 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 作业流程明细 @@ -64,7 +65,8 @@ public class WmsActionGroupDetails extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long asId; + @Transient @ApiParam(value = "作业步骤名称") - private transient String asName; + private String asName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java index 905459f..0797271 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 作业记录表 @@ -49,8 +50,9 @@ public class WmsActionLog extends BaseBean { @ApiParam(value = "交易类型编号") public String transTypeCode; + @Transient @ApiParam(value = "交易类型名称") - public transient String transTypeName; + public String transTypeName; @Column(name="AG_ID") @ApiParam(value = "作业流程编号", example = "1") @@ -83,28 +85,34 @@ public class WmsActionLog extends BaseBean { public String orderNo; @Column(name="START_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "开始作业时间") public String startTime; @Column(name="END_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "结束作业时间") public String endTime; + @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="开始作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00") - public transient String startTimeStart; + public String startTimeStart; + @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="开始作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59") - public transient String startTimeEnd; + public String startTimeEnd; + @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="结束作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00") - public transient String endTimeStart; + public String endTimeStart; + @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="结束作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59") - public transient String endTimeEnd; + public String endTimeEnd; // 状态:1=创建,10=处理中,20=已完成 @Column(name="ACTION_STATUS") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java index 11ad078..23941de 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :作业记录明细表 @@ -44,8 +45,9 @@ public class WmsActionLogDetails extends BaseBean { } } + @Transient @ApiParam(value = "流程名称") - public transient String agNameC; + public String agNameC; @Column(name="SEQ") @ApiParam(value = "序号", example = "1") 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 index a59768a..5586f68 100644 --- 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 @@ -40,10 +40,6 @@ public class WmsActionModule extends BaseBean { @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/WmsActionStepCall.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java index 2ab3567..74eb9a6 100644 --- 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 @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 作业步骤调用 @@ -45,13 +46,19 @@ public class WmsActionStepCall extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) public Long amId; + @Transient @ApiParam(value = "组件名称") - public transient String amName; + public String amName; + @Transient @ApiParam(value = "组件描述") - public transient String amDesc; + public String amDesc; @Column(name="AM_TYPE") @ApiParam(value = "组件类型", example = "0") public Integer amType; + + @Column(name="OK_VALUE") + @ApiParam(value = "成功标志", example = "10") + public Integer okValue; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java index a467907..ffe7a9e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :作业步骤调用参数表 @@ -53,7 +54,8 @@ public class WmsActionStepCallParam extends BaseBean { @ApiParam(value = "参数值") private String paramValue; + @Transient @ApiParam(value = "组件名称") - private transient String amName; + private String amName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java index bc3db4a..0d74dea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.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 :责任区域分配信息 @@ -60,15 +61,19 @@ public class WmsAreaOwner extends BaseBean { @ApiParam(value = "是否预分配人员") private Integer isPreAssign; + @Transient @ApiParam(value = "供应商名称") - private transient String vendorName; + private String vendorName; + @Transient @ApiParam(value = "仓库名称") - private transient String whName; + private String whName; + @Transient @ApiParam(value = "存储区名称") - private transient String zoneName; + private String zoneName; + @Transient @ApiParam(value = "库位名称") - private transient String locateName; + private String locateName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java index cc86295..a27823a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.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 : 抽点记录信息 @@ -64,6 +65,7 @@ public class WmsCheckFactRecord extends BaseBean { @ApiParam(value = "抽点数量", example = "0") public Double checkQty; + @Transient @ApiParam(value ="供应商全称") - private transient String vendorDesc; + private String vendorDesc; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java index d6aad6f..4ec45d7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 抽点比例表 @@ -60,20 +61,24 @@ public class WmsIbCheckPlan extends BaseBean{ @ApiParam(value ="已抽点件数", example = "-1") private Integer checkCounter; + @Transient @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value="开始日期，查询开始日期") - public transient String startDateStart; + public String startDateStart; + @Transient @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value="开始日期，查询开始日期") - public transient String startDateEnd; + public String startDateEnd; + @Transient @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value="结束日期，查询结束日期") - public transient String endDateStart; + public String endDateStart; + @Transient @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "结束日期，查询结束日期") - public transient String endDateEnd; + public String endDateEnd; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index cea4ff6..6e95f51 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -51,4 +51,8 @@ public class WmsMoveMaster extends BaseBean { @Column(name="REMARK") @ApiParam("备注") public String reMark; + + @Column(name = "TRANS_TYPE_CODE") + @ApiParam(value = "交易类型代码") + private String transTypeCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java index 7c84477..f8612cd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsObject.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; import java.util.List; /** @@ -81,10 +82,12 @@ public class WmsObject extends BaseBean { @ApiParam("自定义业务拦截") private String bizIntercept; + @Transient @ApiParam("元数据字段列表") - private transient List fiedList; + private List fiedList; + @Transient @ApiParam("自定义按钮列表") - private transient List btnList; + private List btnList; } 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 80481ee..71c2745 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 @@ -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 : PO订单主表 @@ -70,6 +71,7 @@ public class WmsPOMaster extends BaseBean { /** * 供应商名称 */ + @Transient @ApiParam("供应商名称") - private transient String vendorName; + private String vendorName; } 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 b986ff5..c930713 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 @@ -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 : 质检单主表信息 @@ -75,9 +76,11 @@ public class WmsQCMaster extends BaseBean { @ApiParam("入库单号") public String ibNo; + @Transient @ApiParam(value ="客户简称") - private transient String custName; + private String custName; + @Transient @ApiParam(value = "供应商简称") - private transient String VendorDesc; + private String VendorDesc; } 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 18f57bc..9d9c2a2 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 @@ -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 : 产品发运信息 @@ -75,9 +76,11 @@ public class WmsShopping extends BaseBean { @ApiParam("特殊发货标志") public String shippingFlag; + @Transient @ApiParam(value ="客户简称") - private transient String custName; + private String custName; + @Transient @ApiParam(value = "发往地简称") - private transient String flagName; + private String flagName; } 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 764561c..38a3dbb 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 @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="WMS_TASK") -@Api("ASN主表信息") +@Api("作业任务表") public class WmsTaskInfo extends BaseBean { @Column(name="MOVE_NO") @@ -48,6 +48,10 @@ public class WmsTaskInfo extends BaseBean { * 状态:1=创建,10=待处理,20=已处理 */ @Column(name="TASK_STATUS") - @ApiParam(value = "状态", example = "1") + @ApiParam(value = "任务状态", example = "1") public Integer taskStatus; + + @Column(name="TRANS_TYPE_CODE") + @ApiParam("交易类型") + private String transTypeCode; } 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 a0cffe4..421e07e 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 @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 库存交易记录表 @@ -80,12 +81,14 @@ public class WmsTrans extends BaseBean{ @ApiParam(value ="库位代码") private String locCode; + @Transient @ApiParam(value ="目标库位id",example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private transient Long targetLocId; + private Long targetLocId; + @Transient @ApiParam(value ="目标库位代码") - private transient String targetLocCode; + private String targetLocCode; @Column(name="GROUP_ID") @ApiParam(value ="分组id",example = "-1") 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 f369735..6fd02b2 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 @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 仓库交易归档表 @@ -85,8 +86,9 @@ public class WmsTransRcd extends BaseBean{ @JsonSerialize(using = ToStringSerializer.class) private Long groupId; + @Transient @ApiParam(value ="库存数", example = "0") - private transient Double qit; + private Double qit; public Long getLocId() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index 246524b..a9dde28 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 交易类型表 @@ -42,9 +43,13 @@ public class WmsTransType extends BaseBean { @ApiParam(value = "序号", example = "-1") private Integer seq; - @Column(name = "PROG_CODE") - @ApiParam(value = "处理程序", example = "-1") + @Column(name = "AG_ID") + @ApiParam(value = "作业流程", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long agId; + @Transient + @ApiParam("中文流程名称") + private String agNameC; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java index fea096d..e8aca84 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; /** * @Description : 库存移动单明细信息 @@ -11,4 +13,15 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; * @Modify: **/ public interface WmsMoveDetailsRepository extends BaseRepository { + + /** + * 获取item最大值 + * @param organizeCode + * @param isValid + * @param isDeleted + * @return + */ + @Query("select max(item) from WmsMoveDetails where organizeCode = :organizeCode and isValid = :isValid and isDeleted = :isDeleted") + int getMaxItem(@Param("organizeCode")String organizeCode, @Param("isValid")int isValid, @Param("isDeleted")int isDeleted); + } 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 700ffe5..02b81b0 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,13 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //仓库代码 - HqlPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result); + HqlPack.getStringLikerPack(wmsZones.getWhNo(), "whNo", result); //库存地代码 - HqlPack.getStringEqualPack(wmsZones.getAreaNo(), "areaNo", result); + HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); //存储区代码 - HqlPack.getStringEqualPack(wmsZones.getZoneNo(), "zoneNo", result); + HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); + //存储区名称 + HqlPack.getStringLikerPack(wmsZones.getZoneName(),"zoneName", result); getStringBuilderPack(wmsZones, result); @@ -696,10 +698,13 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); // 订单号 - HqlPack.getStringEqualPack(wmsTempOrderLock.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result); // 业务类型 HqlPack.getStringEqualPack(wmsTempOrderLock.getBizType(), "bizType", result); + // 物料代码 + HqlPack.getStringEqualPack(wmsTempOrderLock.getPartNo(), "partNo", result); + getStringBuilderPack(wmsTempOrderLock, result); return result.toString(); @@ -1158,6 +1163,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(),"agNameC",result); // 单据编号 HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(),"orderNo",result); + getStringBuilderPack(wmsActionLog, result); return result.toString(); @@ -1180,6 +1186,8 @@ public class WmsHqlPack { getStringBuilderPack(wmsActionLogDetails, result); + HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); + return result.toString(); } } diff --git a/pom.xml b/pom.xml index bcf0ef5..ead6373 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base