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 a0ee7fc..db58777 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 @@ -48,7 +48,7 @@ public class AndonManageQueue extends BaseBean { @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "code",value = "description") + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") private String alarmCode; @Column(name = "ACTION_CODE") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index d6ad5bc..15e7558 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -17,12 +17,12 @@ public class BlockSoftSwitchEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CASE_TYPE{ - SOCKET(1,"SOCKET"), - RESTFUL(2,"RESTFUL"), - DATASOURCE(3,"数据源"), - WEBSERVICE(4,"WebService"), - MQ(5,"消息队列"), - WebSocket(6,"WebSocket"); + SOCKET(10,"SOCKET"), + RESTFUL(20,"RESTFUL"), + DATASOURCE(30,"数据源"), + WEBSERVICE(40,"WebService"), + MQ(50,"消息队列"), + WebSocket(60,"WebSocket"); private int value; private String description; @@ -67,7 +67,8 @@ public class BlockSoftSwitchEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum REQUEST_SOURCE{ ACTIVE(1,"主动请求"), - SCHEDULE(2,"定时调度"); + SCHEDULE(2,"定时调度"), + RABBITMQ(3,"MQ 调用"); private int value; private String description; @@ -244,7 +245,7 @@ public class BlockSoftSwitchEnumUtil { return tmp; } - public static DATA_SOURCE_TYPE valueOf(int val) { + public static BlockSoftSwitchEnumUtil.DATA_SOURCE_TYPE valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -277,7 +278,7 @@ public class BlockSoftSwitchEnumUtil { return null; } - public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ + public static BlockSoftSwitchEnumUtil.DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ if(StringUtils.isNotBlank(databaseProductName)){ if(databaseProductName.indexOf(":mysql:") != -1){ return SOURCE_MARIA_DB; @@ -314,11 +315,11 @@ public class BlockSoftSwitchEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PARAM_VALUE_TYPE{ - NUM(1,"数字"), - STRING(2,"字符串"), - BOOLEAN(3,"布尔"), - MAP(4,"字典"), - LIST(5,"列表"); + NUM(10,"数字"), + STRING(20,"字符串"), + BOOLEAN(30,"布尔"), + MAP(40,"字典"), + LIST(50,"列表"); private int value; private String description; @@ -388,8 +389,8 @@ public class BlockSoftSwitchEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SUIT_MODE{ - ACTIVE(1,"主动"), - PASSIVE(2,"被动"); + ACTIVE(1,"客户端"), + PASSIVE(2,"服务端"); private int value; private String description; @@ -488,4 +489,41 @@ public class BlockSoftSwitchEnumUtil { } } + /** + * 适配方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SUIT_SERVER_WEB_SERVICE{ + ACTIVE(40001,"serverWebServiceHello","hello"), + SCHEDULE(40002,"serverWebServiceSendEmail","邮件测试"); + + private int value; + private String description; + private String clazzName; + + SUIT_SERVER_WEB_SERVICE(int value, String clazzName,String description) { + this.value = value; + this.clazzName = clazzName; + 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; + } + } + } 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 1eae9c3..4b8c2ce 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 @@ -717,7 +717,9 @@ public class WmsEnumUtil { OUTSTOCK("OUTSTOCK", "出库"), INSTOCK("INSTOCK", "入库"), MOVESTOCK("MOVESTOCK", "移库"), - CS("CS", "盘点"); + CS("CS", "盘点"), + VDARC("VDARC", "VDA收货"); + private String value; private String description; @@ -3339,4 +3341,57 @@ public class WmsEnumUtil { } } + /** + * 收货状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REC_STATUS{ + UNRECEIVED("UNRECEIVED", "未收货"), + COMPLETE_RECEIPT("COMPLETE_RECEIPT", "完成收货"), + PARTIAL_RECEIPT("PARTIAL_RECEIPT", "部分收货"), + OVER_RECEIVED_GOODS("OVER_RECEIVED_GOODS", "超量收货"), + OTHER("ELSE", "其他"),; + + private String value; + private String description; + + REC_STATUS(String value, String description) { + this.value = value; + this.description = description; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return value; + } + + public String getValue() { + return value; + } + + + public static String getDes(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val) ) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 8466ff9..43874a3 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -79,6 +79,10 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否删除") private Integer isObjectDel; + @Column(name = "IS_OBJECT_EXPORT") + @ApiParam(value = "是否导出") + private Integer isObjectExport; + @Column(name="ELEMENT_SORT_ATTR_ID") @ApiParam(value ="默认排序属性") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index 511e343..a102246 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -136,7 +136,7 @@ public class BfElementProperty extends BaseBean { @AnnoOutputColumn(hidden = true) private BfDataObjectProperty objectProperty; - public Object getFormValue() { - return propertyFormValue; - } +// public Object getFormValue() { +// return propertyFormValue == null ? propertyDefaultValue : propertyFormValue; +// } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java index 63ea2de..6088218 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java @@ -77,10 +77,6 @@ public class MesPcnTask extends BaseBean { @ApiParam("任务周期描述") private String taskCycleDescription; - @Column(name="TASK_STATUS") - @ApiParam("任务状态") - private Integer taskStatus; - @Column(name="TASK_PARAM") @ApiParam("任务参数") private String taskParam; @@ -89,7 +85,4 @@ public class MesPcnTask extends BaseBean { return this.taskType == null ? 0 : this.taskType; } - public int getTaskStatusVal() { - return this.taskStatus == null ? 0 : this.taskStatus; - } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java index 432e829..2da3ec8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -77,10 +77,6 @@ public class MesPcnTask extends BaseBean { @ApiParam("任务周期描述") private String taskCycleDescription; - @Column(name="TASK_STATUS") - @ApiParam("任务状态") - private Integer taskStatus; - @Column(name="TASK_PARAM") @ApiParam("任务参数") private String taskParam; @@ -89,7 +85,4 @@ public class MesPcnTask extends BaseBean { return this.taskType == null ? 0 : this.taskType; } - public int getTaskStatusVal() { - return this.taskStatus == null ? 0 : this.taskStatus; - } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 19ce394..0fa4064 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -542,7 +542,7 @@ public class MesHqlPack { * @return */ public static DdlPackBean getMesAction(MesAction mesAction) { - DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction.getOrganizeCode()); + DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, mesAction.getOrganizeCode()); DdlPreparedPack.getStringRightLikerPack(mesAction.getActionCode(), "actionCode", packBean); DdlPreparedPack.getStringLikerPack(mesAction.getActionName(), "actionName", packBean); DdlPreparedPack.getNumEqualPack(mesAction.getActionType(), "actionType", packBean); @@ -1161,9 +1161,6 @@ public class MesHqlPack { DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode); DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean); DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); - if (null != mesPcnTask.getTaskStatus()) { - DdlPreparedPack.getNumEqualPack(mesPcnTask.getTaskStatus(), "taskStatus", packBean); - } packBean.setOrderByStr(mesPcnTask.orderBy()); return packBean; } @@ -1185,4 +1182,17 @@ public class MesHqlPack { } return packBean; } + + /** + * 系统业务动作 + * @param organizeCode + * @return + */ + public static DdlPackBean getMesActionAllData(String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + return packBean; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index abb41bd..6b33f85 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -21,11 +22,14 @@ import javax.persistence.Transient; public class BsSuitCaseModel { @ApiParam(value = "适配器") - BsSuitCase bsSuitCase; + private BsSuitCase bsSuitCase; @ApiParam(value = "数据源适配套件") - BsSuitCaseDataSource bsDataSourceSuitCase; + private BsSuitCaseDataSource bsDataSourceSuitCase; @ApiParam(value = "socket适配套件") - BsSocketSuitCase bsSocketSuitCase; + private BsSocketSuitCase bsSocketSuitCase; + @ApiParam(value = "Web Service 适配套件") + private BsSuitCaseWebService webService; + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java index cf5b891..031e53a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java @@ -1,26 +1,26 @@ -package cn.estsh.i3plus.pojo.model.softswitch; - -import java.util.List; -import java.util.Map; - -/** - * @Description : 数据模型转换对象 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2019-04-29 11:11 - * @Modify: - **/ -public class DataSwitchModel { - - private String stringVal; - - private Long longVal; - - private Double doubleVal; - - private List listVal; - - private Map mapVal; - - private Object[] arrayVal; -} +//package cn.estsh.i3plus.pojo.model.softswitch; +// +//import java.util.List; +//import java.util.Map; +// +///** +// * @Description : 数据模型转换对象 +// * @Reference : +// * @Author : alwaysfrin +// * @CreateDate : 2019-04-29 11:11 +// * @Modify: +// **/ +//public class DataSwitchModel { +// +// private String stringVal; +// +// private Long longVal; +// +// private Double doubleVal; +// +// private List listVal; +// +// private Map mapVal; +// +// private Object[] arrayVal; +//} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java index 80e60a2..190882b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java @@ -1,50 +1,50 @@ -package cn.estsh.i3plus.pojo.model.softswitch; - -import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; -import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamImplicit; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 19-7-25 下午3:31 - * @Modify: - **/ -@Data -@XStreamAlias("auth") -public class PojoAuth{ - - @XStreamAsAttribute - private Long id; - @XStreamAsAttribute - private Integer authType; - - @XStreamImplicit - private List params; - - private String authPath; - private String userName ="登录名称"; - private String password ="登录名称"; - private String languageCode ="登录名称"; - - // 认证令牌 - private String token; -// // 认证令牌集合(复杂认证令牌) -// private List tokenList; - // 原始认证数据 - @XStreamCDATA - private String result; - - public PojoAuth(Long id, Integer authType,String authPath, List params) { - this.id = id; - this.authType = authType; - this.authPath = authPath; - this.params = params; - } -} \ No newline at end of file +//package cn.estsh.i3plus.pojo.model.softswitch; +// +//import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +//import com.thoughtworks.xstream.annotations.XStreamAlias; +//import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +//import com.thoughtworks.xstream.annotations.XStreamImplicit; +//import lombok.Data; +// +//import java.util.List; +//import java.util.Map; +// +///** +// * @Description : +// * @Reference : +// * @Author : wei.peng +// * @CreateDate : 19-7-25 下午3:31 +// * @Modify: +// **/ +//@Data +//@XStreamAlias("auth") +//public class PojoAuth{ +// +// @XStreamAsAttribute +// private Long id; +// @XStreamAsAttribute +// private Integer authType; +// +// @XStreamImplicit +// private List params; +// +// private String authPath; +// private String userName ="登录名称"; +// private String password ="登录名称"; +// private String languageCode ="登录名称"; +// +// // 认证令牌 +// private String token; +//// // 认证令牌集合(复杂认证令牌) +//// private List tokenList; +// // 原始认证数据 +// @XStreamCDATA +// private String result; +// +// public PojoAuth(Long id, Integer authType,String authPath, List params) { +// this.id = id; +// this.authType = authType; +// this.authPath = authPath; +// this.params = params; +// } +//} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java index 248ccd5..974ca0e 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java @@ -1,28 +1,28 @@ -package cn.estsh.i3plus.pojo.model.softswitch; - -import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import lombok.Data; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 19-7-25 下午5:18 - * @Modify: - **/ -@Data -@XStreamAlias("prop") -public class Prop { - - @XStreamAsAttribute - private Long id; - private String paramName; - private String paramValue; - - public Prop(Long id, String paramName, String paramValue) { - this.id = id; - this.paramName = paramName; - this.paramValue = paramValue; - } -} +//package cn.estsh.i3plus.pojo.model.softswitch; +// +//import com.thoughtworks.xstream.annotations.XStreamAlias; +//import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +//import lombok.Data; +// +///** +// * @Description : +// * @Reference : +// * @Author : wei.peng +// * @CreateDate : 19-7-25 下午5:18 +// * @Modify: +// **/ +//@Data +//@XStreamAlias("prop") +//public class Prop { +// +// @XStreamAsAttribute +// private Long id; +// private String paramName; +// private String paramValue; +// +// public Prop(Long id, String paramName, String paramValue) { +// this.id = id; +// this.paramName = paramName; +// this.paramValue = paramValue; +// } +//} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java index 87ac9f0..bfdc68c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java @@ -1,33 +1,33 @@ -package cn.estsh.i3plus.pojo.model.softswitch; - -import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; -import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import lombok.Data; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 19-7-25 下午3:31 - * @Modify: - **/ -@Data -@XStreamAlias("request") -public class Request{ - - @XStreamAsAttribute - private Long id; - @XStreamAsAttribute - private Integer requestType; - private String requestPath; - - @XStreamCDATA - private String result; - - public Request(Long id, Integer requestType,String requestPath) { - this.id = id; - this.requestType = requestType; - this.requestPath = requestPath; - } -} \ No newline at end of file +//package cn.estsh.i3plus.pojo.model.softswitch; +// +//import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +//import com.thoughtworks.xstream.annotations.XStreamAlias; +//import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +//import lombok.Data; +// +///** +// * @Description : +// * @Reference : +// * @Author : wei.peng +// * @CreateDate : 19-7-25 下午3:31 +// * @Modify: +// **/ +//@Data +//@XStreamAlias("request") +//public class Request{ +// +// @XStreamAsAttribute +// private Long id; +// @XStreamAsAttribute +// private Integer requestType; +// private String requestPath; +// +// @XStreamCDATA +// private String result; +// +// public Request(Long id, Integer requestType,String requestPath) { +// this.id = id; +// this.requestType = requestType; +// this.requestPath = requestPath; +// } +//} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java new file mode 100644 index 0000000..b78b66f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-9-5 下午7:30 + * @Modify: + **/ +@Data +@XStreamAlias("model") +public class SuitServerModel { + + // 执行方法命令 + private String action; + // 执行类型固定类型(SoftSwitchEnumUtil.CASE_TYPE) + private Integer caseType; + /* 认证使用 以后使用 */ + private String token; + // 传输单对象 + private Object obj; + // 传输集合 + private List list; + // 传输键值对 + private Map map; + // 传输 JSON 数据 + private String json; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index 2432c18..61e7853 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -63,9 +63,9 @@ public class BsSuitCase extends BaseBean { return suitTypeId.longValue(); } - @Column(name = "SUIT_TYPE_NAME") + @Column(name = "SUIT_TYPE_NAME_RDD") @ApiParam(value = "适配类型名称") - private String suitTypeName; + private String suitTypeNameRdd; @Column(name = "SUIT_CASE_CODE") @ApiParam(value = "适配器代码") @@ -75,6 +75,10 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "适配模式(枚举,主动，被动)") private Integer suitModeId; + @Column(name = "SUIT_SERVER_ACTION_ID") + @ApiParam(value = "Server 适配命令") + private Integer suitServerActionId; + @Column(name = "SUIT_CASE_HOST") @ApiParam(value = "适配主机") private String suitCaseHost; @@ -137,3 +141,4 @@ public class BsSuitCase extends BaseBean { private List bsOutParamAdapterList; } + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java new file mode 100644 index 0000000..c5e2ef6 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.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 : WebService 适配套件 + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019/9/9 上午11:09 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_CASE_WEB_SERVICE") +@Api(value = "WebService", description = "WebService 适配套件") +public class BsSuitCaseWebService extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name = "SERVICE_TAG_NAME") + @ApiParam(value = "Service Tag Name(包名称)") + private String serviceTagName; + + @Column(name = "SERVICE_FUNCTION_NAME") + @ApiParam(value = "Service Function Name(方法名称)") + private String serviceFunctionName; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseWebServiceRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseWebServiceRepository.java new file mode 100644 index 0000000..dd92a85 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseWebServiceRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019/9/9 上午11:41 + * @Modify: + **/ +public interface BsSuitCaseWebServiceRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 29e0594..629fcf7 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -47,7 +47,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCaseParam bsSuitCaseParam){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getParamTypeId(), "paramTypeId", ddlPackBean); @@ -65,7 +65,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsSuitCaseParamOnly(BsSuitCaseParam bsSuitCaseParam){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumNOEqualPack(bsSuitCaseParam.getId(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean); @@ -80,7 +80,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCase bsSuitCase){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseName(),"suitCaseName",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean); @@ -98,7 +98,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsSuitCaseOnly(BsSuitCase bsSuitCase){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumNOEqualPack(bsSuitCase.getId(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean); @@ -112,7 +112,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsParamAdapter(BsParamAdapter bsParamAdapter){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean); @@ -130,7 +130,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsParamAdapterOnly(BsParamAdapter bsParamAdapter){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsParamAdapter.getId(), "id", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(), "suitCaseId", ddlPackBean); @@ -146,7 +146,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsSuitSchedule(BsSuitSchedule bsSuitSchedule){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getSuitCaseId(),"suitCaseId",ddlPackBean); @@ -164,7 +164,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean); @@ -179,7 +179,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsSslKey(BsSslKey bsSslKey){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyTypeId(),"keyTypeId",ddlPackBean); @@ -195,7 +195,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsSslKeyOnly(BsSslKey bsSslKey){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsSslKey.getId(),"id",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(), "keyName", ddlPackBean); @@ -209,7 +209,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsSslKeyParam(BsSslKeyParam bsSslKeyParam){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean); @@ -225,7 +225,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsSslKeyParamOnly(BsSslKeyParam bsSslKeyParam){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean); @@ -239,7 +239,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsDataSource(BsDataSource bsDataSource){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceName(), "dataSourceName", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); @@ -257,7 +257,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsDataSourceOnly(BsDataSource bsDataSource){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); @@ -294,4 +294,14 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + /** + * WebService 唯一校验 + * @param webService + * @return + */ + public static DdlPackBean packHqlCheckWebService(BsSuitCaseWebService webService){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + return result; + } } 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 897f091..22f00de 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -41,6 +43,7 @@ public class WmsASNMaster extends BaseBean { @Column(name = "ASN_STATUS") @ApiParam(value = "状态", example = "0") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") public Integer asnStatus; @Column(name = "VENDOR_NO") @@ -65,6 +68,7 @@ public class WmsASNMaster extends BaseBean { @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description") public Integer isTask; @ApiParam("ASN详情列表") @@ -122,4 +126,75 @@ public class WmsASNMaster extends BaseBean { @Transient @ApiParam("手机") private String vendorPhone; + + @Transient + @ApiParam("物料代码") + private String partNo; + + @Transient + @ApiParam("物料名称") + private String partNameRdd; + + @Transient + @ApiParam("收货数量") + private Double sumRecQty; + + @Transient + @ApiParam("需求数量") + private Double sumQty; + + @Transient + @ApiParam("计划日期") + private String planDate; + + @Transient + @ApiParam("计划日期开始") + private String planDateStart; + + @Transient + @ApiParam("计划日期结束") + private String planDateEnd; + + @Transient + @ApiParam("计划时间") + private String planTime; + + @Transient + @ApiParam("差异数量") + private Double diffQty; + + @Transient + @ApiParam("单据类型") // PO/ASN + private String orderType; + + @Transient + @ApiParam("收货状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.REC_STATUS.class,refForeignKey = "value",value = "description") + private String recStatus; + + @Transient + @ApiParam("项目代码") + private String prodCfgTypeCode; + + public WmsASNMaster(){} + + public WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNameRdd, + Double sumQty,Double sumRecQty,String planDate,String planTime,Double diffQty,String orderType, + String recStatus){ + + this.orderNo = orderNo; + this.asnStatus = asnStatus; + this.vendorNo = vendorNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.sumQty = sumQty; + this.sumRecQty = sumRecQty; + this.planDate = planDate; + this.planTime = planTime; + this.diffQty = diffQty; + this.orderType = orderType; + this.recStatus = recStatus; + } + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 8c51e62..421410e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -116,7 +116,7 @@ public class WmsCSFactTrans extends BaseBean { public Double sumPartQty; @Transient - @ApiParam("存储区编号") + @ApiParam("存储区编号组") public String[] zoneNos; public WmsCSFactTrans(){} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 85fd21b..d16a300 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; -import com.alibaba.fastjson.annotation.JSONField; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -174,6 +173,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("创建时间") private String createDateTime; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; /* @JSONField(name="fPartNo") public String getfPartNo() { return fPartNo; 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 64c423c..0ffaeb3 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 @@ -144,6 +144,11 @@ public class WmsMoveMaster extends BaseBean { @ApiParam(value = "设备编号") public String fixId; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; + public WmsMoveMaster(){}; public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 5f423a0..aab7504 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -25,7 +25,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_MOVE_SN", indexes = { +@Table(name = "WMS_MOVE_SN", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), @Index(columnList = "SN"), @@ -35,80 +35,80 @@ import javax.persistence.*; public class WmsMoveSn extends BaseBean { private static final long serialVersionUID = 1490715681910614399L; - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; - @Column(name="ITEM") + @Column(name = "ITEM") @ApiParam("行号") public Integer item; - @Column(name="PART_NO") + @Column(name = "PART_NO") @ApiParam("物料编码") public String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") public String partNameRdd; - @Column(name="UNIT") + @Column(name = "UNIT") @ApiParam(value = "单位") public String unit; - @Column(name="SN") + @Column(name = "SN") @ApiParam("条码") public String sn; - @Column(name="CSN") + @Column(name = "CSN") @ApiParam("客户条码") public String csn; /** * 状态:1=创建,10=待处理,20=已处理 */ - @Column(name="ITEM_STATUS") + @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer itemStatus; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String remark; - @Column(name="LOT_NO") + @Column(name = "LOT_NO") @ApiParam("批次编号") public String lotNo; - @Column(name="PACKAGE_NO") + @Column(name = "PACKAGE_NO") @ApiParam("容器编号") public String packAgeNo; - @Column(name="SRC_QTY") + @Column(name = "SRC_QTY") @ColumnDefault("0") @ApiParam(value = "源数量", example = "0") public Double srcQty; - @Column(name="SRC_WH_NO") + @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") public String srcWhNo; - @Column(name="SRC_ZONE_NO") + @Column(name = "SRC_ZONE_NO") @ApiParam("源存储区代码") public String srcZoneNo; - @Column(name="SRC_LOCATE_NO") + @Column(name = "SRC_LOCATE_NO") @ApiParam("源库位代码") public String srcLocateNo; - @Column(name="DEST_WH_NO") + @Column(name = "DEST_WH_NO") @ApiParam("目标仓库代码") public String destWhNo; - @Column(name="DEST_ZONE_NO") + @Column(name = "DEST_ZONE_NO") @ApiParam("目标存储区代码") public String destZoneNo; - @Column(name="DEST_LOCATE_NO") + @Column(name = "DEST_LOCATE_NO") @ApiParam("目标库位代码") public String destLocateNo; @@ -120,51 +120,51 @@ public class WmsMoveSn extends BaseBean { @Transient private Long finishedCounts; - @Column(name="DEST_QTY") + @Column(name = "DEST_QTY") @ColumnDefault("0") @ApiParam(value = "目标数量", example = "0") public Double destQty; - @Column(name="QTY") + @Column(name = "QTY") @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; - @Column(name="SRC_QC_STATUS") + @Column(name = "SRC_QC_STATUS") @ApiParam(value = "源质量状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description") public Integer srcQcStatus; - @Column(name="SRC_SN_STATUS") + @Column(name = "SRC_SN_STATUS") @ApiParam(value = "源条码状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") public Integer srcSnStatus; - @Column(name="DEST_QC_STATUS") + @Column(name = "DEST_QC_STATUS") @ApiParam(value = "目的质量状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description") public Integer descQcStatus; - @Column(name="DEST_SN_STATUS") + @Column(name = "DEST_SN_STATUS") @ApiParam(value = "目的条码状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") public Integer destSnStatus; - @Column(name="DATE_CODE") + @Column(name = "DATE_CODE") @ApiParam("生产日期") public String dateCode; - @Column(name="FIX_LOT_NO") + @Column(name = "FIX_LOT_NO") @ApiParam("特殊批次") public String fixLotNo; - @Column(name="VENDOR_NO") + @Column(name = "VENDOR_NO") @ApiParam("供应商编号") private String vendorNo; @Transient @ApiParam("业务类型编码") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") private Integer busiTypeCode; @Transient @@ -183,9 +183,15 @@ public class WmsMoveSn extends BaseBean { @ApiParam("交易类型名称") private String transTypeName; - public WmsMoveSn(){} + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; - public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ + public WmsMoveSn() { + } + + public WmsMoveSn(String partNo, Long finishedCounts, Long waitingCounts) { this.partNo = partNo; this.waitingCounts = waitingCounts; this.finishedCounts = finishedCounts; @@ -199,7 +205,7 @@ public class WmsMoveSn extends BaseBean { return finishedCounts == null ? 0L : this.finishedCounts; } - public WmsMoveSn(String partNo, String partNameRdd, Double destQty,Integer busiTypeCode, String transTypeCode, String refSrc) { + public WmsMoveSn(String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) { this.partNo = partNo; this.partNameRdd = partNameRdd; this.destQty = destQty; @@ -207,7 +213,8 @@ public class WmsMoveSn extends BaseBean { this.transTypeCode = transTypeCode; this.refSrc = refSrc; } - public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String transTypeCode, String refSrc) { + + public WmsMoveSn(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) { this.partNo = partNo; this.partNameRdd = partNameRdd; this.destQty = destQty; @@ -215,38 +222,38 @@ public class WmsMoveSn extends BaseBean { this.refSrc = refSrc; } - public WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd, - String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus, - Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode,String sn, - String createUser,String createDatetime,String modifyDatetime,String modifyUser){ - this.organizeCode=organizeCode; - this.orderNo=orderNo; - this.item=item; - this.partNo=partNo; - this.partNameRdd=partNameRdd; - this.transTypeCode=transTypeCode; - this.transTypeName=transTypeName; - this.itemStatus=itemStatus; - this.unit=unit; - this.srcLocateNo=srcLocateNo; - this.destLocateNo=destLocateNo; - this.srcQty=srcQty; - this.srcQty=srcQty; - this.destQty=destQty; - this.srcQcStatus=srcQcStatus; - this.descQcStatus=descQcStatus; - this.srcSnStatus=srcSnStatus; - this.destSnStatus=destSnStatus; - this.lotNo=lotNo; - this.dateCode=dateCode; - this.refSrc = refSrc; - this.destZoneNo = destZoneNo; - this.destWhNo =destWhNo; - this.busiTypeCode = busiTypeCode; - this.sn = sn; - this.createUser = createUser; - this.createDatetime = createDatetime; - this.modifyDatetime =modifyDatetime; - this.modifyUser =modifyUser; + public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd, + String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus, + Integer destSnStatus, String lotNo, String dateCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn, + String createUser, String createDatetime, String modifyDatetime, String modifyUser) { + this.organizeCode = organizeCode; + this.orderNo = orderNo; + this.item = item; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.itemStatus = itemStatus; + this.unit = unit; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.srcQty = srcQty; + this.srcQty = srcQty; + this.destQty = destQty; + this.srcQcStatus = srcQcStatus; + this.descQcStatus = descQcStatus; + this.srcSnStatus = srcSnStatus; + this.destSnStatus = destSnStatus; + this.lotNo = lotNo; + this.dateCode = dateCode; + this.refSrc = refSrc; + this.destZoneNo = destZoneNo; + this.destWhNo = destWhNo; + this.busiTypeCode = busiTypeCode; + this.sn = sn; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; } } 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 69fe0bd..6bb6906 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 @@ -166,11 +166,12 @@ public class WmsPOMasterDetails extends BaseBean { public WmsPOMasterDetails(){} - public WmsPOMasterDetails(String orderNo,String containerNo,String partNo,Integer item,String organizeCode){ + public WmsPOMasterDetails(String orderNo,String containerNo,String partNo,Integer item,String organizeCode,String erpAreaNo){ this.orderNo = orderNo; this.containerNo = containerNo; this.partNo = partNo; this.item = item; this.organizeCode = organizeCode; + this.erpAreaNo = erpAreaNo; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SwebProcurementPlanOrder.java new file mode 100644 index 0000000..1b43c58 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SwebProcurementPlanOrder.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.wms.bean.iotio; + +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 : jessica.chen + * @CreateDate : 2019-09-09 11:14 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SWEB_PROCUREMENT_PLAN_ORDER") +@Api("开口合同主表") +public class SwebProcurementPlanOrder extends BaseBean { + + private static final long serialVersionUID = -4332932784803175933L; + @Column(name = "ORDER_NO") + @ApiParam(value = "合同号") + private String orderNo; + + @Column(name = "VENDOR_CODE") + @ApiParam(value = "物料名称") + private String vendorCode; + + @Column(name = "VENDOR_NAME") + @ApiParam(value = "物料名称") + private String vendorName; + + @Column(name = "PART_NO") + @ApiParam(value = "物料名称") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + private String partName; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SwebProcurementPlanOrderRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SwebProcurementPlanOrderRepository.java new file mode 100644 index 0000000..130a355 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SwebProcurementPlanOrderRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.iotio.SwebProcurementPlanOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-09-09 14:49 + * @Modify: + **/ +@Repository +public interface SwebProcurementPlanOrderRepository extends BaseRepository { +}