diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java deleted file mode 100644 index cb8c0b6..0000000 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.estsh.i3plus.pojo.andon.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 : ANDON_动作 - * @Reference : - * @Author : hansen.ke - * @CreateDate : 2019-05-13 9:47 - * @Modify: - **/ -@Data -@Entity -@Table(name="ANDON_ACTION") -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Api("ANDON_动作") -public class AndonAction extends BaseBean { - - @Column(name = "ACTION_CODE") - @ApiParam(value = "动作代码") - private String actionCode; - - @Column(name = "ACTION_NAME") - @ApiParam(value = "动作名称") - private String actionName; -} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java index 5299981..b7cb9c1 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java @@ -28,19 +28,21 @@ import javax.persistence.Table; @Api("ANDON_呼叫原因") public class AndonAlarmCause extends BaseBean { + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + @Column(name = "AC_CODE") @ApiParam(value = "呼叫原因代码") private String acCode; + @Column(name = "PARENT_AC_CODE") + @ApiParam(value = "父阶原因代码") + private String parentAcCode; + @Column(name = "AC_NAME") @ApiParam(value = "呼叫原因描述") private String acName; - @Column(name = "PARENT_AC_CODE") - @ApiParam(value = "父阶原因代码") - private String parentAcCode; - @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型") - private String alarmCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java deleted file mode 100644 index 821efb7..0000000 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.estsh.i3plus.pojo.andon.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 : 2019-05-10 17:16 - * @Modify: - **/ -@Data -@Entity -@Table(name="ANDON_ALARM_TYPE") -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Api("安灯类型") -public class AndonAlarmType extends BaseBean { - - @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型代码") - private String alarmCode; - - @Column(name = "ALARM_NAME") - @ApiParam(value = "安灯类型名称") - private String alarmName; -} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonImportance.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonImportance.java deleted file mode 100644 index e7d4dc7..0000000 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonImportance.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.estsh.i3plus.pojo.andon.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 : ANDON_重要度 - * @Reference : - * @Author : siliter.yuan - * @CreateDate : 2019-05-31 9:47 - * @Modify: - **/ -@Data -@Entity -@Table(name="ANDON_IMPORTANCE") -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Api("ANDON_事件现象") -public class AndonImportance extends BaseBean { - - @Column(name = "IMPORTANCE_CODE") - @ApiParam(value = "重要等级代码") - private String importanceCode; - - @Column(name = "IMPORTANCE_NAME") - @ApiParam(value = "重要等级名称") - private String importanceName; -} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index 35c7054..cfd9634 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -274,6 +274,10 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "安灯子类型代码") private String alarmDetailCode; + @Column(name = "ALARM_DETAIL_NAME_RDD") + @ApiParam(value = "安灯子类型名称") + private String alarmDetailNameRdd; + @Column(name = "EPM_CODE") @ApiParam(value = "事件现象代码") private String epmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java deleted file mode 100644 index e3e23ba..0000000 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.estsh.i3plus.pojo.andon.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 : 2019-05-10 17:16 - * @Modify: - **/ -@Data -@Entity -@Table(name="ANDON_RESPONSE") -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Api("安灯通知方式") -public class AndonResponse extends BaseBean { - - @Column(name = "RESPONSE_CODE") - @ApiParam(value = "通知方式代码") - private String responseCode; - - @Column(name = "RESPONSE_NAME") - @ApiParam(value = "通知方式名称") - private String responseName; -} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java deleted file mode 100644 index a5ee2db..0000000 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.estsh.i3plus.pojo.andon.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 : 2019-05-10 17:16 - * @Modify: - **/ -@Data -@Entity -@Table(name="ANDON_STATUS") -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Api("安灯状态") -public class AndonStatus extends BaseBean { - - @Column(name = "STATUS_CODE") - @ApiParam(value = "状态代码") - private String statusCode; - - @Column(name = "STATUS_NAME") - @ApiParam(value = "状态名称") - private String statusName; -} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java deleted file mode 100644 index 008a3ca..0000000 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.andon.repository; - -import cn.estsh.i3plus.pojo.andon.bean.AndonAction; -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import org.springframework.stereotype.Repository; - -/** - * @Description : 对象持久层仓用方法控制（ANDON_动作） - * @Reference : - * @Author : hansen.ke - * @CreateDate : 2019-05-13 11:05 - * @Modify: - **/ -@Repository -public interface IAndonActionRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java deleted file mode 100644 index 31afb4f..0000000 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.andon.repository; - -import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType; -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import org.springframework.stereotype.Repository; - -/** - * @Description :对象持久层仓用方法控制(安灯类型信息) - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2019-05-10 17:27 - * @Modify: - **/ -@Repository -public interface IAndonAlarmTypeRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonImportanceRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonImportanceRepository.java deleted file mode 100644 index e598260..0000000 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonImportanceRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.andon.repository; - -import cn.estsh.i3plus.pojo.andon.bean.AndonImportance; -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import org.springframework.stereotype.Repository; - -/** - * @Description : 对象持久层仓用方法控制（ANDON_重要度） - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2019-05-31 11:05 - * @Modify: - **/ -@Repository -public interface IAndonImportanceRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java deleted file mode 100644 index 3c2dc3d..0000000 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.andon.repository; - -import cn.estsh.i3plus.pojo.andon.bean.AndonResponse; -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import org.springframework.stereotype.Repository; - -/** - * @Description :对象持久层仓用方法控制(安灯通知方式信息) - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2019-05-10 17:27 - * @Modify: - **/ -@Repository -public interface IAndonResponseRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java deleted file mode 100644 index e33d81f..0000000 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.estsh.i3plus.pojo.andon.repository; - -import cn.estsh.i3plus.pojo.andon.bean.AndonStatus; -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import org.springframework.stereotype.Repository; - -/** - * @Description :对象持久层仓用方法控制(安灯状态信息) - * @Reference : - * @Author : silliter.yuan - * @CreateDate : 2019-05-10 17:27 - * @Modify: - **/ -@Repository -public interface IAndonStatusRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 05c9462..4ec6675 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -127,8 +127,8 @@ public class AndonHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcCode(),"acCode", result); - DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result); - DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); +// DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result); +// DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); getStringBuilderPack(andonAlarmCause, result); return result; @@ -394,65 +394,99 @@ public class AndonHqlPack { public static DdlPackBean packAndonAlarmDetailType(AndonAlarmDetailType andonAlarmDetailType) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result); +// DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result); getStringBuilderPack(andonAlarmDetailType, result); return result; } +// +// /** +// * 安灯类型查询条件封装 +// * @param andonAlarmType +// * @return +// */ +// public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) { +// DdlPackBean result = new DdlPackBean(); +// +// getStringBuilderPack(andonAlarmType, result); +// +// return result; +// } /** - * 安灯类型查询条件封装 - * @param andonAlarmType + * ANDON通知对象查询条件封装 + * @param andonResponseObject * @return */ - public static DdlPackBean packAndonAlarmType(AndonAlarmType andonAlarmType) { + public static DdlPackBean packAndonResponseObject(AndonResponseObject andonResponseObject){ DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectCode(), "rpObjectCode", result); + DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectName(), "rpObjectName", result); + DdlPreparedPack.getStringLikerPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result); - getStringBuilderPack(andonAlarmType, result); + getStringBuilderPack(andonResponseObject, result); return result; } /** - * 安灯状态查询条件封装 - * @param andonStatus + * ANDON_事件原因 + * @param andonEventCause * @return */ - public static DdlPackBean packAndonStatus(AndonStatus andonStatus) { + public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) { DdlPackBean result = new DdlPackBean(); - - getStringBuilderPack(andonStatus, result); + getStringBuilderPack(andonEventCause, result); return result; } /** - * ANDON通知方式查询条件封装 - * @param andonResponse + * ANDON_停机类型 + * @param haltType * @return */ - public static DdlPackBean packAndonResponse(AndonResponse andonResponse){ + public static DdlPackBean packAndonHaltType(AndonHaltType haltType) { DdlPackBean result = new DdlPackBean(); + getStringBuilderPack(haltType, result); - getStringBuilderPack(andonResponse, result); + return result; + } + + /** + * ANDON_事件现象 + * @param eventPhenoMenon + * @return + */ + public static DdlPackBean packAndonEventPhenoMenon(AndonEventPhenoMenon eventPhenoMenon) { + DdlPackBean result = new DdlPackBean(); + getStringBuilderPack(eventPhenoMenon, result); return result; } /** - * ANDON通知对象查询条件封装 - * @param andonResponseObject + * ANDON_ 事件处理方法 + * @param eventPhenoMenon * @return */ - public static DdlPackBean packAndonResponseObject(AndonResponseObject andonResponseObject){ + public static DdlPackBean packAndonEventMethod(AndonEventMethod eventPhenoMenon) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectCode(), "rpObjectCode", result); - DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectName(), "rpObjectName", result); - DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result); + getStringBuilderPack(eventPhenoMenon, result); - getStringBuilderPack(andonResponseObject, result); + return result; + } + + /** + * ANDON_ 安灯PLC控制 + * @param plc + * @return + */ + public static DdlPackBean packAndonPLC(AndonPLC plc) { + DdlPackBean result = new DdlPackBean(); + getStringBuilderPack(plc, result); return result; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 389a797..8f94ef7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -90,15 +90,14 @@ public class AndonEnumUtil { * 10-是，20-否 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum IS_ALARM_STATUS{ - + public enum ALARM_STATUS { YES(10,"需要按灯"), ON(20,"不需要按灯"); private int value; private String description; - IS_ALARM_STATUS(int value, String description) { + ALARM_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -128,7 +127,6 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_BUSI_FLAG{ - ALARM_FLAG("10","安灯呼叫标识"), USER_CODE("20","用户工号"), READ_FLAG("30", "安灯读取状态"), @@ -158,8 +156,7 @@ public class AndonEnumUtil { * 1-呼叫，2-签到，3-解决 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ALARM_FLAG{ - + public enum ANDON_ACTION_TAG { CALL(1,"10","呼叫"), SIGN(2,"20","响应"), RESOLVE(3,"30","解决"), @@ -171,7 +168,7 @@ public class AndonEnumUtil { private String code; private String description; - ALARM_FLAG(int value,String code, String description) { + ANDON_ACTION_TAG(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -198,37 +195,7 @@ public class AndonEnumUtil { } } - /** - * 按灯动作标志 - * 10 = 呼叫，20 = 签到，30 = 解决，40 = 撤销，50 = 提交，60 = 审批，70 = 转呼 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ANDON_ACTION_FLAG{ - - CALL_ACTION("10","呼叫动作"), - SIGN_ACTION("20","签到动作"), - RESOLVE_ACTION("30", "解决动作"), - CANCEL_ACTION("40", "撤销动作"), - COMMIT_ACTION("50","提交动作"), - PASS_ACTION("60","审批动作"), - SHIFG_CALL_ACTION("70", "转呼动作"); - private String value; - private String description; - - ANDON_ACTION_FLAG(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - } /** * 优先级别 @@ -236,7 +203,6 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_PRIORITY{ - FIRST(10,"一级"), SECOND(20,"二级"), THIRD(30,"三级"); @@ -268,52 +234,14 @@ public class AndonEnumUtil { } } - /** - * 通知级别 - * 10 - 一级，20 - 二级，30 - 三级，40 - 四级 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum NOTICE_LEVEL{ - - FIRST(10,"一级"), - SECOND(20,"二级"), - THIRD(30,"三级"), - FOUTH(40,"四级"); - - private int value; - private String description; - - NOTICE_LEVEL(int value, String description) { - this.value = value; - this.description = description; - } - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } /** * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ALARM_CODE{ - + public enum ALARM_TYPE { PART("PART_ALARM","物料"), QUALITY("QUALITY_ALARM","质量"), EQUIP("EQUMENT_ALARM","设备"), @@ -323,7 +251,7 @@ public class AndonEnumUtil { private String value; private String description; - ALARM_CODE(String value, String description) { + ALARM_TYPE(String value, String description) { this.value = value; this.description = description; } @@ -352,7 +280,6 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PROD_ORG_LEVEL{ - LEVEL_ONE(1,"一级目录"), LEVEL_TWO(2,"二级目录"), LEVEL_THREE(3,"三级目录"), @@ -391,7 +318,6 @@ public class AndonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOP_LINE_FLAG{ - STOP("1","停止产线"), RESTART("0","启动产线"); @@ -417,15 +343,124 @@ public class AndonEnumUtil { * 10-短信，20-邮箱 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum NOTICE_WAYS{ - + public enum NOTICE_MESSAGE_SEND_TYPE { SMS("10","短信"), EMAIL("20","邮箱"); private String value; private String description; - NOTICE_WAYS(String value, String description) { + NOTICE_MESSAGE_SEND_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 通知级别 + * 10 - 一级，20 - 二级，30 - 三级，40 - 四级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum NOTICE_MESSAGE_SEND_LEVEL { + FIRST(10,"一级"), + SECOND(20,"二级"), + THIRD(30,"三级"), + FOUTH(40,"四级"); + + private int value; + private String description; + + NOTICE_MESSAGE_SEND_LEVEL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 安灯动作 + * + *
10 = 呼叫 + *
20 = 签到 + *
30 = 解决 + *
40 = 撤销 + *
50 = 提交 + *
60 = 审批 + *
70 = 转呼 + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_ACTION_FLAG{ + CALL_ACTION("10","呼叫动作"), + SIGN_ACTION("20","签到动作"), + RESOLVE_ACTION("30", "解决动作"), + CANCEL_ACTION("40", "撤销动作"), + COMMIT_ACTION("50","提交动作"), + PASS_ACTION("60","审批动作"), + SHIFG_CALL_ACTION("70", "转呼动作"); + + private String value; + private String description; + + ANDON_ACTION_FLAG(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 安灯重要等级 + * + *
10 = 一级 + *
20 = 二级 + *
30 = 三级 + *
40 = 四级 + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_IMPORTANCE_LEVEL{ + FIRST_LEVEL("10","一级"), + SECOND_LEVEL("20","二级"), + THIRD_LEVEL("30","三级"), + FORTH_LEVEL("40","四级"); + + private String value; + private String description; + + ANDON_IMPORTANCE_LEVEL(String value,String description) { this.value = value; this.description = description; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java new file mode 100644 index 0000000..f0fb196 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java @@ -0,0 +1,302 @@ +package cn.estsh.i3plus.pojo.base.util; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-06-13 20:35 + * @Modify: + **/ +public interface BaseRedis { + + /** + * 指定缓存失效时间 + * @param key 键 + * @param seconds 时间(秒) + * @return + */ + boolean expire(String key,long seconds); + + /** + * 根据key 获取过期时间 + * @param key 键 不能为null + * @return 时间(秒) 返回0代表为永久有效 + */ + long getExpire(String key); + + /** + * 判断key是否存在 + * @param key 键 + * @return true 存在 false不存在 + */ + boolean hasKey(String key); + + /** + * 删除缓存 + * @param key 可以传一个值 或多个 + */ + void deleteKey(String ... key); + + //============================String============================= + /** + * 普通缓存获取 + * @param key 键 + * @return 值 + */ + Object getObject(Object key); + + /** + * 普通缓存放入 + * @param key 键 + * @param value 值 + * @return true成功 false失败 + */ + boolean putObject(String key,Object value); + + /** + * 普通缓存放入并设置时间 + * @param key 键 + * @param value 值 + * @param time 时间(秒) time要大于0 如果time小于等于0 将设置无限期 + * @return true成功 false 失败 + */ + boolean putObject(String key,Object value,long time); + + /** + * 递增 + * @param key 键 + * @param delta 要增加几(大于0) + * @return + */ + long incr(String key, long delta); + + /** + * 递减 + * @param key 键 + * @param delta 要减少几(小于0) + * @return + */ + long decr(String key, long delta); + + //================================Map================================= + /** + * HashGet + * @param key 键 不能为null + * @param item 项 不能为null + * @return 值 + */ + Object getHash(String key,String item); + + /** + * 获取hashKey对应的所有键值 + * @param key 键 + * @return 对应的多个键值 + */ + Map getHashMap(String key); + + /** + * HashSet + * @param key 键 + * @param map 对应多个键值 + * @return true 成功 false 失败 + */ + boolean putHashMap(String key, Map map); + + /** + * HashSet 并设置时间 + * @param key 键 + * @param map 对应多个键值 + * @param time 时间(秒) + * @return true成功 false失败 + */ + boolean putHashMap(String key, Map map, long time); + + /** + * 向一张hash表中放入数据,如果不存在将创建 + * @param key 键 + * @param item 项 + * @param value 值 + * @return true 成功 false失败 + */ + boolean putHash(String key,String item,Object value) ; + + /** + * 向一张hash表中放入数据,如果不存在将创建 + * @param key 键 + * @param item 项 + * @param value 值 + * @param time 时间(秒) 注意:如果已存在的hash表有时间,这里将会替换原有的时间 + * @return true 成功 false失败 + */ + boolean putHash(String key,String item,Object value,long time) ; + + /** + * 删除hash表中的值 + * @param key 键 不能为null + * @param item 项 可以使多个 不能为null + */ + void deleteHash(String key, Object... item); + + /** + * 判断hash表中是否有该项的值 + * @param key 键 不能为null + * @param item 项 不能为null + * @return true 存在 false不存在 + */ + boolean checkKey(String key, String item); + + /** + * hash递增 如果不存在,就会创建一个 并把新增后的值返回 + * @param key 键 + * @param item 项 + * @param by 要增加几(大于0) + * @return + */ + double hincr(String key, String item,double by); + + /** + * hash递减 + * @param key 键 + * @param item 项 + * @param by 要减少记(小于0) + * @return + */ + double hdecr(String key, String item,double by); + + //============================set============================= + /** + * 根据key获取Set中的所有值 + * @param key 键 + * @return + */ + Set getSet(String key); + + /** + * 根据value从一个set中查询,是否存在 + * @param key 键 + * @param value 值 + * @return true 存在 false不存在 + */ + boolean hasKeySet(String key,Object value); + + /** + * 将数据放入set缓存 + * @param key 键 + * @param values 值 可以是多个 + * @return 成功个数 + */ + void putSet(String key, Object...values); + + /** + * 将set数据放入缓存 + * @param key 键 + * @param time 时间(秒) + * @param values 值 可以是多个 + * @return 成功个数 + */ + void putSetAndTime(String key,long time,Object...values); + + /** + * 获取set缓存的长度 + * @param key 键 + * @return + */ + long getSetSize(String key); + + /** + * 移除值为value的 + * @param key 键 + * @param values 值 可以是多个 + * @return 移除的个数 + */ + void removeSet(String key, Object ...values); + //===============================list================================= + + /** + * 根据表达式查询所有key + * @param keyPattern + * @return + */ + Set getKeysSet(String keyPattern); + + /** + * 获取list缓存的内容 + * @param key 键 + * @param start 开始 + * @param end 结束 0 到 -1代表所有值 + * @return + */ + List getList(String key, long start, long end); + + /** + * 获取list缓存的长度 + * @param key 键 + * @return + */ + long getListSize(String key); + + /** + * 通过索引 获取list中的值 + * @param key 键 + * @param index 索引 index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推 + * @return + */ + Object getIndex(String key,long index); + + /** + * 将list放入缓存 + * @param key 键 + * @param value 值 + * @return + */ + boolean putList(String key, Object value); + + /** + * 将list放入缓存 + * @param key 键 + * @param value 值 + * @param time 时间(秒) + * @return + */ + boolean putList(String key, Object value, long time); + + /** + * 将list放入缓存 + * @param key 键 + * @param value 值 + * @return + */ + boolean putList(String key, List value) ; + + /** + * 将list放入缓存 + * @param key 键 + * @param value 值 + * @param time 时间(秒) + * @return + */ + boolean putList(String key, List value, long time); + + /** + * 根据索引修改list中的某条数据 + * @param key 键 + * @param index 索引 + * @param value 值 + * @return + */ + boolean updateIndexList(String key, long index,Object value); + + /** + * 移除N个值为value + * @param key 键 + * @param count 移除多少个 + * @param value 值 + * @return 移除的个数 + */ + void removeList(String key,long count,Object value); + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java index f99297c..dd19abb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java @@ -104,6 +104,10 @@ public class WmsActionLogDetails extends BaseBean { @ApiParam(value = "回显组件方法ID", example = "1") private Long showAmId; + @Column(name = "AGD_ID") + @ApiParam(value = "作业流程明细ID", example = "1") + private Long agdId; + public Long getAsId() { if (asId != null) { return asId.longValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java new file mode 100644 index 0000000..e02ee39 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapAsn.java @@ -0,0 +1,81 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : ASN + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-17 10:50 + * @Modify: + **/ +@Data +@Api(value = "ASN计划", description = "ASN计划") +public class SapAsn extends SapBase { + + @ApiParam(value = "ASN号") + @AnnoOutputColumn + private String zasnno; + + @ApiParam(value = "供应商代码") + @AnnoOutputColumn + private String lifnr; + + @ApiParam(value = "ASN item") + @AnnoOutputColumn + private Double zrnum; + + @ApiParam(value = "物料编码") + @AnnoOutputColumn + private String matnr; + + @ApiParam(value = "数量") + @AnnoOutputColumn + private Double zcnNum; + + @ApiParam(value = "计量单位") + @AnnoOutputColumn + private String unit; + + @ApiParam(value = "特殊采购标识") + @AnnoOutputColumn + private String pstyp; + + @ApiParam(value = "计划交货日期") + @AnnoOutputColumn + private String zdate; + + @ApiParam(value = "计划交货时间") + @AnnoOutputColumn + private String zcjsj; + + @ApiParam(value = "工厂代码") + @AnnoOutputColumn + private String werks; + + @ApiParam(value = "收货库存地点") + @AnnoOutputColumn + private String lgort; + + @ApiParam(value = "凭证标识") + @AnnoOutputColumn + private String zdoc; + + @ApiParam(value = "状态", example = "U") + @AnnoOutputColumn + private String zstasI; + + @ApiParam(value = "条码信息") + @AnnoOutputColumn + private String ztxm; + + @ApiParam(value = "道口") + @AnnoOutputColumn + private String zdk; + + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java new file mode 100644 index 0000000..1a9ecfe --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.UUID; + +/** + * @Description : sap接口基础公共字段 + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-17 16:21 + * @Modify: + **/ +@Data +public class SapBase { + + @ApiParam(value = "处理人", example = "-1") + private String actusr = "导入"; + + @ApiParam(value = "SID", example = "-1") + private String sid = UUID.randomUUID().toString() + UUID.randomUUID().toString(); + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiParam(value = "接收数据日期", example = "-1") + private String recymd; + + @JsonFormat(pattern = "HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "接收数据时间", example = "-1") + private String rechms; + + @ApiParam(value = "同步标志", example = "-1") + private String synflg = "Y"; + + @ApiParam(value = "同步日期", example = "-1") + private String synymd; + + @ApiParam(value = "同步时间", example = "-1") + private String synhms; + + @ApiParam(value = "处理标志", example = "-1") + private String actflg = "Y"; + + @ApiParam(value = "处理日期", example = "-1") + private String actymd; + + @ApiParam(value = "处理时间", example = "-1") + private String acthms; + + @ApiParam(value = "状态标志", example = "-1") + private String staflg; + + @ApiParam(value = "顺序号", example = "-1") + private Integer seq; + + @ApiParam(value = "GUID", example = "-1") + private String guid; + + public String getSynymdTime() { + SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-DD"); + return format.format(new Date()); + } + + public String getSynhmsTime() { + SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss"); + return format.format(new Date()); + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java new file mode 100644 index 0000000..d213172 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDspo.java @@ -0,0 +1,149 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import java.util.UUID; + +/** + * @Description : + * @Reference : + * @Author : amy + * @CreateDate : 2019-06-13 13:42 + * @Modify: + **/ +@Data +@Api(value="要货计划",description = "要货计划") +public class SapDspo { + + @ApiParam(value = "SA编号（或PO号）",example = "1") + @AnnoOutputColumn + private String ebeln; + + @ApiParam(value = "版本",example = "-1") + @AnnoOutputColumn + private String revno; + + @ApiParam(value = "SAitem或PO item",example = "-1") + @AnnoOutputColumn + private Integer evrtp; + + @ApiParam(value = "供应商代码",example = "-1") + @AnnoOutputColumn + private String lifnr; + + @ApiParam(value = "物料编码",example = "-1") + @AnnoOutputColumn + private String matnr; + + @ApiParam(value = "计量单位",example = "-1") + @AnnoOutputColumn + private String unit; + + @ApiParam(value = "数量",example = "-1") + @AnnoOutputColumn + private Double zdevNum; + + @ApiParam(value = "特殊采购标识",example = "-1") + @AnnoOutputColumn + private String pstyp; + + @ApiParam(value = "计划交货日期",example = "-1") + @AnnoOutputColumn + private String zdate; + + @ApiParam(value = "计划交货时间",example = "-1") + @AnnoOutputColumn + private String zcjsj; + + @ApiParam(value = "工厂代码",example = "-1") + @AnnoOutputColumn + private String werks; + + @ApiParam(value = "收货库存地点",example = "-1") + @AnnoOutputColumn + private String lgort; + + @ApiParam(value = "凭证标识",example = "-1") + @AnnoOutputColumn + private String zpzps; + + @ApiParam(value = "状态",example = "-1") + @AnnoOutputColumn + private String zstas; + + @ApiParam(value = "状态",example = "-1") + @AnnoOutputColumn + private String loekz; + + @ApiParam(value = "最小包装数量",example = "-1") + @AnnoOutputColumn + private Double bstrf; + + @ApiParam(value = "条码已打印的数量",example = "-1") + @AnnoOutputColumn + private Double prnnum; + + //公共字段 ++++++++++++++++++++++++++++++++++++++++++ + @ApiParam(value = "处理人",example = "-1") + @AnnoOutputColumn + private String actusr = "导入"; + + @ApiParam(value = "SID",example = "-1") + @AnnoOutputColumn + private String sid = UUID.randomUUID().toString()+UUID.randomUUID().toString(); + + /*@ApiParam(value = "接收数据日期",example = "-1") + @AnnoOutputColumn + private String recymd; + + @ApiParam(value = "接收数据时间",example = "-1") + @AnnoOutputColumn + private String rechms; + + @ApiParam(value = "同步标志",example = "-1") + @AnnoOutputColumn + private String synflg;*/ + + @ApiParam(value = "同步日期",example = "-1") + @AnnoOutputColumn + private String synymd; + + @ApiParam(value = "同步时间",example = "-1") + @AnnoOutputColumn + private String synhms; + + /*@ApiParam(value = "处理标志",example = "-1") + @AnnoOutputColumn + private String actflg;*/ + + @ApiParam(value = "处理日期",example = "-1") + @AnnoOutputColumn + private String actymd; + + @ApiParam(value = "处理时间",example = "-1") + @AnnoOutputColumn + private String acthms; + + @ApiParam(value = "状态标志",example = "-1") + @AnnoOutputColumn + private String staflg; + + @ApiParam(value = "顺序号",example = "-1") + @AnnoOutputColumn + private Integer seq; + + @ApiParam(value = "GUID",example = "-1") + @AnnoOutputColumn + private String guid; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 791465e..b1ff4f5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -85,4 +85,20 @@ public class WmsASNMaster extends BaseBean { @Transient @ApiParam(value = "发货日期") private String sendDate; + + @Transient + @ApiParam(value = "工厂名称") + public String organizeName; + + @Transient + @ApiParam("联系人") + private String vendorOwner; + + @Transient + @ApiParam("邮箱") + private String vendorEmail; + + @Transient + @ApiParam("供应商名称") + private String vendorName; } 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 de27d02..913e031 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 @@ -122,5 +122,21 @@ public class WmsASNMasterDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public int lockVersion; + public transient int lockVersion; + + @Transient + @ApiParam("实收数量") + private Double rcQty; + + @Transient + @ApiParam("ASN条码总箱数") + public Integer totalBoxes; + + @Transient + @ApiParam("差异") + public Double difference; + + @Transient + @ApiParam("标准包装") + public Double snp; } 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 index 48c4aa2..68c98d6 100644 --- 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 @@ -15,7 +15,7 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description :作业步骤类型信息 + * @Description :作业步骤信息 * @Reference : * @Author : silliter.yuan * @CreateDate : 2018-11-22 9:33 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java new file mode 100644 index 0000000..dfa6a4b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java @@ -0,0 +1,42 @@ +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 : jimmy.zeng + * @CreateDate : 2019-06-17 12:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_CS_ADJUST_RANGE") +@Api("盘点调差范围信息") +public class WmsCSAdjustRange extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("单号") + public String orderNo; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name="IS_ADJUST") + @ApiParam(value = "调整标识", example = "1") + public Integer isAdjust; +} 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 f670744..de7eb41 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 @@ -82,6 +82,10 @@ public class WmsCSOrderMaster extends BaseBean { @ApiParam(value = "是否散件") private Integer isPart; + @Column(name = "YEAR") + @ApiParam("年度") + public String year; + public Integer getIsInventoryVal() { return this.isInventory == null ? 0 :this.isInventory.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java new file mode 100644 index 0000000..0f24114 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -0,0 +1,67 @@ +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 : jimmy.zeng + * @CreateDate : 2019-06-17 11:57 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_CS_RANGE") +@Api("盘点范围信息") +public class WmsCSRange extends BaseBean { + + @Column(name="ORDER_NO") + @ApiParam("单号") + public String orderNo; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ZONE_NO") + @ApiParam("存储区编号") + public String zoneNo; + + @Column(name = "LOCATE_NO") + @ApiParam("库位编号") + public String locateNo; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + public WmsCSRange(){} + + public WmsCSRange(String zoneNo,String partNo,String partNameRdd){ + this.zoneNo = zoneNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + } + +} 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 45df2ab..3695b07 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 @@ -197,5 +197,5 @@ public class WmsDocMovementDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public int lockVersion; + public transient int lockVersion; } 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 7ed02fe..1314953 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 @@ -120,27 +120,27 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") - public String AssignSrcWhNo; + public String assignSrcWhNo; @Column(name = "SRC_ZONE_NO") @ApiParam("源存储区代码") - public String AssignSrcZoneNo; + public String assignSrcZoneNo; @Column(name = "DEST_WH_NO") @ApiParam("目标仓库代码") - public String AssignDestWhNo; + public String assignDestWhNo; @Column(name = "DEST_ZONE_NO") @ApiParam("目标存储区代码") - public String AssignDestZoneNo; + public String assignDestZoneNo; @Column(name = "PLAN_DATE") @ApiParam(value = "计划日期") - private String AssignPlanDate; + private String assignPlanDate; @Column(name = "PLAN_TIME") @ApiParam(value = "计划时间") - private String AssignPlanTime; + private String assignPlanTime; @Transient @ApiParam(value = "发运单号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java new file mode 100644 index 0000000..738622a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java @@ -0,0 +1,76 @@ +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 : yerik.shi + * @CreateDate : 2019-06-11 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_LINE_LOCATE_PART") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="线边库物料信息",description = "线边库物料信息") +public class WmsLineLocatePart extends BaseBean { + + @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; + + public Double getPullQty() { + return pullQty == null ? 0D : this.pullQty.doubleValue(); + } + + public Double getMax() { + return max== null ? 0D : this.max.doubleValue(); + } + + public Double getMin() { + return min== null ? 0D : this.min.doubleValue(); + } + + public Integer getIsGeneratePicklist() { + return isGeneratePicklist== null ? 0: this.isGeneratePicklist.intValue(); + } + + @Column(name = "PULL_QTY") + @ApiParam(value = "拉动数量") + private Double pullQty; + + @Column(name = "Max") + @ApiParam(value = "最大值") + private Double max; + + @Column(name = "Min") + @ApiParam(value = "最小值") + private Double min; + + @Column(name = "IS_GENERATE_PICKLIST") + @ApiParam(value = "是否生成领料单") + private Integer isGeneratePicklist; + +} 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 e2f4114..c400de9 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 @@ -107,4 +107,16 @@ public class WmsPOMaster extends BaseBean { @Column(name = "IS_SN") @ApiParam(value = "是否生成条码", example = "1") public Integer isSn; + + @Transient + @ApiParam(value = "工厂名称") + public String organizeName; + + @Transient + @ApiParam("联系人") + private String vendorOwner; + + @Transient + @ApiParam("邮箱") + private String vendorEmail; } 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 5edb358..bb875c1 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 @@ -34,6 +34,11 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("物料编码") public String partNo; + @Column(name = "BOX_QTY" ) + @ColumnDefault("0") + @ApiParam(value ="箱数", example = "0") + public Integer boxQty; + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") public String partNameRdd; @@ -136,5 +141,14 @@ public class WmsPOMasterDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public int lockVersion; + public transient int lockVersion; + + @Transient + @ApiParam("PO条码总箱数") + public Integer totalBoxes; + + @Transient + @ApiParam("差异") + public Double difference; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index a8b116a..5335318 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -117,9 +117,13 @@ public class WmsPart extends BaseBean { @Column(name="PROD_CFG_TYPE_CODE") @ApiParam("项目代码") - public String prodCfgTypeCode; + private String prodCfgTypeCode; @Column(name="PROD_CFG_TYPE_NAME") @ApiParam("项目名称") - public String prodCfgTypeName; + private String prodCfgTypeName; + + @Column(name="OUT_CLOSE_FLAG") + @ApiParam("項目结算标识") + private String outCloseFlag; } 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 4dc9db4..e90728d 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 @@ -115,4 +115,8 @@ public class WmsPoSn extends BaseBean { @Transient @ApiParam(value = "条码") public String sn; + + @Transient + @ApiParam(value = "工厂名称") + public String organizeName; } 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 4930cd7..f7ed231 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 @@ -84,5 +84,5 @@ public class WmsQCDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public int lockVersion; + public transient int lockVersion; } 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 987ec49..73a9619 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 @@ -117,6 +117,11 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "锁定数量", example = "0") private Double lockQty; + @Column(name = "SCRAP_QTY") + @ColumnDefault("0") + @ApiParam(value = "报废数量", example = "0") + private Double scrapQty; + public Double getQty() { return this.qty == null ? 0 : this.qty; } @@ -149,6 +154,10 @@ public class WmsStockQuan extends BaseBean { return this.lockQty == null ? 0 : this.lockQty; } + public Double getScrapQty() { + return this.scrapQty == null ? 0 : this.scrapQty; + } + public WmsStockQuan() { } @@ -168,7 +177,7 @@ public class WmsStockQuan extends BaseBean { this.consignQty = consignQty; this.lockQty = lockQty; } - public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty) { + public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.qty = qty; this.failQty = failQty; this.holdQty = holdQty; @@ -177,5 +186,6 @@ public class WmsStockQuan extends BaseBean { this.freezeQty = freezeQty; this.consignQty = consignQty; this.lockQty = lockQty; + this.scrapQty = scrapQty; } } 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 78e805f..faccba1 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 @@ -196,6 +196,10 @@ public class WmsStockSn extends BaseBean { @Transient public String labelNo; + @Transient + @ApiParam(value = "工厂名称") + public String organizeName; + public WmsStockSn(){} public WmsStockSn(String partNo){ 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 9c4aa2c..5812917 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 @@ -61,8 +61,4 @@ public class WmsTransType extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long tmId; - @Column(name = "OP_TYPE_ID") - @ApiParam(value = "作业类型编号", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long opTypeId; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index a7f3b48..6481548 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -47,7 +47,7 @@ public class WmsZones extends BaseBean { private String zoneName; @Column(name = "PARENT_ZONE_NO") - @ApiParam(value = "父级存储区", example ="1") + @ApiParam(value = "父级存储区", example ="-1") private String parentZoneNo; @Column(name = "IS_SON_NODE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java index 036f65e..c945e71 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java @@ -28,9 +28,15 @@ public class MappingItem { */ public String destName; /** - * 当来源数据中无此字段时的默认值 + * 该字段在目标表是不是主键 + * 1=主键 */ - public String defaultValue; + public Integer destPk; + /** + * 目标字段的默认值，通过此默认值识别字段类型，一定要配置正确 + * 可以使用的表达式： #date, #time, #guid, #Q.warehouse(#zone) + */ + public Object defaultValue; @Override public String toString() { @@ -38,6 +44,7 @@ public class MappingItem { + this.srcName + ", destBeanName:" + this.destBeanName + ", destName" + this.destName + ", defaultValue:" - + this.defaultValue; + + this.defaultValue + ", destPk:" + + this.destPk; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/UpdateSyncItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/UpdateSyncItem.java new file mode 100644 index 0000000..2761316 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/UpdateSyncItem.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.wms.dbinterface; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 回写接口库的值 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class UpdateSyncItem { + + /** + * 字段名 + */ + public String columnName; + + /** + * 写入的值 + * 支持表达式 + * #sap_date, #sap_time, #guid + */ + public String updateValue; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 464ddeb..7f56b8d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -39,33 +39,34 @@ public class WmsInterfaceDataMapper extends BaseBean { /** * 接口数据源编号（在动态表单中配置） */ - @Column(name = "SCR_DATA_SOURCE", length = 50) + @Column(name = "SRC_DATA_SOURCE", length = 50) public String dataSource; /** * 来源表名 */ - @Column(name = "SCR_TABLE_NAME", length = 50) + @Column(name = "SRC_TABLE_NAME", length = 50) public String srcTableName; /** * 来源表的排序条件 */ - @Column(name = "SCR_ORDER_BY", length = 50) + @Column(name = "SRC_ORDER_BY", length = 50) public String srcOrderBy; /** * 来源表的查询条件 */ - @Column(name = "SCR_WHERE", length = 255) - public String scrWhere; + @Column(name = "SRC_WHERE", length = 255) + public String srcWhere; /** * 数据同步到业务库后需要更新的接口库标记字段，多个字段用半角逗号分隔 - * 例如：SYNFLG=Y,SYNDATE={Date} + * 例如：SYNFLG=Y,SYNDATE={#XX} + * 可以使用的动态变量： #sap_date, #sap_time, #date, #time, #guid */ - @Column(name = "SCR_UPDATE_SYNC", length = 255) + @Column(name = "SRC_UPDATE_SYNC", length = 255) public String srcUpdateSync; /** * 业务表单的主键，多个主键用半角逗号分隔 */ - @Column(name = "SCR_PK_COLUMNS", length = 255) + @Column(name = "SRC_PK_COLUMNS", length = 255) public String srcPkColumns; /** * 按照组织代码(半角逗号分隔)复制多份到业务表（用于物料、供应商、客户...等集团数据） @@ -88,4 +89,11 @@ public class WmsInterfaceDataMapper extends BaseBean { */ @Column(name = "DEST_COLUMN_MAPPING", length = 5000) public String destColumnMapping; + + /** + * 接口分组名称 + * 支持的分组名：SAP2WMS, WMS2SAP, MES2WMS + */ + @Column(name = "GROUP_NAME") + public String groupName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSAdjustRangeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSAdjustRangeRepository.java new file mode 100644 index 0000000..a1d242d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSAdjustRangeRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSAdjustRange; + +/** + * @Description : 对象持久层仓用方法控制(盘点调差范围信息) + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-06-17 15:13 + * @Modify: + **/ +public interface WmsCSAdjustRangeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSRangeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSRangeRepository.java new file mode 100644 index 0000000..e4396c8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCSRangeRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSRange; + +/** + * @Description : 对象持久层仓用方法控制(盘点范围信息) + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-06-17 15:12 + * @Modify: + **/ +public interface WmsCSRangeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLineLocatePartRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLineLocatePartRepository.java new file mode 100644 index 0000000..24c1c60 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsLineLocatePartRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsLineLocatePart; + +/** + * @Description : 线边库物料表 + * @Reference : + * @Author : yerik.shi + * @CreateDate : 2019-06-12 + * @Modify: + **/ +public interface WmsLineLocatePartRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java new file mode 100644 index 0000000..be3972b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPartRepository.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsVendorPart; + +public interface WmsVendorPartRepository 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 34796cb..30d28bc 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 @@ -1223,8 +1223,8 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringLikerPack(wmsActionStepType.getAtNameC(), "atNameC", result); DdlPreparedPack.getStringLikerPack(wmsActionStepType.getFunCallName(), "funCallName", result); - - getStringBuilderPack(wmsActionStepType, result); + DdlPreparedPack.getNumEqualPack(wmsActionStepType.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result; } @@ -1271,14 +1271,14 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsActionModule(WmsActionModule wmsActionModule) { DdlPackBean result = new DdlPackBean(); - //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); + // 查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amDesc", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); DdlPreparedPack.getStringEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result); - - getStringBuilderPack(wmsActionModule, result); + DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result; } @@ -1444,48 +1444,72 @@ public class WmsHqlPack { * @param groupDataAuth * @return */ - public static DdlPackBean packHqlWmsTaskDetail(Map> groupDataAuth, String refSrc) { + public static DdlPackBean packHqlWmsTaskDetail(Map> groupDataAuth, String refSrc, String organizeCode) { DdlPackBean result = new DdlPackBean(); + int i = 1; Set>> entries = groupDataAuth.entrySet(); //拼sql entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())); for (Map.Entry> map : entries) { + String key = map.getKey(); List valueList = map.getValue(); List vList = valueList.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList()); String data = String.join(",", vList); + if (StringUtils.isNotBlank(data)) { + List mapList = JSONObject.parseArray(data, Map.class); + if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", key)) { - for (Map whNoItem : mapList) { - // 拼接仓库查询sql - DdlPreparedPack.getStringEqualPackOr(whNoItem.get("WH_CODE").toString(), "destWhNo", result); - } + + packMutilConditionHql(mapList, "WH_CODE", "destWhNo", result); + } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", key)) { - for (Map locateNoItem : mapList) { - // 拼接库位查询sql - DdlPreparedPack.getStringEqualPackOr(locateNoItem.get("LOCATE_NO").toString(), "destLocateNo", result); - } + + packMutilConditionHql(mapList, "LOCATE_NO", "destLocateNo", result); + } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", key)) { - for (Map zoneNoItem : mapList) { - // 拼接存储区查询sql - DdlPreparedPack.getStringEqualPackOr(zoneNoItem.get("ZONE_CODE").toString(), "destZoneNo", result); - } + + packMutilConditionHql(mapList, "ZONE_CODE", "destZoneNo", result); + } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) { - for (Map partNoItem : mapList) { - // 拼接物料查询sql - DdlPreparedPack.getStringEqualPackOr(partNoItem.get("PART_NO").toString(), "partNo", result); - } + + packMutilConditionHql(mapList, "PART_NO", "partNo", result); } } } + + String hqlString = " and ( 1=1 " + result.getPackedHql() + ") "; + + result.setWhereAppend(hqlString); // 通用数据拼接 - getStringBuilderPack(new WmsDataAuth(), result); + WmsDataAuth wmsDataAuth = new WmsDataAuth(); + wmsDataAuth.setOrganizeCode(organizeCode); + getStringBuilderPack(wmsDataAuth, result); return result; } /** + * 把 List 中的一组查询条件封装成 HQL + * @param mapList + * @param keyName + * @param columnName + * @param packBean + */ + private static void packMutilConditionHql(List mapList, String keyName, + String columnName, DdlPackBean packBean) { + Integer index = 1; + + for (Map item : mapList) { + packBean.addColumnQuery(columnName," or model." + + columnName + " = :m_" + columnName + (index++).toString(), + item.get(keyName).toString()); + } + } + + /** * 给定字段动态in sql * * @param columnName @@ -1754,4 +1778,71 @@ public class WmsHqlPack { return result; } + + + /** + * 线边库物料信息 分页查询 + * + * @param wmsLineLocatePart + * @return + */ + public static DdlPackBean packHqlWmsLineLocatePart(WmsLineLocatePart wmsLineLocatePart) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsLineLocatePart.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringLikerPack(wmsLineLocatePart.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsLineLocatePart.getPartNameRdd(), "partNameRdd", result); + getStringBuilderPack(wmsLineLocatePart, result); + return result; + } + /** + * 任务数据来源 分页查询 + * + * @param wmsTaskSrc + * @return + */ + public static DdlPackBean packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result); + getStringBuilderPack(wmsTaskSrc, result); + return result; + } + /** + * 供应商零件 分页查询 + * + * @param wmsVendorPart + * @return + */ + public static DdlPackBean packHqlWmsVendorPart(WmsVendorPart wmsVendorPart) { + DdlPackBean result = new DdlPackBean(); + //查询参数封装 + DdlPreparedPack.getStringLikerPack(wmsVendorPart.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringLikerPack(wmsVendorPart.getPartNo(), "partNo", result); + getStringBuilderPack(wmsVendorPart, result); + return result; + } + + + /** + * 盘点范围 条件封装 + * + * @param wmsCSRange + * @return + */ + public static DdlPackBean packHqlWmsCSRange(WmsCSRange wmsCSRange) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsCSRange.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSRange.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result); + + getStringBuilderPack(wmsCSRange, result); + + return result; + } + }