From 1371f948387899c22a000e59cda941d81fd01438 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Thu, 4 Apr 2019 18:05:33 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E7=86=94=E6=96=AD=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/bean/BaseFallBackBean.java | 38 +++++++++++++++++----- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java index 870b7f7..fecb6e3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseFallBackBean.java @@ -18,23 +18,45 @@ public class BaseFallBackBean { // LOGGER.error("【微服出错，熔断】{}",cause.getCause()); // cause.printStackTrace(); + /** + * 基本熔断信息封装方法 + * @param cause 错误原因 + * @return 基础结果类 + */ public BaseResultBean makeBaseFallBack(Throwable cause){ - LOGGER.error("【熔断信息】{}",cause.getMessage()); - LOGGER.error("【熔断原因】{}",cause.getCause()); - return makeBaseFallBack("【微服熔断】服务暂停，请稍后再试。",cause); + LOGGER.error("【熔断信息】{}", cause.getMessage()); + LOGGER.error("【熔断原因】{}", cause.getCause()); + cause.printStackTrace(); + return makeBaseFallBack("【微服熔断】服务暂停，请稍后再试。", cause); } - public BaseResultBean makeBaseFallBack(String msg,Throwable cause){ - LOGGER.error("【熔断信息】{}",cause.getMessage()); - LOGGER.error("【熔断原因】{}",cause.getCause()); - return BaseResultBean.buildBaseResultBean(false,cause.getMessage() + "，信息：" + msg); + /** + * 自定义熔断信息封装方法 + * @param msg 错误提示 + * @param cause 错误原因 + * @return 基础结果类 + */ + public BaseResultBean makeBaseFallBack(String msg, Throwable cause){ + LOGGER.error("【熔断信息】{}", cause.getMessage()); + LOGGER.error("【熔断原因】{}", cause.getCause()); + cause.printStackTrace(); + return BaseResultBean.buildBaseResultBean(false, cause.getMessage() + "，信息：" + msg); } + /** + * 简化熔断信息方法 + * @return 基础结果类 + */ public BaseResultBean makeBaseFallBack(){ return makeBaseFallBack("【微服熔断】服务暂停，请稍后再试。"); } + /** + * 自定义简化熔断方法 + * @param msg 自定义信息 + * @return 基础结果类 + */ public BaseResultBean makeBaseFallBack(String msg){ - return BaseResultBean.buildBaseResultBean(false,msg); + return BaseResultBean.buildBaseResultBean(false, msg); } } From 7f10c22613966ce27bf98fb92086c49aae832ac0 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Fri, 12 Apr 2019 18:44:09 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E9=83=A8=E5=88=86=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/jpa/daoimpl/BaseMongoRepositoryImpl.java | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java index f81e238..ef58910 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java @@ -5,8 +5,10 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; import com.alibaba.fastjson.JSONObject; +import com.mongodb.BasicDBObject; import com.mongodb.Block; import com.mongodb.client.FindIterable; +import com.mongodb.client.model.CountOptions; import com.mongodb.client.model.Filters; import com.mongodb.client.model.Sorts; import org.apache.commons.lang3.StringUtils; @@ -21,6 +23,7 @@ import org.springframework.data.mapping.context.MappingContext; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity; import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty; +import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.repository.query.MongoEntityInformation; import org.springframework.data.mongodb.repository.support.SimpleMongoRepository; @@ -271,13 +274,9 @@ public class BaseMongoRepositoryImpl extends SimpleM FindIterable findIter = null; if(bson == null) { - findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find() - .skip(pager.getStartRow()) - .limit(pager.getPageSize()); + findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(); }else{ - findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson) - .skip(pager.getStartRow()) - .limit(pager.getPageSize()); + findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson); } if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){ //排序 @@ -286,8 +285,13 @@ public class BaseMongoRepositoryImpl extends SimpleM }else{ findIter.sort(Sorts.descending(orderByParam)); } + }else{ + //根据id排序 + findIter.sort(new BasicDBObject("_id", 1)); } + findIter.skip(pager.getStartRow()).limit(pager.getPageSize()); findIter.forEach(saveBlock); + return packObjectListFromDocument(dList); } @@ -310,9 +314,7 @@ public class BaseMongoRepositoryImpl extends SimpleM dList.add(document); } }; - FindIterable findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find() - .skip(pager.getStartRow()) - .limit(pager.getPageSize()); + FindIterable findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(); if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){ //排序 if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()){ @@ -320,7 +322,11 @@ public class BaseMongoRepositoryImpl extends SimpleM }else{ findIter.sort(Sorts.descending(orderByParam)); } + }else{ + //根据id排序 + findIter.sort(new BasicDBObject("_id", 1)); } + findIter.skip(pager.getStartRow()).limit(pager.getPageSize()); findIter.forEach(saveBlock); return packObjectListFromDocument(dList); } From d0cac648f300f39664cb51f7f9c4e1533739527e Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 16 Apr 2019 19:02:50 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0update=E9=80=9A?= =?UTF-8?q?=E8=BF=87DdlPack?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 9 ++++++ .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 34 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 6a48fbe..4c07060 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -105,6 +105,15 @@ public interface BaseRepository extends JpaReposito int updateByProperties(String conditionName, Object conditionValue, String[] propertyName, Object[] propertyValue); /** + * 通过属性进行多个值更新 + * @param propertyName + * @param propertyValue + */ + int updateByProperties(String propertyName, Object propertyValue,DdlPackBean packBean); + int updateByProperties(String[] propertyName, Object[] propertyValue,DdlPackBean packBean); + + + /** * 通过多个属性进行单个值更新 * @param conditionName * @param conditionValue diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 4145076..3de0adf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -222,6 +222,40 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override + public int updateByProperties(String propertyName, Object propertyValue,DdlPackBean packBean) { + return updateByProperties(new String[] { propertyName }, new Object[] { propertyValue },packBean); + } + + @Override + public int updateByProperties(String[] propertyName, Object[] propertyValue,DdlPackBean packBean) { + if ((propertyName != null) && (propertyName.length > 0) && (propertyValue != null) + && (propertyValue.length > 0) && (propertyName.length == propertyValue.length)) { + StringBuffer sb = new StringBuffer(); + + sb.append("update " + persistentClass.getName() + " model set "); + for (int i = 0; i < propertyName.length; i++) { + sb.append(propertyName[i] + " = :p_" + propertyName[i] + ","); + } + sb.deleteCharAt(sb.length() - 1); + sb.append(" where 1=1 " + packBean.getWhereAppend()); + + Query query = entityManager.createQuery(sb.toString()); + //更新值 + for (int i = 0; i < propertyName.length; i++) { + query.setParameter("p_" + propertyName[i], propertyValue[i]); + } + //查询条件 + for (String key : packBean.getHqlPreparedMap().keySet()) { + query.setParameter(key,packBean.getHqlPreparedMap().get(key)); + } + + return query.executeUpdate(); + } else { + throw new IllegalArgumentException("参数值错误!,propertyName:" + propertyName + ",propertyValue:" + propertyValue); + } + } + + @Override public int updateByHqlWhere(String hqlWhere, String propertyName, Object propertyValue) { return updateByHqlWhere(hqlWhere, new String[]{propertyName}, new Object[]{propertyValue}); } From 6e4d59cf7f07551162678054148323ef0df8cceb Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 16 Apr 2019 19:05:04 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=A0=B9=E6=8D=AEPO=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=94=9F=E6=88=90=E6=9D=A1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index 20b4193..0bf3187 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -77,4 +77,7 @@ public class WmsTaskInfo extends BaseBean { @Transient public List taskDetailsList; + @Column(name = "IS_CHECK_SN") + @ApiParam("是否校验条码") + public Integer isCheckSn; } From 0c73ad70724377c0f0b0d7bf68acf6e7f1ac5594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 16 Apr 2019 19:21:08 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=B4=E6=97=B6=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 37e55ee..db7518b 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 @@ -160,6 +160,14 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("前端表格编辑使用") private Boolean isSet = false; + @Transient + @ApiParam("生产日期") + public String dateCode; + + @ApiParam(value = "散件移库输入移库数量") + @Transient + public Double inputMoveQty; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } From 3980e05d2bcda9f58da6830cdd44ebe2a936fb1a Mon Sep 17 00:00:00 2001 From: jiajack Date: Tue, 16 Apr 2019 19:22:21 +0800 Subject: [PATCH 06/11] =?UTF-8?q?mes=E6=96=B0=E5=A2=9E=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=AF=E9=85=8D=E7=BD=AE=E7=9A=84=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1-=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 38 ++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesAction.java | 42 ++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesActionMethod.java | 42 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesEvent.java | 42 ++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesEventAction.java | 42 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesMethod.java | 46 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/ActionRequestBean.java | 31 +++++++++++++++ .../mes/repository/MesActionMethodRepository.java | 16 ++++++++ .../pojo/mes/repository/MesActionRepository.java | 16 ++++++++ .../mes/repository/MesEventActionRepository.java | 16 ++++++++ .../pojo/mes/repository/MesEventRepository.java | 16 ++++++++ .../pojo/mes/repository/MesMethodRepository.java | 16 ++++++++ 12 files changed, 363 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionMethodRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventActionRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMethodRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 40b894a..580e5f6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.base.enumutil; +import com.fasterxml.jackson.annotation.JsonFormat; + /** * @Description : * @Reference : @@ -8,4 +10,40 @@ package cn.estsh.i3plus.pojo.base.enumutil; * @Modify: **/ public class MesEnumUtil { + /** + * MesMethod实体对应的methodType值 + * 10. + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum METHOD_TYPE{ + + EXEC(10,"执行方法"), + COMPLETE(20,"完成方法"); + + private int value; + private String description; + + METHOD_TYPE(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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java new file mode 100644 index 0000000..4517562 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.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 :mes系统业务动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_ACTION") +@Api("系统业务动作") +public class MesAction extends BaseBean { + @Column(name="ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name="ACTION_NAME") + @ApiParam("动作名称") + private String actionName; + + @Column(name="ACTION_TYPE") + @ApiParam("动作类型") + private Integer actionType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java new file mode 100644 index 0000000..d425bd5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.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 :mes系统业务动作方法 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_ACTION_METHOD") +@Api("系统业务动作方法") +public class MesActionMethod extends BaseBean { + @Column(name="ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name="METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + + @Column(name="SEQ") + @ApiParam("序号") + private Integer seq; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java new file mode 100644 index 0000000..d45fb6d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.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 :mes系统业务事件 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EVENT") +@Api("系统业务事件") +public class MesEvent extends BaseBean { + @Column(name="EVENT_CODE") + @ApiParam("事件代码") + private String eventCode; + + @Column(name="EVENT_NAME") + @ApiParam("事件名称") + private String eventName; + + @Column(name="EVENT_TYPE") + @ApiParam("事件类型") + private Integer eventType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java new file mode 100644 index 0000000..5b559df --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.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 :mes系统业务事件动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EVENT_ACTION") +@Api("系统业务事件动作") +public class MesEventAction extends BaseBean { + @Column(name="EVENT_CODE") + @ApiParam("事件代码") + private String eventCode; + + @Column(name="ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name="SEQ") + @ApiParam("序号") + private Integer seq; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java new file mode 100644 index 0000000..ef34e81 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.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 :mes系统业务方法 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_METHOD") +@Api("系统业务方法") +public class MesMethod extends BaseBean { + @Column(name="METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + + @Column(name="METHOD_NAME") + @ApiParam("方法名称") + private String methodName; + + @Column(name="CALL_CLASS") + @ApiParam("具体实现类") + private String callClass; + + @Column(name="METHOD_TYPE") + @ApiParam("方法类型") + private Integer methodType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java new file mode 100644 index 0000000..2dc63ce --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description : 动作请求参数 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +public class ActionRequestBean implements Serializable { + + @ApiParam("事件代码") + public String eventCode; + + @ApiParam("单个结果") + public Obj resultObject; + + @ApiParam("List请求集") + public List resultList; + + @ApiParam("Map请求集") + public Map resultMap; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionMethodRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionMethodRepository.java new file mode 100644 index 0000000..fb0248b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionMethodRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesActionMethod; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesActionMethodRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionRepository.java new file mode 100644 index 0000000..47d0046 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesActionRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesAction; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesActionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventActionRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventActionRepository.java new file mode 100644 index 0000000..0489df8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventActionRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEventAction; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEventActionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventRepository.java new file mode 100644 index 0000000..2a90e5c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEventRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEvent; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEventRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMethodRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMethodRepository.java new file mode 100644 index 0000000..ab7b3dd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMethodRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesMethod; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesMethodRepository extends BaseRepository { +} From cbfc1b470e4adbe10bdcc4f8d9f49b0f135ed53b Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 16 Apr 2019 19:51:27 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=B9=B3=E5=8F=B0-=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=BB=84=E7=BB=87=E4=BF=AE=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E8=A1=A8=E5=8D=95-=E6=8B=A6=E6=88=AA=E5=99=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=A7=E8=A1=8C=E9=A1=BA=E5=BA=8F=20?= =?UTF-8?q?=E8=A1=A8=E5=8D=95-=E5=8A=9F=E8=83=BD=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=AB=AF=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/form/bean/BfIntercept.java | 7 +++++-- .../i3plus/pojo/form/bean/BfInterceptDetail.java | 22 ++++++++++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java index 4803300..d72ec65 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java @@ -41,6 +41,9 @@ public class BfIntercept extends BaseBean { @Column(name="EXECUTE_CONTENT") @ApiParam(value ="执行内容") - @JsonSerialize(using = ToStringSerializer.class) - private Integer executeContent; + private String executeContent; + + @Column(name="INTERCEPT_DESCRIPTION") + @ApiParam(value ="拦截器描述") + private String interceptDescription; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java index 900be53..85d797c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java @@ -48,9 +48,9 @@ public class BfInterceptDetail extends BaseBean { @ApiParam(value ="拦截器位置") private Integer interceptPosition; - public Integer getInterceptPosition() { + public int getInterceptPositionVal() { if(this.interceptPosition == null){ - return null; + return 0; } else { return this.interceptPosition.intValue(); } @@ -69,4 +69,22 @@ public class BfInterceptDetail extends BaseBean { @ApiParam(value ="拦截器业务结果处理") private Integer interceptProcessResult; + public int getInterceptProcessResultVal(){ + if(interceptProcessResult == null ){ + return 0; + } + return interceptProcessResult.intValue(); + } + + @Column(name="INTERCEPT_EXECUTE_SORT") + @ApiParam(value ="拦截器业务执行顺序") + private Integer interceptExecuteSort; + + public int getInterceptExecuteSortVal(){ + if(interceptExecuteSort == null ){ + return 0; + } + return interceptExecuteSort.intValue(); + } + } From bec70bc79d86450a6d3dad2f4eb09092cf212220 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 16 Apr 2019 20:40:32 +0800 Subject: [PATCH 08/11] =?UTF-8?q?DdlPack=EF=BC=8C=E6=95=B0=E5=AD=97equals?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A7=E4=BA=8E0=E7=9A=84=E7=BA=A6?= =?UTF-8?q?=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index f74f02f..590ad9a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -255,7 +255,7 @@ public class DdlPreparedPack { * @param packBean */ public static void getNumEqualPack(Object data, String columnName, DdlPackBean packBean) { - if (data != null) { + if (data != null && Long.parseLong(data.toString()) > 0) { packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data); } } From 2aa692a9c044c0b6e195f2085cdc94b95979638b Mon Sep 17 00:00:00 2001 From: "Rock.Yu" Date: Tue, 16 Apr 2019 20:40:44 +0800 Subject: [PATCH 09/11] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E6=97=A0=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=9A=84=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java index 41077b8..6f16869 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -23,6 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @AllArgsConstructor +@NoArgsConstructor @EqualsAndHashCode(callSuper = true) @Table(name = "DROOLS_RULE_PERSISTENCE") @Api("系统动态业务规则") From 43ad2e35c99dfdb8b60722b9f0633ba4f45a8ba6 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Tue, 16 Apr 2019 20:50:09 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=94=99=E8=AF=AF--?= =?UTF-8?q?=E5=88=98=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 39608ba..fdbeed4 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 @@ -127,7 +127,7 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "打印时间") private String printDate; - public Integer getIsSn() { - return isSn == null ? 0 : this.getIsSn(); - } +// public Integer getIsSn() { +//// return isSn == null ? 0 : this.getIsSn(); +//// } } From 93f4d1cfd731a20283f3a30072c5d6aca3c22a1f Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Tue, 16 Apr 2019 22:24:51 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java | 4 ++-- .../estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java | 3 +++ .../pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java | 10 +++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index 6cc2dc7..81e9435 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -145,8 +145,8 @@ public class SwebEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_TYPE { - CREATE(10, "标准包装"), - RECEIPT(20, "非标包装"); + STANDARD(10, "标准包装"), + NON_STANDARD(20, "非标包装"); private int value; private String description; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java index ed7f4c7..8076ebd 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java @@ -17,6 +17,9 @@ import java.io.Serializable; @AllArgsConstructor public class SwebLoginUserModel implements Serializable { + @ApiParam(value = "用户ID") + private Long id; + @ApiParam(value = "用户名") private String userName; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java index 335e031..d6df41b 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java @@ -5,7 +5,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; -import java.util.List; +import javax.persistence.Transient; import java.util.Map; /** @@ -46,10 +46,14 @@ public class SwebPOForPubListResultItemModel extends BaseBean { @Column(name = "ITEM_STATUS") private Integer itemStatus; - @ApiParam(value = "订单类型", example = "1") + @ApiParam(value = "订单类型", example = "10") @Column(name = "ORDER_TYPE") public Integer orderType; @ApiParam(value = "时间数量列表", example = "1") - public List> timeList; + public Map timeObject; + + @Transient + @ApiParam(value = "是否可编辑（前端使用）") + public boolean isSet = false; }